Merge lp:~robru/unity-scopes-api/vivid-tweaks into lp:unity-scopes-api
- vivid-tweaks
- Merge into trunk
Status: | Rejected |
---|---|
Rejected by: | Robert Bruce Park |
Proposed branch: | lp:~robru/unity-scopes-api/vivid-tweaks |
Merge into: | lp:unity-scopes-api |
Diff against target: |
363 lines (+75/-170) 12 files modified
CMakeLists.txt (+17/-24) 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 |
---|---|---|---|
Robert Bruce Park (community) | Approve | ||
Review via email: mp+288847@code.launchpad.net |
Commit message
Add new bileto hooks for debian/control munging.
Description of the change
Experimenting with potential big changes in ci train / bileto.
- 362. By Robert Bruce Park
-
Make argument optional.
- 363. By Robert Bruce Park
-
Fix permissions.
- 364. By Robert Bruce Park
-
Fix unassigned $distro var.
- 365. By Robert Bruce Park
-
Let's try it this way...
- 366. By Robert Bruce Park
-
Just one hook.
- 367. By Robert Bruce Park
-
set -x
- 368. By Robert Bruce Park
-
Optimize away get-versions.sh
- 369. By Robert Bruce Park
-
Fix version name.
- 370. By Robert Bruce Park
-
Shuffle files.
- 371. By Robert Bruce Park
-
Drop set -x
- 372. By Robert Bruce Park
-
First stab at fixing cmake.
Robert Bruce Park (robru) wrote : | # |
Alright this looks reasonable on my end:
https:/
Although it looks like some new files are being created in vivid that weren't before, not sure what happened here:
- 373. By Robert Bruce Park
-
No commas.
Michi Henning (michihenning) wrote : | # |
There were a few typos in CMakeLists.txt. The instructions in HACKING will need updating too. Note that you really need to merge propose for the devel branch; trunk is usually quite a bit behind devel, and there have been a bunch of changes to HACKING on devel since we last released.
Otherwise, this looks workable!
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-03-12 09:09:57 +0000
+++ CMakeLists.txt 2016-03-13 00:26:23 +0000
@@ -222,8 +222,8 @@
string(STRIP ${UNITY_
file(READ ${DEBIAN_
string(STRIP ${UNITY_
-file(READ ${DEBIAN_
-string(STRIP ${UNITY_
+file(READ ${DEBIAN_
+string(STRIP ${UNITY_
set(UNITY_
set(UNITY_
@@ -234,8 +234,8 @@
string(STRIP ${UNITY_
file(READ ${DEBIAN_
string(STRIP ${UNITY_
-file(READ ${DEBIAN_
-string(STRIP ${UNITY_
+file(READ ${DEBIAN_
+string(STRIP ${UNITY_
set(UNITY_
set(UNITY_
- 374. By Robert Bruce Park
-
Copy&paste error.
- 375. By Robert Bruce Park
-
Rebase on devel.
Unmerged revisions
Preview Diff
1 | === modified file 'CMakeLists.txt' |
2 | --- CMakeLists.txt 2015-10-19 04:22:03 +0000 |
3 | +++ CMakeLists.txt 2016-03-13 03:22:25 +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 | === removed file 'debian/QT-VERSION' |
68 | --- debian/QT-VERSION 2015-09-03 05:04:19 +0000 |
69 | +++ debian/QT-VERSION 1970-01-01 00:00:00 +0000 |
70 | @@ -1,1 +0,0 @@ |
71 | -0.2.0 |
72 | |
73 | === added file 'debian/QT-VERSION.MAJOR' |
74 | --- debian/QT-VERSION.MAJOR 1970-01-01 00:00:00 +0000 |
75 | +++ debian/QT-VERSION.MAJOR 2016-03-13 03:22:25 +0000 |
76 | @@ -0,0 +1,1 @@ |
77 | +0 |
78 | |
79 | === added file 'debian/QT-VERSION.MICRO' |
80 | --- debian/QT-VERSION.MICRO 1970-01-01 00:00:00 +0000 |
81 | +++ debian/QT-VERSION.MICRO 2016-03-13 03:22:25 +0000 |
82 | @@ -0,0 +1,1 @@ |
83 | +0 |
84 | |
85 | === added file 'debian/QT-VERSION.MINOR' |
86 | --- debian/QT-VERSION.MINOR 1970-01-01 00:00:00 +0000 |
87 | +++ debian/QT-VERSION.MINOR 2016-03-13 03:22:25 +0000 |
88 | @@ -0,0 +1,1 @@ |
89 | +2 |
90 | |
91 | === removed file 'debian/VERSION' |
92 | --- debian/VERSION 2016-02-09 10:26:20 +0000 |
93 | +++ debian/VERSION 1970-01-01 00:00:00 +0000 |
94 | @@ -1,1 +0,0 @@ |
95 | -1.0.3 |
96 | |
97 | === added file 'debian/VERSION.MAJOR' |
98 | --- debian/VERSION.MAJOR 1970-01-01 00:00:00 +0000 |
99 | +++ debian/VERSION.MAJOR 2016-03-13 03:22:25 +0000 |
100 | @@ -0,0 +1,1 @@ |
101 | +1 |
102 | |
103 | === added file 'debian/VERSION.MICRO' |
104 | --- debian/VERSION.MICRO 1970-01-01 00:00:00 +0000 |
105 | +++ debian/VERSION.MICRO 2016-03-13 03:22:25 +0000 |
106 | @@ -0,0 +1,1 @@ |
107 | +3 |
108 | |
109 | === added file 'debian/VERSION.MINOR' |
110 | --- debian/VERSION.MINOR 1970-01-01 00:00:00 +0000 |
111 | +++ debian/VERSION.MINOR 2016-03-13 03:22:25 +0000 |
112 | @@ -0,0 +1,1 @@ |
113 | +0 |
114 | |
115 | === renamed file 'debian/gen-debian-files.sh' => 'debian/bileto_pre_release_hook' (properties changed: -x to +x) |
116 | --- debian/gen-debian-files.sh 2015-10-19 04:22:03 +0000 |
117 | +++ debian/bileto_pre_release_hook 2016-03-13 03:22:25 +0000 |
118 | @@ -43,96 +43,86 @@ |
119 | |
120 | progname=$(basename $0) |
121 | |
122 | -[ $# -ne 1 ] && { |
123 | - echo "usage: $progname path-to-debian-dir" >&2 |
124 | +[ $# -gt 1 ] && { |
125 | + echo "usage: $progname [path-to-debian-dir]" >&2 |
126 | exit 1 |
127 | } |
128 | dir=$1 |
129 | -version_dir=$(mktemp -d) |
130 | - |
131 | -# Dump version numbers into files and initialize vars from those files. |
132 | - |
133 | -sh ${dir}/get-versions.sh ${dir} ${version_dir} |
134 | - |
135 | -full_version=$(cat "${version_dir}"/libunity-scopes.full-version) |
136 | -qt_full_version=$(cat "${version_dir}"/libunity-scopes-qt.full-version) |
137 | - |
138 | -major_minor=$(cat "${version_dir}"/libunity-scopes.major-minor-version) |
139 | -qt_major_minor=$(cat "${version_dir}"/libunity-scopes-qt.major-minor-version) |
140 | - |
141 | -soversion=$(cat "${version_dir}"/libunity-scopes.soversion) |
142 | -qt_soversion=$(cat "${version_dir}"/libunity-scopes-qt.soversion) |
143 | - |
144 | -vivid_soversion=$(cat "${version_dir}"/libunity-scopes.vivid-soversion) |
145 | - |
146 | -warning=$(mktemp -t gen-debian-files-msg.XXX) |
147 | - |
148 | -trap "rm -fr $warning $version_dir" 0 INT TERM QUIT |
149 | - |
150 | -warning_msg() |
151 | +[ -n "$dir" ] || dir="./debian" |
152 | + |
153 | +# Only call lsb_release if $SERIES isn't already set |
154 | +[ -n "$SERIES" ] || SERIES=$(lsb_release -c -s) |
155 | + |
156 | +export UNITY_SCOPES_MAJOR_VERSION=$(cat "$dir/VERSION.MAJOR") |
157 | +export UNITY_SCOPES_MINOR_VERSION=$(cat "$dir/VERSION.MINOR") |
158 | +export UNITY_SCOPES_MICRO_VERSION=$(cat "$dir/VERSION.MICRO") |
159 | + |
160 | +export UNITY_SCOPES_QT_MAJOR_VERSION=$(cat "$dir/QT-VERSION.MAJOR") |
161 | +export UNITY_SCOPES_QT_MINOR_VERSION=$(cat "$dir/QT-VERSION.MINOR") |
162 | +export UNITY_SCOPES_QT_MICRO_VERSION=$(cat "$dir/QT-VERSION.MICRO") |
163 | + |
164 | +export UNITY_SCOPES_MAJOR_MINOR="$UNITY_SCOPES_MAJOR_VERSION.$UNITY_SCOPES_MINOR_VERSION" |
165 | +export UNITY_SCOPES_QT_MAJOR_MINOR="$UNITY_SCOPES_QT_MAJOR_VERSION.$UNITY_SCOPES_QT_MINOR_VERSION" |
166 | + |
167 | +export UNITY_SCOPES_FULL_VERSION="$UNITY_SCOPES_MAJOR_MINOR.$UNITY_SCOPES_MICRO_VERSION" |
168 | +export UNITY_SCOPES_QT_FULL_VERSION="$UNITY_SCOPES_QT_MAJOR_MINOR.$UNITY_SCOPES_QT_MICRO_VERSION" |
169 | + |
170 | +if [ "$SERIES" = "vivid" ] |
171 | +then |
172 | + export UNITY_SCOPES_SOVERSION=$(expr "$UNITY_SCOPES_MINOR_VERSION" + 3) |
173 | + export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MINOR_VERSION" |
174 | +else |
175 | + export UNITY_SCOPES_SOVERSION="$UNITY_SCOPES_MAJOR_MINOR" |
176 | + export UNITY_SCOPES_QT_SOVERSION="$UNITY_SCOPES_QT_MAJOR_MINOR" |
177 | +fi |
178 | +[ -n "$UNITY_SCOPES_SOVERSION" ] |
179 | +[ -n "$UNITY_SCOPES_QT_SOVERSION" ] |
180 | + |
181 | + |
182 | +process() |
183 | { |
184 | - cat >$warning <<EOF |
185 | + cat <<EOF |
186 | # This file is autogenerated. DO NOT EDIT! |
187 | # |
188 | # Modifications should be made to $(basename "$1") instead. |
189 | # This file is regenerated automatically in the clean target. |
190 | # |
191 | EOF |
192 | + perl -pe 's/@([A-Z_]+)@/$ENV{$1} or die "$1 undefined"/eg' <"$1" |
193 | } |
194 | |
195 | # Generate debian/control from debian/control.in, substituting the soversion for both libs. |
196 | # For wily onwards, we also add an entry for the vivid versions to "Conflicts:" and "Replaces:". |
197 | |
198 | -infile="${dir}"/control.in |
199 | -outfile="${dir}"/control |
200 | -warning_msg $infile |
201 | -cat $warning $infile \ |
202 | - | sed -e "s/@UNITY_SCOPES_SOVERSION@/${soversion}/" \ |
203 | - -e "s/@UNITY_SCOPES_QT_SOVERSION@/${qt_soversion}/" >"$outfile" |
204 | +process "$dir/control.in" >"$dir/control" |
205 | |
206 | -[ "$distro" != "vivid" ] && { |
207 | +[ "$SERIES" != "vivid" ] && { |
208 | sed -i -e "/Replaces: libunity-scopes0,/a\ |
209 | -\ libunity-scopes${vivid_soversion}," \ |
210 | +\ libunity-scopes${UNITY_SCOPES_VIVID_SOVERSION}," \ |
211 | -e "/Conflicts: libunity-scopes0,/a\ |
212 | -\ libunity-scopes${vivid_soversion}," \ |
213 | - "$outfile" |
214 | +\ libunity-scopes${UNITY_SCOPES_VIVID_SOVERSION}," \ |
215 | + "$dir/control" |
216 | } |
217 | |
218 | # Generate the install files, naming them according to the soversion. |
219 | |
220 | # Install file for binary package |
221 | -infile="${dir}"/libunity-scopes.install.in |
222 | -outfile="${dir}"/libunity-scopes${soversion}.install |
223 | -warning_msg "$infile" |
224 | -cat $warning "$infile" >"$outfile" |
225 | +process "$dir/libunity-scopes.install.in" \ |
226 | + >"$dir/libunity-scopes${UNITY_SCOPES_SOVERSION}.install" |
227 | |
228 | # Install file for click hook |
229 | -infile="${dir}"/libunity-scopes.scope.click-hook.in |
230 | -outfile="${dir}"/libunity-scopes${soversion}.scope.click-hook |
231 | -warning_msg "$infile" |
232 | -cat $warning "$infile" >"$outfile" |
233 | +process "$dir/libunity-scopes.scope.click-hook.in" \ |
234 | + >"$dir/libunity-scopes${UNITY_SCOPES_SOVERSION}.scope.click-hook" |
235 | |
236 | # Shlibs file |
237 | -infile="${dir}"/libunity-scopes.shlibs.in |
238 | -outfile="${dir}"/libunity-scopes-${full_version}.shlibs |
239 | -warning_msg "$infile" |
240 | -cat $warning "$infile" \ |
241 | - | sed -e "s/@UNITY_SCOPES_SOVERSION@/${soversion}/g" \ |
242 | - -e "s/@UNITY_SCOPES_MAJOR_MINOR@/${major_minor}/g" \ |
243 | - >"$outfile" |
244 | +process "$dir/libunity-scopes.shlibs.in" \ |
245 | + >"$dir/libunity-scopes-${UNITY_SCOPES_FULL_VERSION}.shlibs" |
246 | |
247 | -infile="${dir}"/libunity-scopes-qt.shlibs.in |
248 | -outfile="${dir}"/libunity-scopes-qt${qt_full_version}.shlibs |
249 | -warning_msg "$infile" |
250 | -cat $warning "$infile" \ |
251 | - | sed -e "s/@UNITY_SCOPES_QT_SOVERSION@/${qt_soversion}/g" \ |
252 | - -e "s/@UNITY_SCOPES_QT_MAJOR_MINOR@/${qt_major_minor}/g" \ |
253 | - >"$outfile" |
254 | +process "$dir/libunity-scopes-qt.shlibs.in" \ |
255 | + >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_FULL_VERSION}.shlibs" |
256 | |
257 | # Install file for qt binary package |
258 | -infile="${dir}"/libunity-scopes-qt.install.in |
259 | -outfile="${dir}"/libunity-scopes-qt${qt_soversion}.install |
260 | -warning_msg "$infile" |
261 | -cat $warning "$infile" >"$outfile" |
262 | +process "$dir/libunity-scopes-qt.install.in" \ |
263 | + >"$dir/libunity-scopes-qt${UNITY_SCOPES_QT_SOVERSION}.install" |
264 | |
265 | exit 0 |
266 | |
267 | === removed file 'debian/get-versions.sh' |
268 | --- debian/get-versions.sh 2015-10-19 04:22:03 +0000 |
269 | +++ debian/get-versions.sh 1970-01-01 00:00:00 +0000 |
270 | @@ -1,82 +0,0 @@ |
271 | -#!/bin/sh |
272 | - |
273 | -# Copyright (C) 2015 Canonical Ltd |
274 | -# |
275 | -# This program is free software: you can redistribute it and/or modify |
276 | -# it under the terms of the GNU Lesser General Public License version 3 as |
277 | -# published by the Free Software Foundation. |
278 | -# |
279 | -# This program is distributed in the hope that it will be useful, |
280 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
281 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
282 | -# GNU Lesser General Public License for more details. |
283 | -# |
284 | -# You should have received a copy of the GNU Lesser General Public License |
285 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
286 | -# |
287 | -# Authored by: Michi Henning <michi.henning@canonical.com> |
288 | - |
289 | -# |
290 | -# Script to read the version numbers from VERSION and QT-VERSION |
291 | -# and write the version components and the soversion numbers |
292 | -# into separate files, so we can pick them up from both |
293 | -# gen-debian-files.sh and CMakeLists.txt. |
294 | -# |
295 | - |
296 | -set -e # Fail if any command fails. |
297 | - |
298 | -progname=$(basename $0) |
299 | - |
300 | -[ $# -lt 1 -o $# -gt 2 ] && { |
301 | - echo "usage: $progname path-to-debian-dir [output-dir]" >&2 |
302 | - exit 1 |
303 | -} |
304 | -dir=$1 |
305 | -output_dir=`pwd` |
306 | -[ $# -eq 2 ] && output_dir=$2 |
307 | - |
308 | -# Write the various version numbers into a bunch of files. This allows |
309 | -# us to easily pick them up from both gen-debian-files.sh and CMakeLists.txt. |
310 | - |
311 | -distro=$(lsb_release -c -s) |
312 | - |
313 | -full_version=$(cat "${dir}"/VERSION) |
314 | -qt_full_version=$(cat "${dir}"/QT-VERSION) |
315 | - |
316 | -major=$(echo $full_version | cut -d'.' -f1) |
317 | -minor=$(echo $full_version | cut -d'.' -f2) |
318 | -micro=$(echo $full_version | cut -d'.' -f3) |
319 | -major_minor="${major}.${minor}" |
320 | - |
321 | -qt_major=$(echo $qt_full_version | cut -d'.' -f1) |
322 | -qt_minor=$(echo $qt_full_version | cut -d'.' -f2) |
323 | -qt_micro=$(echo $qt_full_version | cut -d'.' -f3) |
324 | -qt_major_minor="${qt_major}.${qt_minor}" |
325 | - |
326 | -vivid_soversion=$(expr $minor + 3) |
327 | - |
328 | -if [ "$distro" = "vivid" ] |
329 | -then |
330 | - soversion=$vivid_soversion |
331 | - qt_soversion=${qt_minor} |
332 | -else |
333 | - soversion="${major}.${minor}" |
334 | - qt_soversion="${qt_major}.${qt_minor}" |
335 | -fi |
336 | -[ -n $soversion ] |
337 | -[ -n $qt_soversion ] |
338 | - |
339 | -echo ${full_version} >${output_dir}/libunity-scopes.full-version |
340 | -echo ${major} >${output_dir}/libunity-scopes.major-version |
341 | -echo ${minor} >${output_dir}/libunity-scopes.minor-version |
342 | -echo ${micro} >${output_dir}/libunity-scopes.micro-version |
343 | -echo ${major_minor} >${output_dir}/libunity-scopes.major-minor-version |
344 | -echo ${soversion} >${output_dir}/libunity-scopes.soversion |
345 | -echo ${vivid_soversion} >${output_dir}/libunity-scopes.vivid-soversion |
346 | - |
347 | -echo ${qt_full_version} >${output_dir}/libunity-scopes-qt.full-version |
348 | -echo ${qt_major} >${output_dir}/libunity-scopes-qt.major-version |
349 | -echo ${qt_minor} >${output_dir}/libunity-scopes-qt.minor-version |
350 | -echo ${qt_micro} >${output_dir}/libunity-scopes-qt.micro-version |
351 | -echo ${qt_major_minor} >${output_dir}/libunity-scopes-qt.major-minor-version |
352 | -echo ${qt_soversion} >${output_dir}/libunity-scopes-qt.soversion |
353 | |
354 | === modified file 'debian/rules' |
355 | --- debian/rules 2015-12-17 17:20:06 +0000 |
356 | +++ debian/rules 2016-03-13 03:22:25 +0000 |
357 | @@ -24,5 +24,5 @@ |
358 | dh_click --name scope |
359 | |
360 | override_dh_auto_clean: |
361 | - /bin/sh $(CURDIR)/debian/gen-debian-files.sh $(CURDIR)/debian |
362 | + /bin/sh $(CURDIR)/debian/bileto_pre_release_hook |
363 | dh_auto_clean |
Huh, this approach didn't work with the apparmor profile:
https:/ /requests. ci-train. staging. ubuntu. com/log/ 16/build/ 2
(the hook scripts don't have permission to call your other scripts).
I'll need to rethink this a bit.