Merge lp:~robru/goget-ubuntu-touch/packaging into lp:goget-ubuntu-touch

Proposed by Robert Bruce Park
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 7
Merged at revision: 5
Proposed branch: lp:~robru/goget-ubuntu-touch/packaging
Merge into: lp:goget-ubuntu-touch
Diff against target: 121 lines (+22/-19)
7 files modified
.bzr-builddeb/default.conf (+1/-1)
debian/changelog (+1/-1)
debian/control (+16/-8)
debian/rules (+4/-2)
debian/source/format (+0/-1)
debian/source/lintian-overrides (+0/-3)
debian/source/options (+0/-3)
To merge this branch: bzr merge lp:~robru/goget-ubuntu-touch/packaging
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Didier Roche-Tolomelli prenew Pending
Review via email: mp+201050@code.launchpad.net

Commit message

Update packaging according to daily_release standards.

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

Apparenly golang pukes when there are comment lines in debian/control:

   dh_golang -O--buildsystem=golang -O--fail-missing
Parse error: invalid key/value stansa at line 13 of data ("# if you don't have have commit access to this branch but would like to upload").
make: *** [binary] Error 255

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Awesome!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) 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 '.bzr-builddeb/default.conf'
2--- .bzr-builddeb/default.conf 2014-01-07 15:51:30 +0000
3+++ .bzr-builddeb/default.conf 2014-01-09 17:54:35 +0000
4@@ -1,2 +1,2 @@
5 [BUILDDEB]
6-split = True
7+split = True
8
9=== modified file 'debian/changelog'
10--- debian/changelog 2014-01-08 21:10:26 +0000
11+++ debian/changelog 2014-01-09 17:54:35 +0000
12@@ -1,4 +1,4 @@
13-golang-goget-ubuntu-touch (0.1-0ubuntu1) trusty; urgency=low
14+golang-goget-ubuntu-touch (0.1-0ubuntu1) UNRELEASED; urgency=low
15
16 * Initial release.
17
18
19=== modified file 'debian/control'
20--- debian/control 2014-01-08 21:10:18 +0000
21+++ debian/control 2014-01-09 17:54:35 +0000
22@@ -1,8 +1,7 @@
23 Source: golang-goget-ubuntu-touch
24 Section: devel
25-Priority: extra
26+Priority: optional
27 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
28-XSBC-Original-Maintainer: Sergio Schvezov <sergio.schvezov@canonical.com>
29 Build-Depends: debhelper (>= 9),
30 dh-golang,
31 golang-go,
32@@ -15,7 +14,10 @@
33
34 Package: ubuntu-device-flash
35 Architecture: any
36-Depends: android-tools-adb, android-tools-fastboot, ${misc:Depends}, ${shlibs:Depends}
37+Depends: android-tools-adb,
38+ android-tools-fastboot,
39+ ${misc:Depends},
40+ ${shlibs:Depends},
41 Description: Flash supported Nexus devices with Ubuntu
42 Use this tool to flash a suported device with Ubuntu by either
43 bootstrapping from fastboot or reflashing from an already
44@@ -23,26 +25,32 @@
45
46 Package: ubuntu-emulator
47 Architecture: any
48-Depends: ubuntu-emulator-runtime, xz-utils, ${misc:Depends}, ${shlibs:Depends}
49-Recommends: android-tools-adb
50+Depends: ubuntu-emulator-runtime,
51+ xz-utils,
52+ ${misc:Depends},
53+ ${shlibs:Depends},
54+Recommends: android-tools-adb,
55 Description: Create and run emulator images of Ubuntu Touch
56 Create and destroy Ubuntu Touch instances and run them with the emulator
57
58 Package: golang-goget-ubuntu-touch-bootimg-dev
59 Architecture: all
60-Depends: ${misc:Depends}, ${shlibs:Depends}
61+Depends: ${misc:Depends},
62+ ${shlibs:Depends},
63 Description: Go library for manipulating Android boot.img files
64 Package reads and extracts Android boot.img files
65
66 Package: golang-goget-ubuntu-touch-devices-dev
67 Architecture: all
68-Depends: ${misc:Depends}, ${shlibs:Depends}
69+Depends: ${misc:Depends},
70+ ${shlibs:Depends},
71 Description: Go library for interfacing with adb and fastboot
72 Provides facilities to interface with adb and fastboot
73
74 Package: golang-goget-ubuntu-touch-ubuntuimage-dev
75 Architecture: all
76-Depends: ${misc:Depends}, ${shlibs:Depends}
77+Depends: ${misc:Depends},
78+ ${shlibs:Depends},
79 Description: Go library for interfacing with an Ubuntu image server
80 Provides facilities to interface with an Ubuntu image server to
81 download OS image assets from different channels and for different
82
83=== modified file 'debian/rules'
84--- debian/rules 2014-01-07 15:51:30 +0000
85+++ debian/rules 2014-01-09 17:54:35 +0000
86@@ -5,8 +5,10 @@
87 export DH_GOPKG := launchpad.net/goget-ubuntu-touch
88
89 %:
90- dh $@ --buildsystem=golang --with=golang
91+ dh $@ --buildsystem=golang --with=golang --fail-missing
92
93 override_dh_auto_install:
94 dh_auto_install -O--buildsystem=golang
95- rm ${CURDIR}/debian/tmp/usr/bin/abootimg-extract
96+ rm -rf ${CURDIR}/debian/tmp/usr/bin/abootimg-extract
97+ rm -rf ${CURDIR}/debian/tmp/usr/share/gocode/src/launchpad.net/goget-ubuntu-touch/ubuntu-emulator
98+ rm -rf ${CURDIR}/debian/tmp/usr/share/gocode/src/launchpad.net/goget-ubuntu-touch/ubuntu-device-flash
99
100=== removed directory 'debian/source'
101=== removed file 'debian/source/format'
102--- debian/source/format 2014-01-07 15:51:30 +0000
103+++ debian/source/format 1970-01-01 00:00:00 +0000
104@@ -1,1 +0,0 @@
105-3.0 (quilt)
106
107=== removed file 'debian/source/lintian-overrides'
108--- debian/source/lintian-overrides 2014-01-07 15:51:30 +0000
109+++ debian/source/lintian-overrides 1970-01-01 00:00:00 +0000
110@@ -1,3 +0,0 @@
111-# There are no tarball releases or tags on upstream project
112-# to easily parse.
113-debian-watch-file-is-missing
114
115=== removed file 'debian/source/options'
116--- debian/source/options 2014-01-07 15:51:30 +0000
117+++ debian/source/options 1970-01-01 00:00:00 +0000
118@@ -1,3 +0,0 @@
119-tar-ignore = .hg
120-tar-ignore = .git
121-tar-ignore = .bzr

Subscribers

People subscribed via source and target branches