unity-scopes-api

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

  1. bileto-fix
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Superseded
Proposed branch: lp:~michihenning/unity-scopes-api/bileto-fix
Merge into: lp:unity-scopes-api
Prerequisite: lp:unity-scopes-api/staging
Diff against target: 56 lines (+15/-4)
2 files modified
CMakeLists.txt (+11/-2)
debian/bileto_pre_release_hook (+4/-2)
To merge this branch: bzr merge lp:~michihenning/unity-scopes-api/bileto-fix
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+290560@code.launchpad.net

This proposal supersedes a proposal from 2016-03-31.

Commit message

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

Description of the change

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

To post a comment you must log in.
lp:~michihenning/unity-scopes-api/bileto-fix updated
367. By Michi Henning

Use a single version file instead of three separate files for major, minor, and micro.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-03-31 05:28:37 +0000
3+++ CMakeLists.txt 2016-03-31 05:28:37 +0000
4@@ -115,7 +115,7 @@
5 message(WARNING "Cannot find dos2unix: formatcode target will not be available")
6 else()
7 # Some time after clang-format-3.6, someone finally decided to install the versioned
8- # /usr/bin/clang-format binary name as /usr/bin/clang-format (without out version suffix).
9+ # /usr/bin/clang-format binary name as /usr/bin/clang-format (without the version suffix).
10 find_program(CLANG_FORMAT_COMMAND NAMES clang-format clang-format-3.6 clang-format-3.5)
11 if (NOT CLANG_FORMAT_COMMAND)
12 message(WARNING "Cannot find clang-format >= clang-format-3.5: formatcode target will not be available")
13@@ -229,7 +229,16 @@
14
15 set(UNITY_SCOPES_MAJOR_MINOR ${UNITY_SCOPES_MAJOR}.${UNITY_SCOPES_MINOR})
16 set(UNITY_SCOPES_FULL_VERSION ${UNITY_SCOPES_MAJOR_MINOR}.${UNITY_SCOPES_MICRO})
17-set(UNITY_SCOPES_SOVERSION ${UNITY_SCOPES_MAJOR_MINOR})
18+
19+execute_process(COMMAND lsb_release -c -s OUTPUT_VARIABLE SERIES)
20+string(STRIP ${SERIES} SERIES)
21+if (${SERIES} STREQUAL "vivid")
22+ # For backward compatibility. On Vivid, the soname started counting at 3: libunity-scopes.so.3.
23+ math(EXPR UNITY_SCOPES_SOVERSION "${UNITY_SCOPES_MINOR} + 3")
24+else()
25+ # For Wily and later, the soname is libunity-scopes.so.<maj>.<min>, e.g. libunity-scopes.so.1.0.
26+ set(UNITY_SCOPES_SOVERSION ${UNITY_SCOPES_MAJOR_MINOR})
27+endif()
28
29 # Set versions for libunity-scopes-qt.
30 file(READ ${DEBIAN_DIR}/QT-VERSION.MAJOR UNITY_SCOPES_QT_MAJOR)
31
32=== modified file 'debian/bileto_pre_release_hook'
33--- debian/bileto_pre_release_hook 2016-03-31 05:28:37 +0000
34+++ debian/bileto_pre_release_hook 2016-03-31 05:28:37 +0000
35@@ -67,9 +67,11 @@
36 export UNITY_SCOPES_FULL_VERSION="$UNITY_SCOPES_MAJOR_MINOR.$UNITY_SCOPES_MICRO_VERSION"
37 export UNITY_SCOPES_QT_FULL_VERSION="$UNITY_SCOPES_QT_MAJOR_MINOR.$UNITY_SCOPES_QT_MICRO_VERSION"
38
39+export UNITY_SCOPES_VIVID_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3)
40+
41 if [ "$SERIES" = "vivid" ]
42 then
43- export UNITY_SCOPES_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3)
44+ export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_VIVID_SOVERSION"
45 export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MINOR_VERSION"
46 else
47 export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_MAJOR_MINOR"
48@@ -85,7 +87,7 @@
49 # This file is autogenerated. DO NOT EDIT!
50 #
51 # Modifications should be made to $(basename "$1") instead.
52-# This file is regenerated automatically in the clean target.
53+# This file is regenerated automatically by bileto.
54 #
55 EOF
56 perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1"

Subscribers

People subscribed via source and target branches

to all changes: