Merge lp:~robru/unity-scopes-api/vivid-tweaks into lp:unity-scopes-api/devel
- vivid-tweaks
- Merge into devel
Status: | Merged |
---|---|
Merge reported by: | Robert Bruce Park |
Merged at revision: | not available |
Proposed branch: | lp:~robru/unity-scopes-api/vivid-tweaks |
Merge into: | lp:unity-scopes-api/devel |
Diff against target: |
413 lines (+90/-180) 13 files modified
CMakeLists.txt (+17/-24) HACKING (+15/-10) debian/QT-VERSION (+0/-1) debian/QT-VERSION.MAJOR (+1/-0) debian/QT-VERSION.MICRO (+1/-0) debian/QT-VERSION.MINOR (+1/-0) debian/VERSION (+0/-1) debian/VERSION.MAJOR (+1/-0) debian/VERSION.MICRO (+1/-0) debian/VERSION.MINOR (+1/-0) debian/bileto_pre_release_hook (+51/-61) debian/get-versions.sh (+0/-82) debian/rules (+1/-1) |
To merge this branch: | bzr merge lp:~robru/unity-scopes-api/vivid-tweaks |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michi Henning (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Robert Bruce Park (community) | Needs Fixing | ||
Review via email: mp+288865@code.launchpad.net |
Commit message
Simplify debian/control munging.
Description of the change
Simplify debian/control munging.
- 376. By Robert Bruce Park
-
Update HACKING.
Robert Bruce Park (robru) wrote : | # |
Oh shit:
+ [ Pawel Stolowski ]
+ * New RangeInputFilter.
+
+ [ Michi Henning ]
+ * Changed ABI compliance testing to use abigail.
That means those are commits that were on trunk that aren't in the devel branch, that are part of this merge because I just merged devel rather than starting over on devel.
I'll fix this later...
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:375
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
PS Jenkins bot (ps-jenkins) wrote : | # |
PASSED: Continuous integration, rev:376
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
Michi Henning (michihenning) wrote : | # |
This is looking good now, thanks!
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2016-02-23 03:19:46 +0000 |
3 | +++ CMakeLists.txt 2016-03-13 03:39:30 +0000 |
4 | @@ -216,44 +216,37 @@ |
5 | set(UNITY_SCOPES_LIB unity-scopes) |
6 | set(UNITY_SCOPES_QT_LIB unity-scopes-qt) |
7 | |
8 | -# Run debian/get-versions.sh to get the version and soversion numbers for each library. |
9 | -execute_process(COMMAND mktemp -d OUTPUT_VARIABLE version_dir OUTPUT_STRIP_TRAILING_WHITESPACE) |
10 | -execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/debian/get-versions.sh ${CMAKE_SOURCE_DIR}/debian ${version_dir}) |
11 | - |
12 | # Set versions for libunity-scopes. |
13 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.full-version UNITY_SCOPES_FULL_VERSION) |
14 | -string(STRIP ${UNITY_SCOPES_FULL_VERSION} UNITY_SCOPES_FULL_VERSION) |
15 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.major-version UNITY_SCOPES_MAJOR) |
16 | +set(DEBIAN_DIR ${CMAKE_SOURCE_DIR}/debian) |
17 | +file(READ ${DEBIAN_DIR}/VERSION.MAJOR UNITY_SCOPES_MAJOR) |
18 | string(STRIP ${UNITY_SCOPES_MAJOR} UNITY_SCOPES_MAJOR) |
19 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.minor-version UNITY_SCOPES_MINOR) |
20 | +file(READ ${DEBIAN_DIR}/VERSION.MINOR UNITY_SCOPES_MINOR) |
21 | string(STRIP ${UNITY_SCOPES_MINOR} UNITY_SCOPES_MINOR) |
22 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.micro-version UNITY_SCOPES_MICRO) |
23 | +file(READ ${DEBIAN_DIR}/VERSION.MICRO UNITY_SCOPES_MICRO) |
24 | string(STRIP ${UNITY_SCOPES_MICRO} UNITY_SCOPES_MICRO) |
25 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.major-minor-version UNITY_SCOPES_MAJOR_MINOR) |
26 | -string(STRIP ${UNITY_SCOPES_MAJOR_MINOR} UNITY_SCOPES_MAJOR_MINOR) |
27 | -file(READ ${version_dir}/lib${UNITY_SCOPES_LIB}.soversion UNITY_SCOPES_SOVERSION) |
28 | -string(STRIP ${UNITY_SCOPES_SOVERSION} UNITY_SCOPES_SOVERSION) |
29 | + |
30 | +set(UNITY_SCOPES_MAJOR_MINOR ${UNITY_SCOPES_MAJOR}.${UNITY_SCOPES_MINOR}) |
31 | +set(UNITY_SCOPES_FULL_VERSION ${UNITY_SCOPES_MAJOR_MINOR}.${UNITY_SCOPES_MICRO}) |
32 | +set(UNITY_SCOPES_SOVERSION ${UNITY_SCOPES_MAJOR_MINOR}) |
33 | |
34 | # Set versions for libunity-scopes-qt. |
35 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.full-version UNITY_SCOPES_QT_FULL_VERSION) |
36 | -string(STRIP ${UNITY_SCOPES_QT_FULL_VERSION} UNITY_SCOPES_QT_FULL_VERSION) |
37 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.major-version UNITY_SCOPES_QT_MAJOR) |
38 | +file(READ ${DEBIAN_DIR}/QT-VERSION.MAJOR UNITY_SCOPES_QT_MAJOR) |
39 | string(STRIP ${UNITY_SCOPES_QT_MAJOR} UNITY_SCOPES_QT_MAJOR) |
40 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.minor-version UNITY_SCOPES_QT_MINOR) |
41 | +file(READ ${DEBIAN_DIR}/QT-VERSION.MINOR UNITY_SCOPES_QT_MINOR) |
42 | string(STRIP ${UNITY_SCOPES_QT_MINOR} UNITY_SCOPES_QT_MINOR) |
43 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.micro-version UNITY_SCOPES_QT_MICRO) |
44 | +file(READ ${DEBIAN_DIR}/QT-VERSION.MICRO UNITY_SCOPES_QT_MICRO) |
45 | string(STRIP ${UNITY_SCOPES_QT_MICRO} UNITY_SCOPES_QT_MICRO) |
46 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.major-minor-version UNITY_SCOPES_QT_MAJOR_MINOR) |
47 | -string(STRIP ${UNITY_SCOPES_QT_MAJOR_MINOR} UNITY_SCOPES_QT_MAJOR_MINOR) |
48 | -file(READ ${version_dir}/lib${UNITY_SCOPES_QT_LIB}.soversion UNITY_SCOPES_QT_SOVERSION) |
49 | -string(STRIP ${UNITY_SCOPES_QT_SOVERSION} UNITY_SCOPES_QT_SOVERSION) |
50 | + |
51 | +set(UNITY_SCOPES_QT_MAJOR_MINOR ${UNITY_SCOPES_QT_MAJOR}.${UNITY_SCOPES_QT_MINOR}) |
52 | +set(UNITY_SCOPES_QT_FULL_VERSION ${UNITY_SCOPES_QT_MAJOR_MINOR}.${UNITY_SCOPES_QT_MICRO}) |
53 | +set(UNITY_SCOPES_QT_SOVERSION ${UNITY_SCOPES_QT_MAJOR_MINOR}) |
54 | |
55 | if(NOT ${UNITY_SCOPES_MAJOR} EQUAL 1) |
56 | - message(FATAL_ERROR "Change in major version number. You need to adjust get-versions.sh and gen-debian-files.sh") |
57 | + message(FATAL_ERROR "Change in major version number. You need to adjust bileto_pre_release_hook") |
58 | endif() |
59 | |
60 | if(NOT ${UNITY_SCOPES_QT_MAJOR} EQUAL 0) |
61 | - message(FATAL_ERROR "Change in Qt major version number. You need to adjust get-versions.sh and gen-debian-files.sh") |
62 | + message(FATAL_ERROR "Change in Qt major version number. You need to adjust bileto_pre_release_hook") |
63 | endif() |
64 | |
65 | # Library for testing, with all symbols visible |
66 | |
67 | === modified file 'HACKING' |
68 | --- HACKING 2016-02-13 00:29:19 +0000 |
69 | +++ HACKING 2016-03-13 03:39:30 +0000 |
70 | @@ -234,22 +234,27 @@ |
71 | Instead, to change the version number, you must edit the following |
72 | files: |
73 | |
74 | - - VERSION |
75 | - |
76 | - The full version number for libunity-scopes, for example, 1.0.0. |
77 | - |
78 | - - QT-VERSION |
79 | - |
80 | - The full version number for libunity-scopes-qt, for example, 0.1.0. |
81 | + - VERSION.MAJOR |
82 | + - VERSION.MINOR |
83 | + - VERSION.MICRO |
84 | + |
85 | + Each file contains a single integer representing a portion of the |
86 | + libunity-scopes version. |
87 | + |
88 | + - QT-VERSION.MAJOR |
89 | + - QT-VERSION.MINOR |
90 | + - QT-VERSION.MICRO |
91 | + |
92 | + The full version number parts for libunity-scopes-qt, one integer per file. |
93 | |
94 | - *If* the soname changes, you need to add the outdated |
95 | versions to the "Replaces:" and "Conflicts:" entries |
96 | in control and control.in. (You need an extra |
97 | - entry for each Vivid and Wily. See gen-debian-files.sh |
98 | + entry for each Vivid and Wily. See bileto_pre_release_hook |
99 | for the sed scripts that append a line to the stanza |
100 | if the soname is changed. This also may apply |
101 | if the soname of the Qt library changes, in which case |
102 | - gen-debian-files.sh needs a corresponding update. |
103 | + bileto_pre_release_hook needs a corresponding update. |
104 | |
105 | The soversion for each library is derived from the corresponding |
106 | version file so, unless the soversion changes, you don't need to |
107 | @@ -281,7 +286,7 @@ |
108 | When incrementing the minor or major version number, follow these steps: |
109 | |
110 | 1) Edit one or more of the version files, control, and control.in as |
111 | - described above. Also verify that debian/gen-debian-files.sh correctly |
112 | + described above. Also verify that debian/bileto_pre_release_hook correctly |
113 | updates the "Replaces:" and "Conflicts:" entries. |
114 | |
115 | 2) Add an entry to debian/changelog with the new version number (for Wily). |
116 | |
117 | === removed file 'debian/QT-VERSION' |
118 | --- debian/QT-VERSION 2015-09-03 05:04:19 +0000 |
119 | +++ debian/QT-VERSION 1970-01-01 00:00:00 +0000 |
120 | @@ -1,1 +0,0 @@ |
121 | -0.2.0 |
122 | |
123 | === added file 'debian/QT-VERSION.MAJOR' |
124 | --- debian/QT-VERSION.MAJOR 1970-01-01 00:00:00 +0000 |
125 | +++ debian/QT-VERSION.MAJOR 2016-03-13 03:39:30 +0000 |
126 | @@ -0,0 +1,1 @@ |
127 | +0 |
128 | |
129 | === added file 'debian/QT-VERSION.MICRO' |
130 | --- debian/QT-VERSION.MICRO 1970-01-01 00:00:00 +0000 |
131 | +++ debian/QT-VERSION.MICRO 2016-03-13 03:39:30 +0000 |
132 | @@ -0,0 +1,1 @@ |
133 | +0 |
134 | |
135 | === added file 'debian/QT-VERSION.MINOR' |
136 | --- debian/QT-VERSION.MINOR 1970-01-01 00:00:00 +0000 |
137 | +++ debian/QT-VERSION.MINOR 2016-03-13 03:39:30 +0000 |
138 | @@ -0,0 +1,1 @@ |
139 | +2 |
140 | |
141 | === removed file 'debian/VERSION' |
142 | --- debian/VERSION 2016-02-29 14:12:16 +0000 |
143 | +++ debian/VERSION 1970-01-01 00:00:00 +0000 |
144 | @@ -1,1 +0,0 @@ |
145 | -1.0.4 |
146 | |
147 | === added file 'debian/VERSION.MAJOR' |
148 | --- debian/VERSION.MAJOR 1970-01-01 00:00:00 +0000 |
149 | +++ debian/VERSION.MAJOR 2016-03-13 03:39:30 +0000 |
150 | @@ -0,0 +1,1 @@ |
151 | +1 |
152 | |
153 | === added file 'debian/VERSION.MICRO' |
154 | --- debian/VERSION.MICRO 1970-01-01 00:00:00 +0000 |
155 | +++ debian/VERSION.MICRO 2016-03-13 03:39:30 +0000 |
156 | @@ -0,0 +1,1 @@ |
157 | +4 |
158 | |
159 | === added file 'debian/VERSION.MINOR' |
160 | --- debian/VERSION.MINOR 1970-01-01 00:00:00 +0000 |
161 | +++ debian/VERSION.MINOR 2016-03-13 03:39:30 +0000 |
162 | @@ -0,0 +1,1 @@ |
163 | +0 |
164 | |
165 | === renamed file 'debian/gen-debian-files.sh' => 'debian/bileto_pre_release_hook' (properties changed: -x to +x) |
166 | --- debian/gen-debian-files.sh 2015-10-19 04:22:03 +0000 |
167 | +++ debian/bileto_pre_release_hook 2016-03-13 03:39:30 +0000 |
168 | @@ -43,96 +43,86 @@ |
169 | |
170 | progname=$(basename $0) |
171 | |
172 | -[ $# -ne 1 ] && { |
173 | - echo "usage: $progname path-to-debian-dir" >&2 |
174 | +[ $# -gt 1 ] && { |
175 | + echo "usage: $progname [path-to-debian-dir]" >&2 |
176 | exit 1 |
177 | } |
178 | dir=$1 |
179 | -version_dir=$(mktemp -d) |
180 | - |
181 | -# Dump version numbers into files and initialize vars from those files. |
182 | - |
183 | -sh ${dir}/get-versions.sh ${dir} ${version_dir} |
184 | - |
185 | -full_version=$(cat "${version_dir}"/libunity-scopes.full-version) |
186 | -qt_full_version=$(cat "${version_dir}"/libunity-scopes-qt.full-version) |
187 | - |
188 | -major_minor=$(cat "${version_dir}"/libunity-scopes.major-minor-version) |
189 | -qt_major_minor=$(cat "${version_dir}"/libunity-scopes-qt.major-minor-version) |
190 | - |
191 | -soversion=$(cat "${version_dir}"/libunity-scopes.soversion) |
192 | -qt_soversion=$(cat "${version_dir}"/libunity-scopes-qt.soversion) |
193 | - |
194 | -vivid_soversion=$(cat "${version_dir}"/libunity-scopes.vivid-soversion) |
195 | - |
196 | -warning=$(mktemp -t gen-debian-files-msg.XXX) |
197 | - |
198 | -trap "rm -fr $warning $version_dir" 0 INT TERM QUIT |
199 | - |
200 | -warning_msg() |
201 | +[ -n "$dir" ] || dir="./debian" |
202 | + |
203 | +# Only call lsb_release if $SERIES isn't already set |
204 | +[ -n "$SERIES" ] || SERIES=$(lsb_release -c -s) |
205 | + |
206 | +export UNITY_SCOPES_MAJOR_VERSION=$(cat "$dir/VERSION.MAJOR") |
207 | +export UNITY_SCOPES_MINOR_VERSION=$(cat "$dir/VERSION.MINOR") |
208 | +export UNITY_SCOPES_MICRO_VERSION=$(cat "$dir/VERSION.MICRO") |
209 | + |
210 | +export UNITY_SCOPES_QT_MAJOR_VERSION=$(cat "$dir/QT-VERSION.MAJOR") |
211 | +export UNITY_SCOPES_QT_MINOR_VERSION=$(cat "$dir/QT-VERSION.MINOR") |
212 | +export UNITY_SCOPES_QT_MICRO_VERSION=$(cat "$dir/QT-VERSION.MICRO") |
213 | + |
214 | +export UNITY_SCOPES_MAJOR_MINOR="$UNITY_SCOPES_MAJOR_VERSION.$UNITY_SCOPES_MINOR_VERSION" |
215 | +export UNITY_SCOPES_QT_MAJOR_MINOR="$UNITY_SCOPES_QT_MAJOR_VERSION.$UNITY_SCOPES_QT_MINOR_VERSION" |
216 | + |
217 | +export UNITY_SCOPES_FULL_VERSION="$UNITY_SCOPES_MAJOR_MINOR.$UNITY_SCOPES_MICRO_VERSION" |
218 | +export UNITY_SCOPES_QT_FULL_VERSION="$UNITY_SCOPES_QT_MAJOR_MINOR.$UNITY_SCOPES_QT_MICRO_VERSION" |
219 | + |
220 | +if [ "$SERIES" = "vivid" ] |
221 | +then |
222 | + export UNITY_SCOPES_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3) |
223 | + export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MINOR_VERSION" |
224 | +else |
225 | + export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_MAJOR_MINOR" |
226 | + export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MAJOR_MINOR" |
227 | +fi |
228 | +[ -n "$UNITY_SCOPES_SOVERSION" ] |
229 | +[ -n "$UNITY_SCOPES_QT_SOVERSION" ] |
230 | + |
231 | + |
232 | +process() |
233 | { |
234 | - cat >$warning <<EOF |
235 | + cat <<EOF |
236 | # This file is autogenerated. DO NOT EDIT! |
237 | # |
238 | # Modifications should be made to $(basename "$1") instead. |
239 | # This file is regenerated automatically in the clean target. |
240 | # |
241 | EOF |
242 | + perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1" |
243 | } |
244 | |
245 | # Generate debian/control from debian/control.in, substituting the soversion for both libs. |
246 | # For wily onwards, we also add an entry for the vivid versions to "Conflicts:" and "Replaces:". |
247 | |
248 | -infile="${dir}"/control.in |
249 | -outfile="${dir}"/control |
250 | -warning_msg $infile |
251 | -cat $warning $infile \ |
252 | - | sed -e "s/@UNITY_SCOPES_SOVERSION@/${soversion}/" \ |
253 | - -e "s/@UNITY_SCOPES_QT_SOVERSION@/${qt_soversion}/" >"$outfile" |
254 | +process "$dir/control.in" >"$dir/control" |
255 | |
256 | -[ "$distro" != "vivid" ] && { |
257 | +[ "$SERIES" != "vivid" ] && { |
258 | sed -i -e "/Replaces: libunity-scopes0,/a\ |
259 | -\ libunity-scopes${vivid_soversion}," \ |
260 | +\ libunity-scopes${UNITY_SCOPES_VIVID_SOVERSION}," \ |
261 | -e "/Conflicts: libunity-scopes0,/a\ |
262 | -\ libunity-scopes${vivid_soversion}," \ |
263 | - "$outfile" |
264 | +\ libunity-scopes${UNITY_SCOPES_VIVID_SOVERSION}," \ |
265 | + "$dir/control" |
266 | } |
267 | |
268 | # Generate the install files, naming them according to the soversion. |
269 | |
270 | # Install file for binary package |
271 | -infile="${dir}"/libunity-scopes.install.in |
272 | -outfile="${dir}"/libunity-scopes${soversion}.install |
273 | -warning_msg "$infile" |
274 | -cat $warning "$infile" >"$outfile" |
275 | +process "$dir/libunity-scopes.install.in" \ |
276 | + >"$dir/libunity-scopes${UNITY_SCOPES_SOVERSION}.install" |
277 | |
278 | # Install file for click hook |
279 | -infile="${dir}"/libunity-scopes.scope.click-hook.in |
280 | -outfile="${dir}"/libunity-scopes${soversion}.scope.click-hook |
281 | -warning_msg "$infile" |
282 | -cat $warning "$infile" >"$outfile" |
283 | +process "$dir/libunity-scopes.scope.click-hook.in" \ |
284 | + >"$dir/libunity-scopes${UNITY_SCOPES_SOVERSION}.scope.click-hook" |
285 | |
286 | # Shlibs file |
287 | -infile="${dir}"/libunity-scopes.shlibs.in |
288 | -outfile="${dir}"/libunity-scopes-${full_version}.shlibs |
289 | -warning_msg "$infile" |
290 | -cat $warning "$infile" \ |
291 | - | sed -e "s/@UNITY_SCOPES_SOVERSION@/${soversion}/g" \ |
292 | - -e "s/@UNITY_SCOPES_MAJOR_MINOR@/${major_minor}/g" \ |
293 | - >"$outfile" |
294 | +process "$dir/libunity-scopes.shlibs.in" \ |
295 | + >"$dir/libunity-scopes-${UNITY_SCOPES_FULL_VERSION}.shlibs" |
296 | |
297 | -infile="${dir}"/libunity-scopes-qt.shlibs.in |
298 | -outfile="${dir}"/libunity-scopes-qt${qt_full_version}.shlibs |
299 | -warning_msg "$infile" |
300 | -cat $warning "$infile" \ |
301 | - | sed -e "s/@UNITY_SCOPES_QT_SOVERSION@/${qt_soversion}/g" \ |
302 | - -e "s/@UNITY_SCOPES_QT_MAJOR_MINOR@/${qt_major_minor}/g" \ |
303 | - >"$outfile" |
304 | +process "$dir/libunity-scopes-qt.shlibs.in" \ |
305 | + >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_FULL_VERSION}.shlibs" |
306 | |
307 | # Install file for qt binary package |
308 | -infile="${dir}"/libunity-scopes-qt.install.in |
309 | -outfile="${dir}"/libunity-scopes-qt${qt_soversion}.install |
310 | -warning_msg "$infile" |
311 | -cat $warning "$infile" >"$outfile" |
312 | +process "$dir/libunity-scopes-qt.install.in" \ |
313 | + >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_SOVERSION}.install" |
314 | |
315 | exit 0 |
316 | |
317 | === removed file 'debian/get-versions.sh' |
318 | --- debian/get-versions.sh 2015-10-19 04:22:03 +0000 |
319 | +++ debian/get-versions.sh 1970-01-01 00:00:00 +0000 |
320 | @@ -1,82 +0,0 @@ |
321 | -#!/bin/sh |
322 | - |
323 | -# Copyright (C) 2015 Canonical Ltd |
324 | -# |
325 | -# This program is free software: you can redistribute it and/or modify |
326 | -# it under the terms of the GNU Lesser General Public License version 3 as |
327 | -# published by the Free Software Foundation. |
328 | -# |
329 | -# This program is distributed in the hope that it will be useful, |
330 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
331 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
332 | -# GNU Lesser General Public License for more details. |
333 | -# |
334 | -# You should have received a copy of the GNU Lesser General Public License |
335 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
336 | -# |
337 | -# Authored by: Michi Henning <michi.henning@canonical.com> |
338 | - |
339 | -# |
340 | -# Script to read the version numbers from VERSION and QT-VERSION |
341 | -# and write the version components and the soversion numbers |
342 | -# into separate files, so we can pick them up from both |
343 | -# gen-debian-files.sh and CMakeLists.txt. |
344 | -# |
345 | - |
346 | -set -e # Fail if any command fails. |
347 | - |
348 | -progname=$(basename $0) |
349 | - |
350 | -[ $# -lt 1 -o $# -gt 2 ] && { |
351 | - echo "usage: $progname path-to-debian-dir [output-dir]" >&2 |
352 | - exit 1 |
353 | -} |
354 | -dir=$1 |
355 | -output_dir=`pwd` |
356 | -[ $# -eq 2 ] && output_dir=$2 |
357 | - |
358 | -# Write the various version numbers into a bunch of files. This allows |
359 | -# us to easily pick them up from both gen-debian-files.sh and CMakeLists.txt. |
360 | - |
361 | -distro=$(lsb_release -c -s) |
362 | - |
363 | -full_version=$(cat "${dir}"/VERSION) |
364 | -qt_full_version=$(cat "${dir}"/QT-VERSION) |
365 | - |
366 | -major=$(echo $full_version | cut -d'.' -f1) |
367 | -minor=$(echo $full_version | cut -d'.' -f2) |
368 | -micro=$(echo $full_version | cut -d'.' -f3) |
369 | -major_minor="${major}.${minor}" |
370 | - |
371 | -qt_major=$(echo $qt_full_version | cut -d'.' -f1) |
372 | -qt_minor=$(echo $qt_full_version | cut -d'.' -f2) |
373 | -qt_micro=$(echo $qt_full_version | cut -d'.' -f3) |
374 | -qt_major_minor="${qt_major}.${qt_minor}" |
375 | - |
376 | -vivid_soversion=$(expr $minor + 3) |
377 | - |
378 | -if [ "$distro" = "vivid" ] |
379 | -then |
380 | - soversion=$vivid_soversion |
381 | - qt_soversion=${qt_minor} |
382 | -else |
383 | - soversion="${major}.${minor}" |
384 | - qt_soversion="${qt_major}.${qt_minor}" |
385 | -fi |
386 | -[ -n $soversion ] |
387 | -[ -n $qt_soversion ] |
388 | - |
389 | -echo ${full_version} >${output_dir}/libunity-scopes.full-version |
390 | -echo ${major} >${output_dir}/libunity-scopes.major-version |
391 | -echo ${minor} >${output_dir}/libunity-scopes.minor-version |
392 | -echo ${micro} >${output_dir}/libunity-scopes.micro-version |
393 | -echo ${major_minor} >${output_dir}/libunity-scopes.major-minor-version |
394 | -echo ${soversion} >${output_dir}/libunity-scopes.soversion |
395 | -echo ${vivid_soversion} >${output_dir}/libunity-scopes.vivid-soversion |
396 | - |
397 | -echo ${qt_full_version} >${output_dir}/libunity-scopes-qt.full-version |
398 | -echo ${qt_major} >${output_dir}/libunity-scopes-qt.major-version |
399 | -echo ${qt_minor} >${output_dir}/libunity-scopes-qt.minor-version |
400 | -echo ${qt_micro} >${output_dir}/libunity-scopes-qt.micro-version |
401 | -echo ${qt_major_minor} >${output_dir}/libunity-scopes-qt.major-minor-version |
402 | -echo ${qt_soversion} >${output_dir}/libunity-scopes-qt.soversion |
403 | |
404 | === modified file 'debian/rules' |
405 | --- debian/rules 2016-02-12 02:23:36 +0000 |
406 | +++ debian/rules 2016-03-13 03:39:30 +0000 |
407 | @@ -24,5 +24,5 @@ |
408 | dh_click --name scope |
409 | |
410 | override_dh_auto_clean: |
411 | - /bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian |
412 | + /bin/sh $(CURDIR)/debian/bileto_pre_release_hook |
413 | dh_auto_clean |
Build looks good on my end here:
https:/ /requests. ci-train. staging. ubuntu. com/log/ 16/build/ 22
But the diffs went a bit crazy:
https:/ /objectstorage. prodstack4- 5.canonical. com/v1/ AUTH_363fe1b4bf e34b0295bc243be 24dfbf1/ bileto- 16/2016- 03-13_03: 47:55/xenial_ unity-scopes- api_content. diff /objectstorage. prodstack4- 5.canonical. com/v1/ AUTH_363fe1b4bf e34b0295bc243be 24dfbf1/ bileto- 16/2016- 03-13_03: 47:55/vivid_ unity-scopes- api_content. diff
https:/
I guess you have a lot of unreleased changes in the devel branch? Please take a look at the diffs and confirm that this branch is producing expected results, thanks.
This branch also should work with the existing train, so please do include this in your next silo (but there's no need to make a silo just for this merge)