Merge lp:~michihenning/unity-scopes-api/bileto-fix into lp:unity-scopes-api

[Marcus Tomlinson]

Fixed incorrect generation of Replaces: and Conflicts: entries in debian/control for xenial.
Fixed incorrect library soname for vivid.

Fixed incorrect generation of Replaces: and Conflicts: entries in debian/control for xenial.
Fixed incorrect library soname for vivid.

[Marcus Tomlinson (marcustomlinson)]

Just tested this on the phone and looks good. Thanks Michi!

review: Approve

[Marcus Tomlinson (marcustomlinson)]

I need to re-test this

review: Needs Information

[Marcus Tomlinson (marcustomlinson)]

Looks good

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-04-01 00:11:19 +0000
+++ CMakeLists.txt	2016-04-01 00:11:19 +0000
@@ -115,7 +115,7 @@
         message(WARNING "Cannot find dos2unix: formatcode target will not be available")
     else()
         # Some time after clang-format-3.6, someone finally decided to install the versioned
-        # /usr/bin/clang-format binary name as /usr/bin/clang-format (without out version suffix).
+        # /usr/bin/clang-format binary name as /usr/bin/clang-format (without the version suffix).
         find_program(CLANG_FORMAT_COMMAND NAMES clang-format clang-format-3.6 clang-format-3.5)
         if (NOT CLANG_FORMAT_COMMAND)
             message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
@@ -218,26 +218,34 @@
 set(UNITY_SCOPES_LIB unity-scopes)
 set(UNITY_SCOPES_QT_LIB unity-scopes-qt)
 
+set(DEBIAN_DIR ${CMAKE_SOURCE_DIR}/debian)
+
 # Set versions for libunity-scopes.
-set(DEBIAN_DIR ${CMAKE_SOURCE_DIR}/debian)
-file(READ ${DEBIAN_DIR}/VERSION.MAJOR UNITY_SCOPES_MAJOR)
-string(STRIP ${UNITY_SCOPES_MAJOR} UNITY_SCOPES_MAJOR)
-file(READ ${DEBIAN_DIR}/VERSION.MINOR UNITY_SCOPES_MINOR)
-string(STRIP ${UNITY_SCOPES_MINOR} UNITY_SCOPES_MINOR)
-file(READ ${DEBIAN_DIR}/VERSION.MICRO UNITY_SCOPES_MICRO)
-string(STRIP ${UNITY_SCOPES_MICRO} UNITY_SCOPES_MICRO)
+file(READ ${DEBIAN_DIR}/VERSION version)
+string(REGEX MATCHALL "[0-9]+" version_list ${version})
+list(GET version_list 0 UNITY_SCOPES_MAJOR)
+list(GET version_list 1 UNITY_SCOPES_MINOR)
+list(GET version_list 2 UNITY_SCOPES_MICRO)
 
 set(UNITY_SCOPES_MAJOR_MINOR ${UNITY_SCOPES_MAJOR}.${UNITY_SCOPES_MINOR})
 set(UNITY_SCOPES_FULL_VERSION ${UNITY_SCOPES_MAJOR_MINOR}.${UNITY_SCOPES_MICRO})
-set(UNITY_SCOPES_SOVERSION ${UNITY_SCOPES_MAJOR_MINOR})
+
+execute_process(COMMAND lsb_release -c -s OUTPUT_VARIABLE SERIES)
+string(STRIP ${SERIES} SERIES)
+if (${SERIES} STREQUAL "vivid")
+    # For backward compatibility. On Vivid, the soname started counting at 3: libunity-scopes.so.3.
+    math(EXPR UNITY_SCOPES_SOVERSION "${UNITY_SCOPES_MINOR} + 3")
+else()
+    # For Wily and later, the soname is libunity-scopes.so.<maj>.<min>, e.g. libunity-scopes.so.1.0.
+    set(UNITY_SCOPES_SOVERSION ${UNITY_SCOPES_MAJOR_MINOR})
+endif()
 
 # Set versions for libunity-scopes-qt.
-file(READ ${DEBIAN_DIR}/QT-VERSION.MAJOR UNITY_SCOPES_QT_MAJOR)
-string(STRIP ${UNITY_SCOPES_QT_MAJOR} UNITY_SCOPES_QT_MAJOR)
-file(READ ${DEBIAN_DIR}/QT-VERSION.MINOR UNITY_SCOPES_QT_MINOR)
-string(STRIP ${UNITY_SCOPES_QT_MINOR} UNITY_SCOPES_QT_MINOR)
-file(READ ${DEBIAN_DIR}/QT-VERSION.MICRO UNITY_SCOPES_QT_MICRO)
-string(STRIP ${UNITY_SCOPES_QT_MICRO} UNITY_SCOPES_QT_MICRO)
+file(READ ${DEBIAN_DIR}/QT-VERSION version)
+string(REGEX MATCHALL "[0-9]+" version_list ${version})
+list(GET version_list 0 UNITY_SCOPES_QT_MAJOR)
+list(GET version_list 1 UNITY_SCOPES_QT_MINOR)
+list(GET version_list 2 UNITY_SCOPES_QT_MICRO)
 
 set(UNITY_SCOPES_QT_MAJOR_MINOR ${UNITY_SCOPES_QT_MAJOR}.${UNITY_SCOPES_QT_MINOR})
 set(UNITY_SCOPES_QT_FULL_VERSION ${UNITY_SCOPES_QT_MAJOR_MINOR}.${UNITY_SCOPES_QT_MICRO})

=== modified file 'HACKING'
--- HACKING	2016-04-01 00:11:19 +0000
+++ HACKING	2016-04-01 00:11:19 +0000
@@ -231,31 +231,32 @@
 The version numbers for the libraries are generated from files
 in the debian directory. (See below for general rules on versioning.)
 There are no version numbers defined in any of the MakeLists.txt files.
-Instead, to change the version number, you must edit the following
+Instead, to change the version numbers, you must edit the following
 files:
 
-  - VERSION.MAJOR
-  - VERSION.MINOR
-  - VERSION.MICRO
-
-    Each file contains a single integer representing a portion of the 
-    libunity-scopes version.
-
-  - QT-VERSION.MAJOR
-  - QT-VERSION.MINOR
-  - QT-VERSION.MICRO
-
-    The full version number parts for libunity-scopes-qt, one integer per file.
+  - VERSION
+
+    The full version number for libunity-scopes.
+
+  - QT-VERSION
+
+    The full version number parts for libunity-scopes-qt.
 
   - *If* the soname changes, you need to add the outdated
     versions to the "Replaces:" and "Conflicts:" entries
     in control and control.in. (You need an extra
-    entry for each Vivid and Wily. See bileto_pre_release_hook
-    for the sed scripts that append a line to the stanza
-    if the soname is changed. This also may apply
+    entry for each Vivid and Wily/Xenial andlater. See
+    bileto_pre_release_hook for the sed scripts that append a
+    line to the stanza if the soname is changed. This also may apply
     if the soname of the Qt library changes, in which case
     bileto_pre_release_hook needs a corresponding update.
 
+The version files have the format
+
+    <major>.<minor>.<micro>
+
+All three numbers must be present.
+
 The soversion for each library is derived from the corresponding
 version file so, unless the soversion changes, you don't need to
 do anything special.

=== removed file 'debian/QT-VERSION.MAJOR'
--- debian/QT-VERSION.MAJOR	2016-04-01 00:11:19 +0000
+++ debian/QT-VERSION.MAJOR	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0

=== removed file 'debian/QT-VERSION.MICRO'
--- debian/QT-VERSION.MICRO	2016-04-01 00:11:19 +0000
+++ debian/QT-VERSION.MICRO	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0

=== removed file 'debian/QT-VERSION.MINOR'
--- debian/QT-VERSION.MINOR	2016-04-01 00:11:19 +0000
+++ debian/QT-VERSION.MINOR	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== removed file 'debian/VERSION.MAJOR'
--- debian/VERSION.MAJOR	2016-04-01 00:11:19 +0000
+++ debian/VERSION.MAJOR	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-1

=== removed file 'debian/VERSION.MICRO'
--- debian/VERSION.MICRO	2016-04-01 00:11:19 +0000
+++ debian/VERSION.MICRO	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-5

=== removed file 'debian/VERSION.MINOR'
--- debian/VERSION.MINOR	2016-04-01 00:11:19 +0000
+++ debian/VERSION.MINOR	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-0

=== modified file 'debian/bileto_pre_release_hook'
--- debian/bileto_pre_release_hook	2016-04-01 00:11:19 +0000
+++ debian/bileto_pre_release_hook	2016-04-01 00:11:19 +0000
@@ -53,13 +53,13 @@
 # Only call lsb_release if $SERIES isn't already set
 [ -n "$SERIES" ] || SERIES=$(lsb_release -c -s)
 
-export UNITY_SCOPES_MAJOR_VERSION=$(cat "$dir/VERSION.MAJOR")
-export UNITY_SCOPES_MINOR_VERSION=$(cat "$dir/VERSION.MINOR")
-export UNITY_SCOPES_MICRO_VERSION=$(cat "$dir/VERSION.MICRO")
+export UNITY_SCOPES_MAJOR_VERSION=$(cut -d. -f1 "$dir/VERSION")
+export UNITY_SCOPES_MINOR_VERSION=$(cut -d. -f2 "$dir/VERSION")
+export UNITY_SCOPES_MICRO_VERSION=$(cut -d. -f3 "$dir/VERSION")
 
-export UNITY_SCOPES_QT_MAJOR_VERSION=$(cat "$dir/QT-VERSION.MAJOR")
-export UNITY_SCOPES_QT_MINOR_VERSION=$(cat "$dir/QT-VERSION.MINOR")
-export UNITY_SCOPES_QT_MICRO_VERSION=$(cat "$dir/QT-VERSION.MICRO")
+export UNITY_SCOPES_QT_MAJOR_VERSION=$(cut -d. -f1 "$dir/QT-VERSION")
+export UNITY_SCOPES_QT_MINOR_VERSION=$(cut -d. -f2 "$dir/QT-VERSION")
+export UNITY_SCOPES_QT_MICRO_VERSION=$(cut -d. -f3 "$dir/QT-VERSION")
 
 export UNITY_SCOPES_MAJOR_MINOR="$UNITY_SCOPES_MAJOR_VERSION.$UNITY_SCOPES_MINOR_VERSION"
 export UNITY_SCOPES_QT_MAJOR_MINOR="$UNITY_SCOPES_QT_MAJOR_VERSION.$UNITY_SCOPES_QT_MINOR_VERSION"
@@ -67,9 +67,11 @@
 export UNITY_SCOPES_FULL_VERSION="$UNITY_SCOPES_MAJOR_MINOR.$UNITY_SCOPES_MICRO_VERSION"
 export UNITY_SCOPES_QT_FULL_VERSION="$UNITY_SCOPES_QT_MAJOR_MINOR.$UNITY_SCOPES_QT_MICRO_VERSION"
 
+export UNITY_SCOPES_VIVID_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3)
+
 if [ "$SERIES" = "vivid" ]
 then
-    export UNITY_SCOPES_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3)
+    export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_VIVID_SOVERSION"
     export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MINOR_VERSION"
 else
     export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_MAJOR_MINOR"
@@ -85,7 +87,7 @@
 # This file is autogenerated. DO NOT EDIT!
 #
 # Modifications should be made to $(basename "$1") instead.
-# This file is regenerated automatically in the clean target.
+# This file is regenerated automatically by bileto.
 #
 EOF
     perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"