Commit deeca7c3 authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum

[CHANGE] version string fix. Lintian does not complain about them anymore

parent 90bc6760
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
# systems refuse to accept these arbitrary version strings. # systems refuse to accept these arbitrary version strings.
# The current version string: # The current version string:
VERSION=1.3.0rc1+hgX VERSION=1.3.0~rc1+hgX
...@@ -535,7 +535,7 @@ FUNCTION( GET_VERSION_STRING _version _api_version ) ...@@ -535,7 +535,7 @@ FUNCTION( GET_VERSION_STRING _version _api_version )
# Read the version file # Read the version file
FILE( READ ${OW_VERSION_FILENAME} OW_VERSION_FILE_CONTENT ) FILE( READ ${OW_VERSION_FILENAME} OW_VERSION_FILE_CONTENT )
# The first regex will mathc # The first regex will mathc
STRING( REGEX REPLACE ".*[^#]VERSION=([0-9]+\\.[0-9]+\\.[0-9]+[_a-z,A-Z,0-9]*(\\+hgX?[0-9]*)?).*" "\\1" OW_VERSION_FILE ${OW_VERSION_FILE_CONTENT} ) STRING( REGEX REPLACE ".*[^#]VERSION=([0-9]+\\.[0-9]+\\.[0-9]+[_~a-z,A-Z,0-9]*(\\+hgX?[0-9]*)?).*" "\\1" OW_VERSION_FILE ${OW_VERSION_FILE_CONTENT} )
STRING( COMPARE EQUAL ${OW_VERSION_FILE} ${OW_VERSION_FILE_CONTENT} OW_VERSION_FILE_INVALID ) STRING( COMPARE EQUAL ${OW_VERSION_FILE} ${OW_VERSION_FILE_CONTENT} OW_VERSION_FILE_INVALID )
IF( OW_VERSION_FILE_INVALID ) IF( OW_VERSION_FILE_INVALID )
UNSET( OW_VERSION_FILE ) UNSET( OW_VERSION_FILE )
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
VERSION_BASE=1.3.0 VERSION_BASE=1.3.0
# Any additonal tags? # Any additonal tags?
VERSION_TAGS=rc1 VERSION_TAGS="~rc1"
# Should the package number contain the HG revision? # Should the package number contain the HG revision?
VERSION_INCLUDE_HG=1 VERSION_INCLUDE_HG=1
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
override_dh_auto_build: override_dh_auto_build:
# Invoke standard build mechanism. # Invoke standard build mechanism.
dh_auto_build # dh_auto_build
# Enable this if you have a multi-core machine and are debugging the debian packages. Disable again for upload. # Enable this if you have a multi-core machine and are debugging the debian packages. Disable again for upload.
#dh_auto_build -- -j10 dh_auto_build -- -j10
# build the core api documentation too # build the core api documentation too
dh_auto_build -- core_devdoc dh_auto_build -- core_devdoc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment