Merge lp:~chadadavis/checkbox/788514 into lp:checkbox

Proposed by Chad A. Davis
Status: Merged
Merged at revision: 939
Proposed branch: lp:~chadadavis/checkbox/788514
Merge into: lp:checkbox
Diff against target: 157 lines (+31/-33)
5 files modified
debian/changelog (+6/-0)
debian/compat (+1/-1)
debian/control (+2/-6)
debian/rules (+18/-23)
po/checkbox.pot (+4/-3)
To merge this branch: bzr merge lp:~chadadavis/checkbox/788514
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Barry Warsaw (community) Approve
Review via email: mp+65742@code.launchpad.net

Description of the change

Transition from pycentral+cdbs to dh_python2/debhelper7
Tested install and basic run in oneiric live. Except for checkbox-urwid. Doesn't seem that python-urwid is on the live CD.

To post a comment you must log in.
lp:~chadadavis/checkbox/788514 updated
938. By Chad A. Davis on 2011-06-24

Removed README from debian/*.install

Revision history for this message
Barry Warsaw (barry) wrote :

I helped Chad with this on #ubuntu-pyjam as part of the dhpy2 transition jam. It works great for me, and I approve the patch. I'll happily sponsor an upload after it's merged into trunk.

Chad, thanks so much for your contribution to Ubuntu!

review: Approve
Revision history for this message
Barry Warsaw (barry) wrote :

Bumping debian/compat to 7 eliminates the need for the debian/tmp prefixes in the .install files:

http://pastebin.ubuntu.com/631827/

Revision history for this message
Marc Tardif (cr3) wrote :

Chad, could you please merge Barry's pastebined diff and I'll have another look at this merge request which should become shorter. Thanks for the awesome work folks!

lp:~chadadavis/checkbox/788514 updated
939. By Chad A. Davis on 2011-06-24

barrys patch for debhelper7

Revision history for this message
Chad A. Davis (chadadavis) wrote :

Thanks barry, I was looking for something to allow the install files to remain unchanged. Thanks for finding it.

Revision history for this message
Marc Tardif (cr3) wrote :

After testing and looking at the diff of the resulting packages on oneiric, all good. Many thanks for these changes!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-06-21 13:56:33 +0000
3+++ debian/changelog 2011-06-24 16:09:33 +0000
4@@ -1,3 +1,9 @@
5+checkbox (0.12.4) oneiric; urgency=low
6+
7+ * Switch to dh_python2 and debhelper7 (LP: #788514)
8+
9+ -- Chad A. Davis <chad.a.davis@gmail.com> Thu, 23 Jun 2011 17:56:19 +0200
10+
11 checkbox (0.12.3) oneiric; urgency=low
12
13 * Incremented version.
14
15=== modified file 'debian/compat'
16--- debian/compat 2007-09-18 15:26:03 +0000
17+++ debian/compat 2011-06-24 16:09:33 +0000
18@@ -1,1 +1,1 @@
19-5
20+7
21\ No newline at end of file
22
23=== modified file 'debian/control'
24--- debian/control 2011-06-08 15:16:37 +0000
25+++ debian/control 2011-06-24 16:09:33 +0000
26@@ -4,8 +4,8 @@
27 XSBC-Original-Maintainer: Marc Tardif <marc@ubuntu.com>
28 Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
29 Standards-Version: 3.7.3
30-XS-Python-Version: current
31-Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.51~), python-central, python (>= 2.4), po-debconf, python-distutils-extra
32+X-Python-Version: >= 2.6
33+Build-Depends: debhelper (>= 7.0.50~), dh-translations, python (>= 2.6.6-3~), po-debconf, python-distutils-extra
34 Vcs-Bzr: https://code.launchpad.net/~hardware-certification/checkbox/trunk
35
36 Package: checkbox
37@@ -17,7 +17,6 @@
38 Recommends: dpkg (>= 1.13), lsb-release, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10
39 Suggests: checkbox-cli | checkbox-gtk
40 Conflicts: hwtest (<< 0.1-0ubuntu12)
41-XB-Python-Version: ${python:Versions}
42 Description: System testing application
43 This project provides an extensible interface for system testing. The
44 results can then be sent to Launchpad.
45@@ -28,7 +27,6 @@
46 Provides: hwtest-cli
47 Depends: checkbox (= ${source:Version})
48 Conflicts: hwtest-cli (<< 0.1-0ubuntu12)
49-XB-Python-Version: ${python:Versions}
50 Description: Command line interface for checkbox
51 This project provides an extensible interface for system testing. The
52 results can then be sent to Launchpad.
53@@ -38,7 +36,6 @@
54 Package: checkbox-urwid
55 Architecture: all
56 Depends: checkbox (= ${source:Version}), python-urwid
57-XB-Python-Version: ${python:Versions}
58 Description: Urwid interface for checkbox
59 This project provides an extensible interface for system testing. The
60 results can then be sent to Launchpad.
61@@ -53,7 +50,6 @@
62 Provides: hwtest-gtk
63 Depends: checkbox (= ${source:Version}), gksu, python-gobject (>= 2.28), gir1.2-gtk-3.0
64 Conflicts: hwtest-gtk (<< 0.1-0ubuntu12)
65-XB-Python-Version: ${python:Versions}
66 Description: GTK interface for checkbox
67 This project provides an extensible interface for system testing. The
68 results can then be sent to Launchpad.
69
70=== modified file 'debian/rules'
71--- debian/rules 2010-05-24 18:54:44 +0000
72+++ debian/rules 2011-06-24 16:09:33 +0000
73@@ -1,34 +1,29 @@
74 #!/usr/bin/make -f
75
76-DEB_PYTHON_SYSTEM := pycentral
77-
78-include /usr/share/cdbs/1/rules/debhelper.mk
79-include /usr/share/cdbs/1/class/python-distutils.mk
80-include /usr/share/cdbs/1/rules/simple-patchsys.mk
81-
82-DEB_DH_INSTALL_SOURCEDIR := debian/tmp
83-DEB_PYTHON_INSTALL_ARGS_ALL := --no-compile --install-layout=deb
84-
85-build/checkbox-cli::
86+%:
87+ dh "$@" --with translations,python2
88+
89+override_dh_installdeb:
90 cp debian/checkbox.postrm debian/checkbox-cli.postrm
91-
92-build/checkbox-urwid::
93 cp debian/checkbox.postrm debian/checkbox-urwid.postrm
94-
95-build/checkbox-gtk::
96 cp debian/checkbox.postrm debian/checkbox-gtk.postrm
97-
98-build/hwtest-cli::
99 cp debian/hwtest.postrm debian/hwtest-cli.postrm
100-
101-build/hwtest-gtk::
102 cp debian/hwtest.postrm debian/hwtest-gtk.postrm
103-
104-binary-install/checkbox-gtk::
105- dh_icons -p$(cdbs_curpkg)
106-
107-clean::
108+ dh_installdeb
109+
110+override_dh_installdocs:
111+ dh_installdocs -pcheckbox ./README
112+ dh_installdocs -pcheckbox-cli ./README
113+ dh_installdocs -pcheckbox-urwid ./README
114+ dh_installdocs -pcheckbox-gtk ./README
115+ dh_installdocs -phwtest ./README
116+ dh_installdocs -phwtest-cli ./README
117+ dh_installdocs -phwtest-gtk ./README
118+ dh_installdocs
119+
120+override_dh_clean:
121 -find . -name \*.mo -exec rm {} \;
122 -rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm
123 -rm -f debian/hwtest-cli.postrm debian/hwtest-gtk.postrm
124 debconf-updatepo
125+ dh_clean
126
127=== modified file 'po/checkbox.pot'
128--- po/checkbox.pot 2011-06-21 13:46:05 +0000
129+++ po/checkbox.pot 2011-06-24 16:09:33 +0000
130@@ -8,10 +8,11 @@
131 msgstr ""
132 "Project-Id-Version: PACKAGE VERSION\n"
133 "Report-Msgid-Bugs-To: \n"
134-"POT-Creation-Date: 2011-06-21 09:43-0400\n"
135+"POT-Creation-Date: 2011-06-23 22:05+0200\n"
136 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
137 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
138 "Language-Team: LANGUAGE <LL@li.org>\n"
139+"Language: \n"
140 "MIME-Version: 1.0\n"
141 "Content-Type: text/plain; charset=CHARSET\n"
142 "Content-Transfer-Encoding: 8bit\n"
143@@ -1286,12 +1287,12 @@
144 "This might take a few minutes."
145 msgstr ""
146
147-#: ../plugins/apport_prompt.py:219
148+#: ../plugins/apport_prompt.py:220
149 #, python-format
150 msgid "Test %s failed. Do you want to report a bug?"
151 msgstr ""
152
153-#: ../plugins/apport_prompt.py:234
154+#: ../plugins/apport_prompt.py:235
155 #, python-format
156 msgid "Is a package upgrade in process? Error: %s"
157 msgstr ""

Subscribers

People subscribed via source and target branches