Merge lp:~kalikiana/ubuntu-ui-toolkit/wrapAndSort into lp:ubuntu-ui-toolkit/staging

Proposed by Cris Dywan
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 2158
Merged at revision: 2157
Proposed branch: lp:~kalikiana/ubuntu-ui-toolkit/wrapAndSort
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 59 lines (+16/-13)
2 files modified
debian/control.gles (+1/-0)
tests/packaging-sorting.sh (+15/-13)
To merge this branch: bzr merge lp:~kalikiana/ubuntu-ui-toolkit/wrapAndSort
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve
Timo Jyrinki Approve
Review via email: mp+314411@code.launchpad.net

Commit message

Add python3-debian to control.gles and harden package-sorting.sh

To post a comment you must log in.
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2155. By Cris Dywan

Manually evaluate wrap-and-sort return code

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2156. By Cris Dywan

Use same SCRIPT_DIR approach as eg. export_qml_dir.sh

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2157. By Cris Dywan

Add debug statements for CI to package-sorting.sh

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
2158. By Cris Dywan

control.gles may be moved in gles builds

Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control.gles'
2--- debian/control.gles 2017-01-09 15:50:34 +0000
3+++ debian/control.gles 2017-01-13 11:27:21 +0000
4@@ -37,6 +37,7 @@
5 lsb-release,
6 pep8,
7 python-autopilot (>= 1.4),
8+ python3-debian,
9 python3-sphinx,
10 python3:any,
11 python:any,
12
13=== modified file 'tests/packaging-sorting.sh'
14--- tests/packaging-sorting.sh 2016-05-02 08:37:47 +0000
15+++ tests/packaging-sorting.sh 2017-01-13 11:27:21 +0000
16@@ -15,28 +15,30 @@
17 #
18 # Author: Timo Jyrinki <timo.jyrinki@canonical.com>
19
20+# Get the current script directory (compatible with Bash and ZSH)
21+SCRIPT_DIR=`dirname ${BASH_SOURCE[0]-$0}`
22+SCRIPT_DIR=`cd $SCRIPT_DIR && pwd`
23+
24+SRC=$SCRIPT_DIR/..
25 # Ensure packaging has gone through wrap-and-sort command
26-
27-if [ ! -f "/usr/bin/wrap-and-sort" ] ; then
28- echo "Please install 'devscripts' package"
29- exit 1
30-fi
31-
32-cd $(dirname $0)
33 tmpdir=$(mktemp -d)
34-cp -a ../debian $tmpdir
35-
36+cp -a $SRC/debian $tmpdir
37 wrap-and-sort -a -t -d $tmpdir/debian/
38-# Verify control.gles which otherwise isn't picked up
39-wrap-and-sort -a -t -d $tmpdir/debian/ -f $tmpdir/debian/control.gles
40+[ $? == 2 ] && exit 2
41+# Note: control.gles may be moved in gles builds
42+if [ -f $tmpdir/debian/control.gles ] ; then
43+ # Verify control.gles which otherwise isn't picked up
44+ wrap-and-sort -a -t -d $tmpdir/debian/ -f $tmpdir/debian/control.gles
45+fi
46+[ $? == 2 ] && exit 2
47
48-diff -urN ../debian $tmpdir/debian
49+diff -urN $SRC/debian $tmpdir/debian
50
51 if [ $? == 1 ] ; then
52 echo
53 echo
54 echo "*******************************************************"
55- echo "Please run 'wrap-and-sort -a -t' to clean up packaging."
56+ echo "Please run 'wrap-and-sort -a -t; wrap-and-sort -a -t -f debian/control.gles' to clean up packaging."
57 echo "*******************************************************"
58 echo
59 exit 1

Subscribers

People subscribed via source and target branches