cmake build: Enable overriding bareos version string during build

core/CMakeLists.txt

@@ -70,6 +70,8 @@ execute_process(
 )
 
 INCLUDE(BareosExtractVersionInfo)
+add_definitions(-DVERSION=${BAREOS_FULL_VERSION})
+
 
 INCLUDE(BareosFindAllLibraries)
 
@@ -604,7 +606,7 @@ MESSAGE("Configuration on ${NOW} : ")
 MESSAGE(" ")
 
 MESSAGE("   Host:                         ${host} -- ${DISTNAME} ${DISTVER} ")
-MESSAGE("   Bareos version:               ${BAREOS} ${VERSION} (${DATE}) ")
+MESSAGE("   Bareos version:               ${BAREOS} ${BAREOS_FULL_VERSION} (${DATE}) ")
 MESSAGE("   Distribution:                 ${DISTNAME} OBS PROJECT:${OBS_PROJECT} OBS DIST:${OBS_DISTRIBUTION} OBS ARCH:${OBS_ARCH}")
 MESSAGE("   Source code location:         ${srcdir} ")
 MESSAGE("   Modify Debian Control file:   ${GENERATE_DEBIAN_CONTROL} ")

core/cmake/BareosExtractVersionInfo.cmake

@@ -17,19 +17,33 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
+# VERSION_STRING can override what is stored in version.h
+IF (NOT DEFINED VERSION_STRING)
+  MESSAGE("VERSION_STRING is not defined, extracting version from version.h")
+  # extract version number from version.h
+  file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h VERSION_STRING REGEX define.*VERSION.*)
+ENDIF()
 
-# extract version number from version.h
-file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
-string(REGEX MATCH [0-9.]+ VERSION ${VERSION_INFO})
-string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_INFO})
-string(REGEX MATCH \".*\" FULLVERSION ${VERSION_INFO})
+string(REGEX MATCH [0-9.]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING})
+string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_STRING})
+string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})
+
+
+MESSAGE("BAREOS_NUMERIC_VERSION is ${BAREOS_NUMERIC_VERSION}")
+MESSAGE("BAREOS_FULL_VERSION is ${BAREOS_FULL_VERSION}")
+MESSAGE("SOVERSION is ${SOVERSION}")
+
+IF (NOT BAREOS_FULL_VERSION)
+  MESSAGE(FATAL_ERROR BAREOS_FULL_VERSION is not set)
+ENDIF()
 
 # extract date from version.h
-file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h DATE_INFO REGEX define.*BDATE.*)
-string(REGEX MATCH \".*\" DATE ${DATE_INFO})
+file(STRINGS ${PROJECT_SOURCE_DIR}/src/include/version.h DATE_STRING REGEX define.*BDATE.*)
+string(REGEX MATCH \".*\" DATE ${DATE_STRING})
 string(REGEX REPLACE "\"" "" DATE ${DATE})
 
 
 # extract  db version from cats.h
-file(STRINGS ${PROJECT_SOURCE_DIR}/src/cats/cats.h DB_VERSION_INFO REGEX .*BDB_VERSION.*)
-string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_INFO})
+file(STRINGS ${PROJECT_SOURCE_DIR}/src/cats/cats.h DB_VERSION_STRING REGEX .*BDB_VERSION.*)
+string(REGEX MATCH [0-9]+ BDB_VERSION ${DB_VERSION_STRING})
+

core/cmake/BareosSetVariableDefaults.cmake

@@ -546,10 +546,10 @@ SET(FSTYPE_MNTENT 1)
 
 SET(PACKAGE_BUGREPORT "\"\"")
 SET(PACKAGE_NAME "\"${CMAKE_PROJECT_NAME}\"")
-SET(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${VERSION}\"")
+SET(PACKAGE_STRING "\"${CMAKE_PROJECT_NAME} ${BAREOS_NUMERIC_VERSION}\"")
 SET(PACKAGE_TARNAME "\"\"" )
 SET(PACKAGE_URL "\"\"")
-SET(PACKAGE_VERSION "\"${VERSION}\"")
+SET(PACKAGE_VERSION "\"${BAREOS_NUMERIC_VERSION}\"")
 
 set(ENABLE_NLS 1)
 

core/cmake/bareos-symlink-default-db-backend.cmake

@@ -19,5 +19,5 @@
 MESSAGE(STATUS "${CMAKE_COMMAND} -E create_symlink ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX} ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}")
 execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
    ${backenddir}/libbareoscats-${default_db_backend}${CMAKE_SHARED_LIBRARY_SUFFIX}
