[Pkg-owncloud-commits] [owncloud-client] 34/89: Small adjustments to the last commit

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 1291ffaf021c9f5e91f57cce441a0fd1ad6824f3
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Mon Dec 9 17:13:32 2013 +0100

    Small adjustments to the last commit
---
 VERSION.cmake           | 14 +++++++-------
 src/mirall/version.h.in |  7 -------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/VERSION.cmake b/VERSION.cmake
index 0b6bc18..ac1f66f 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -3,8 +3,8 @@ set( MIRALL_VERSION_MINOR 5 )
 set( MIRALL_VERSION_PATCH 0 )
 set( MIRALL_SOVERSION 0 )
 
-set( MIRALL_VERSION_SUFFIX "" CACHE STRING "e.g. beta1, beta2, rc1" )
-set( MIRALL_VERSION_BUILD  "0" CACHE STRING "Integer ID. Generated by the build system")
+set( MIRALL_VERSION_SUFFIX "beta3" ) # "e.g. beta1, beta2, rc1"
+set( MIRALL_VERSION_BUILD  "0" ) # "Integer ID. Generated by the build system
 
 # Composite defines
 # Used e.g. for libraries Keep at x.y.z.
@@ -14,8 +14,8 @@ set( MIRALL_VERSION_FULL ${MIRALL_VERSION} )
 set( MIRALL_VERSION_STRING ${MIRALL_VERSION} )
 set( MIRALL_VERSION_FULL "${MIRALL_VERSION_FULL}.${MIRALL_VERSION_BUILD}" )
 
-if( MIRALL_VERSION_SUFFIX )
-  set( MIRALL_VERSION_STRING "${MIRALL_VERSION} ${MIRALL_VERSION_SUFFIX} (build ${MIRALL_VERSION_BUILD})" )
-else( MIRALL_VERSION_SUFFIX )
-  set( MIRALL_VERSION_STRING "${MIRALL_VERSION} (build ${MIRALL_VERSION_BUILD})" )
-endif( MIRALL_VERSION_SUFFIX )
+set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" )
+
+if( MIRALL_VERSION_BUILD )
+    set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
+endif( MIRALL_VERSION_BUILD )
diff --git a/src/mirall/version.h.in b/src/mirall/version.h.in
index f58c3fe..d16e579 100644
--- a/src/mirall/version.h.in
+++ b/src/mirall/version.h.in
@@ -18,9 +18,6 @@
 #define MIRALL_STRINGIFY(s) MIRALL_TOSTRING(s)
 #define MIRALL_TOSTRING(s) #s
 
-/* MIRALL version macros */
-#define MIRALL_VERSION_INT_(a, b, c, d) ((a) << 24 | (b) << 16 | (c << 8) | (d))
-
 /* MIRALL version */
 #define MIRALL_VERSION_MAJOR @MIRALL_VERSION_MAJOR@
 #define MIRALL_VERSION_MINOR @MIRALL_VERSION_MINOR@
@@ -32,9 +29,5 @@
 
 #define MIRALL_VERSION_STRING "@MIRALL_VERSION_STRING@"
 
-#define MIRALL_VERSION_INT MIRALL_VERSION_INT_(MIRALL_VERSION_MAJOR, \
-                                           MIRALL_VERSION_MINOR, \
-                                           MIRALL_VERSION_PATCH, \
-                                           MIRALL_VERSION_BUILD)
 
 #endif // VERSION_H

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git