-   ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${VERSION}
+   ${libdir}/libbareoscats${CMAKE_SHARED_LIBRARY_SUFFIX}.${BAREOS_NUMERIC_VERSION}
    )

core/debian/rules

@@ -26,6 +26,7 @@ DIRECTOR_DAEMON_USER = $(DAEMON_USER)
 STORAGE_DAEMON_USER = $(DAEMON_USER)
 FILE_DAEMON_USER = root
 STORAGE_DAEMON_GROUP = $(DAEMON_GROUP)
+BAREOS_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: //g')
 
 define CONFIGURE_COMMON
   -Dsbin-perm=755 \
@@ -75,7 +76,8 @@ define CONFIGURE_COMMON
   -Dbasename="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   -Dhostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   -Dincludes=yes \
-  -Drpath=no
+  -Drpath=no \
+	-DVERSION_STRING=\"$(BAREOS_VERSION)\"
 endef
 
 #  --docdir="\$(_docdir)/bareos" \

core/platforms/debian/CMakeLists.txt

@@ -66,7 +66,7 @@ FOREACH(SQLFILE ${SQLFILES})
    GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME)
    STRING(REGEX MATCH  "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses
    SET(VERSION ${CMAKE_MATCH_1})
-   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql RENAME ${VERSION})
+   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql RENAME ${BAREOS_NUMERIC_VERSION})
 ENDFOREACH()
 
 
@@ -92,11 +92,11 @@ FOREACH(SQLFILE ${SQLFILES})
    FOREACH(LINE ${SQLFILE_LINE})
      STRING(REGEX MATCH "^ALTER|^DROP|^--|^$" IS_UPGRADE_LINE ${LINE})
      IF (NOT ${IS_UPGRADE_LINE} STREQUAL "")
-        FILE(APPEND ${UPGRADE_DBADMIN_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DBADMIN_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
         SET(LINE "-- upgrade-dbadmin: ${LINE}")
-        FILE(APPEND ${UPGRADE_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
      ELSE()
-        FILE(APPEND ${UPGRADE_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
      ENDIF()
    ENDFOREACH()
 ENDFOREACH()
@@ -115,5 +115,5 @@ FOREACH(SQLFILE ${SQLFILES})
    GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME)
    STRING(REGEX MATCH  "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses
    SET(VERSION ${CMAKE_MATCH_1})
-   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 RENAME ${VERSION})
+   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 RENAME ${BAREOS_NUMERIC_VERSION})
 ENDFOREACH()

core/platforms/freebsd/bareos-freebsd/bareos.com-common/BareosCommonMakefile

@@ -132,6 +132,7 @@ CMAKE_ARGS+= -DCMAKE_VERBOSE_MAKEFILE=ON \
   -Dsd-group=$(STORAGE_DAEMON_GROUP) \
   -Dfd-user=$(FILE_DAEMON_USER) \
   -Dfd-group=$(DAEMON_GROUP) \
+  -DVERSION_STRING=\"$(DISTVERSION)\"
 
 post-install:
 	find ${STAGEDIR} -name '*.conf' -exec mv -v {} {}.sample \;

core/platforms/packaging/bareos.spec

@@ -814,7 +814,8 @@ cmake  .. \
 %if 0%{?systemd_support}
   -Dsystemd=yes \
 %endif
-  -Dincludes=yes
+  -Dincludes=yes \
+  -DVERSION_STRING=\"%version\"
 
 #Add flags
 %__make CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags};

core/platforms/univention/CMakeLists.txt

@@ -66,7 +66,7 @@ FOREACH(SQLFILE ${SQLFILES})
    GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME)
    STRING(REGEX MATCH  "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses
    SET(VERSION ${CMAKE_MATCH_1})
-   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql RENAME ${VERSION})
+   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/mysql RENAME ${BAREOS_NUMERIC_VERSION})
 ENDFOREACH()
 
 
@@ -92,11 +92,11 @@ FOREACH(SQLFILE ${SQLFILES})
    FOREACH(LINE ${SQLFILE_LINE})
      STRING(REGEX MATCH "^ALTER|^DROP|^--|^$" IS_UPGRADE_LINE ${LINE})
      IF (NOT ${IS_UPGRADE_LINE} STREQUAL "")
-        FILE(APPEND ${UPGRADE_DBADMIN_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DBADMIN_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
         SET(LINE "-- upgrade-dbadmin: ${LINE}")
-        FILE(APPEND ${UPGRADE_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
      ELSE()
-        FILE(APPEND ${UPGRADE_DIR}/${VERSION} "${LINE}\n")
+        FILE(APPEND ${UPGRADE_DIR}/${BAREOS_NUMERIC_VERSION} "${LINE}\n")
      ENDIF()
    ENDFOREACH()
 ENDFOREACH()
@@ -115,5 +115,5 @@ FOREACH(SQLFILE ${SQLFILES})
    GET_FILENAME_COMPONENT(BASENAME ${SQLFILE} NAME)
    STRING(REGEX MATCH  "[0-9]*_([0-9]*)" DUMMMY ${SQLFILE}) # match the regex, we only are interested in submatch in parentheses
    SET(VERSION ${CMAKE_MATCH_1})
-   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 RENAME ${VERSION})
+   INSTALL (FILES ${SQLFILE} DESTINATION ${datarootdir}/dbconfig-common/data/bareos-database-common/upgrade/sqlite3 RENAME ${BAREOS_NUMERIC_VERSION})
 ENDFOREACH()

core/platforms/win32/winbareos32.spec

@@ -129,6 +129,7 @@ for flavor in %flavors; do
       -Dmon_fd_password=@mon_fd_password@ \
       -Dmon_sd_password=@mon_sd_password@ \
       -Dsd_password=@sd_password@ \
+      -DVERSION_STRING=\"%version\" \
       ..
 
    make %{?jobs:-j%jobs} DESTDIR=%{buildroot}/${flavor}-%WINDOWS_BITS install

core/platforms/win32/winbareos64.spec

@@ -129,6 +129,7 @@ for flavor in %flavors; do
       -Dmon_fd_password=@mon_fd_password@ \
       -Dmon_sd_password=@mon_sd_password@ \
       -Dsd_password=@sd_password@ \
+      -DVERSION_STRING=\"%version\" \
       ..
 
    make %{?jobs:-j%jobs} DESTDIR=%{buildroot}/${flavor}-%WINDOWS_BITS install

core/src/cats/CMakeLists.txt

@@ -40,7 +40,7 @@ set(POSTGRESQL_SRCS postgresql.cc ${LIBBAREOSCATS_SRCS})
 
 add_library(bareossql SHARED ${LIBBAREOSSQL_SRCS})
 
-set_target_properties(bareossql PROPERTIES VERSION "${VERSION}"
+set_target_properties(bareossql PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
                                           SOVERSION "${SOVERSION}"
                                           )
 target_link_libraries (bareossql bareoscats bareos)
@@ -58,7 +58,7 @@ list(LENGTH db_backends nr_db_backends)
 add_library(bareoscats SHARED ${LIBBAREOSCATS_SRCS})
 target_link_libraries (bareoscats bareos)
 set_target_properties(bareoscats PROPERTIES
-   VERSION ${VERSION}
+   VERSION ${BAREOS_NUMERIC_VERSION}
    SOVERSION "${SOVERSION}"
    )
 INSTALL(TARGETS bareoscats
@@ -133,7 +133,7 @@ IF(${nr_db_backends} EQUAL 1)
    install(CODE "set(backenddir \"${backenddir}\")")
    install(CODE "set(default_db_backend \"${default_db_backend}\")")
    install(CODE "set(CMAKE_SHARED_LIBRARY_SUFFIX \"${CMAKE_SHARED_LIBRARY_SUFFIX}\")")
-   install(CODE "set(VERSION \"${VERSION}\")")
+   install(CODE "set(VERSION \"${BAREOS_NUMERIC_VERSION}\")")
    install(CODE "set(SRC_DIR \"${PROJECT_SOURCE_DIR}\")")
 
    INSTALL(SCRIPT ${PROJECT_SOURCE_DIR}/cmake/bareos-symlink-default-db-backend.cmake)

core/src/findlib/CMakeLists.txt

@@ -32,7 +32,7 @@ target_link_libraries(bareosfind bareos ${ACL_LIBS})
 
 INSTALL(TARGETS bareosfind DESTINATION ${libdir})
 
-set_target_properties(bareosfind PROPERTIES VERSION "${VERSION}"
+set_target_properties(bareosfind PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
                                           SOVERSION "${SOVERSION}"
                                           DEFINE_SYMBOL "BUILDING_DLL"
                                           )

core/src/include/version.h

@@ -1,9 +1,11 @@
-#undef  VERSION
+#ifndef  VERSION
 #define VERSION "18.2.4rc2"
+#endif
+
 #define BDATE   "18 Dec 2018"
 #define LSMDATE "18Dec18"
 
-#define PROG_COPYRIGHT "Copyright (C) 2013-2018 Bareos GmbH & Co. KG\n" \
+#define PROG_COPYRIGHT "Copyright (C) 2013-2019 Bareos GmbH & Co. KG\n" \
                        "Copyright (C) %d-2012 Free Software Foundation Europe e.V.\n" \
                        "Copyright (C) 2010-2017 Planets Communications B.V.\n"
 #define BYEAR "2018"       /* year for copyright messages in programs */
@@ -13,7 +15,7 @@
 
    Copyright (C) 2000-2013 Free Software Foundation Europe e.V.
    Copyright (C) 2010-2017 Planets Communications B.V.
-   Copyright (C) 2013-2018 Bareos GmbH & Co. KG
+   Copyright (C) 2013-2019 Bareos GmbH & Co. KG
 
    This program is Free Software; you can redistribute it and/or
    modify it under the terms of version three of the GNU Affero General Public

core/src/lib/CMakeLists.txt

@@ -83,7 +83,7 @@ target_link_libraries(bareos
 
 INSTALL(TARGETS bareos DESTINATION ${libdir})
 
-set_target_properties(bareos PROPERTIES VERSION "${VERSION}"
+set_target_properties(bareos PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
                                       SOVERSION "${SOVERSION}")
 
 IF(HAVE_WIN32)

core/src/lmdb/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(bareoslmdb SHARED mdb.c midl.c)
 # empty the include_directories
 set_property(TARGET bareoslmdb PROPERTY INCLUDE_DIRECTORIES "")
 
-set_target_properties(bareoslmdb PROPERTIES VERSION "${VERSION}"
+set_target_properties(bareoslmdb PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
                                           SOVERSION "${SOVERSION}"
                                           )
 IF(HAVE_WIN32)

core/src/ndmp/CMakeLists.txt

@@ -19,10 +19,10 @@
 
 
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_OPTION_NO_TEST_AGENTS")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_NDMJOBLIB_REVISION=\\\"${FULLVERSION}\\\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_NDMJOBLIB_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_VENDOR_NAME=\\\"Bareos\\ GmbH\\ \\&\\ Co.KG\\\"")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_NAME=\\\"Bareos\\\"")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_REVISION=\\\"${FULLVERSION}\\\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNDMOS_CONST_PRODUCT_REVISION=\\\"${BAREOS_FULL_VERSION}\\\"")
 
 if (${HAVE_LINUX_OS})
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_LINUX_OS")
@@ -107,7 +107,7 @@ target_link_libraries(bareosndmp ${WRAP_LIBS} ${TIRPC_LIBRARIES})
 
 INSTALL(TARGETS bareosndmp DESTINATION ${libdir})
 
-set_target_properties(bareosndmp PROPERTIES VERSION "${VERSION}"
+set_target_properties(bareosndmp PROPERTIES VERSION "${BAREOS_NUMERIC_VERSION}"
                                           SOVERSION "${SOVERSION}"
 
                                           )

regress/prototype.conf

@@ -102,3 +102,6 @@ TESTPLUGIN=-Dtest-plugin=yes
 #
 # compile traymonitor
 # TRAYMON=-Dtraymonitor=yes
+#
+# override version information
+# VERSION_STRING="-DVERSION_STRING=\"18.2.4.12345\""

regress/scripts/regress-config-webui

@@ -33,7 +33,8 @@ else
     ${PASSWD} \
     -Dbaseport=${BASEPORT}\
     ${COVERAGE} \
-    ${TRAYMON}
+    ${TRAYMON}\
+    ${VERSION_STRING}
 
 fi
 

regress/scripts/regress-config.in

@@ -70,7 +70,8 @@ else
     ${COVERAGE} \
     -Ddynamic-cats-backends=yes \
     -Ddynamic-storage-backends=yes \
-    ${TRAYMON}
+    ${TRAYMON}\
+    ${VERSION_STRING}
 
 fi
 

webui/CMakeLists.txt

@@ -25,12 +25,11 @@ set(CMAKE_MODULE_PATH
          ${CMAKE_MODULE_PATH}
          ${PROJECT_SOURCE_DIR}/cmake)
 
-IF (NOT DEFINED FULLVERSION)
+IF (NOT DEFINED VERSION_STRING)
   # try to get version info from version.h
   INCLUDE(BareosExtractVersionInfo)
 ELSE()
-  # we got FULLVERSION from cmake commandline
-  string(REGEX MATCH [0-9.]+ VERSION ${FULLVERSION})
+  # we got VERSION_STRING from cmake commandline
 ENDIF()
 
 
@@ -63,9 +62,9 @@ MESSAGE("   PHP is ${PHP} ")
 MESSAGE("   Install system config files:  ${sysconfdir} ")
 MESSAGE("   Install Bareos config dir:    ${confdir} ")
 MESSAGE("   Install BareosWebui configdir:${webuiconfdir} ")
-MESSAGE("   Version is ${VERSION} ")
-STRING(REGEX REPLACE "\"" "" FULLVERSION  ${FULLVERSION} )
-MESSAGE("   FullVersion is ${FULLVERSION} ")
+STRING(REGEX REPLACE "\"" "" BAREOS_FULL_VERSION  ${VERSION_STRING} )
+MESSAGE("   VERSION_STRING is ${VERSION_STRING} ")
+MESSAGE("   BAREOS_FULL_VERSION is ${BAREOS_FULL_VERSION} ")
 
 
 IF (EXISTS ${sysconfdir}/httpd/conf.d)

webui/cmake/BareosExtractVersionInfo.cmake

@@ -17,9 +17,11 @@
 #   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 #   02110-1301, USA.
 
-
-# extract version number from version.h
-file(STRINGS ${PROJECT_SOURCE_DIR}/../core/src/include/version.h VERSION_INFO REGEX define.*VERSION.*)
-string(REGEX MATCH [0-9.]+ VERSION ${VERSION_INFO})
-string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_INFO})
-string(REGEX MATCH \".*\" FULLVERSION ${VERSION_INFO})
+# VERSION_STRING can override what is stored in version.h
+IF (NOT DEFINED VERSION_STRING)
+  # extract version number from version.h
+  file(STRINGS ${PROJECT_SOURCE_DIR}/../core/src/include/version.h VERSION_STRING REGEX define.*VERSION.*)
+ENDIF()
+string(REGEX MATCH [0-9.]+ BAREOS_NUMERIC_VERSION ${VERSION_STRING})
+string(REGEX MATCH [0-9]+ SOVERSION ${VERSION_STRING})
+string(REGEX MATCH \".*\" BAREOS_FULL_VERSION ${VERSION_STRING})

webui/debian/rules

@@ -19,7 +19,7 @@ export DH_VERBOSE = 1
 export DH_OPTIONS = -v
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DSHARE_INSTALL_PREFIX:PATH=/usr/share -Dsysconfdir=/etc -Dconfdir=/etc/bareos -Dwebuiconfdir=/etc/bareos-webui -DFULLVERSION=$(BAREOS_VERSION)
+	dh_auto_configure -- -DSHARE_INSTALL_PREFIX:PATH=/usr/share -Dsysconfdir=/etc -Dconfdir=/etc/bareos -Dwebuiconfdir=/etc/bareos-webui -DVERSION_STRING=\"$(BAREOS_VERSION)\"
 
 override_dh_install:
 	dh_install

webui/module/Application/view/layout/login.phtml

@@ -71,7 +71,7 @@ echo $this->doctype();
       <br /><br /><br />
       <?php echo $this->content; ?>
       <br />
-      <p class="text-muted">Bareos WebUI <?php echo $bareos_version_long; ?> &copy; 2013 - <?php echo date('Y') ?> <a href="http://www.bareos.com/" target="_blank">Bareos GmbH  &amp; Co. KG</a>,<br />GNU Affero General Public License Version 3</p>
+      <p class="text-muted">Bareos WebUI <?php echo $bareos_full_version; ?> &copy; 2013 - <?php echo date('Y') ?> <a href="http://www.bareos.com/" target="_blank">Bareos GmbH  &amp; Co. KG</a>,<br />GNU Affero General Public License Version 3</p>
    </div>
 
    <?php echo $this->inlineScript() ?>

webui/packaging/obs/bareos-webui.spec

@@ -109,7 +109,7 @@ cmake . \
   -Dsysconfdir=%{_sysconfdir} \
   -Dconfdir=%{_sysconfdir}/bareos \
   -Dwebuiconfdir=%{_sysconfdir}/bareos-webui \
-  -DFULLVERSION=%version
+  -DVERSION_STRING=\"%version\"
 
 make