Merge lp:~brendan-donegan/checkbox/bug1188601 into lp:checkbox

[Brendan Donegan]

 When creating the checkbox-hw-collection package, debian/rules was not updated to refer to it, so it wasn't getting treated in the same way as packages like checkbox-qt. The most important side-effect of this was that dpkg --purge didn't work properly to remove the checkbox-hw-collection.ini file.

Added reference to checkbox-hw-collection in debian/rules so that it's treated like the other checkbox derived packages.

[Zygmunt Krynicki (zyga)]

seems broken on tabs/spaces

review: Needs Fixing

[Zygmunt Krynicki (zyga)]

also, could you not change the unrelated parts of debian/changelog

[Brendan Donegan (brendan-donegan)]

I'm unsure how that got touched. Anyway, updated now.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

+1

review: Approve

[Daniel Manrique (roadmr)]

Attempt to merge into lp:checkbox failed due to conflicts:

text conflict in checkbox-old/debian/changelog

[Brendan Donegan (brendan-donegan)]

Self-approving after fixing conflict

review: Approve

[Daniel Manrique (roadmr)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Daniel Manrique (roadmr)]

The attempt to merge lp:~brendan-donegan/checkbox/bug1188601 into lp:checkbox failed. Below is the output from the failed tests.

[precise] Bringing VM 'up'
[precise] Unable to 'up' VM!
[precise] stdout: http://paste.ubuntu.com/5761070/
[precise] stderr: http://paste.ubuntu.com/5761071/
[precise] NOTE: unable to execute tests, marked as failed
[precise] Destroying failed VM to reclaim resources
[precise] Destroying VM and associated drives...
[quantal] Bringing VM 'up'
[quantal] Unable to 'up' VM!
[quantal] stdout: http://paste.ubuntu.com/5761072/
[quantal] stderr: http://paste.ubuntu.com/5761073/
[quantal] NOTE: unable to execute tests, marked as failed
[quantal] Destroying failed VM to reclaim resources
[quantal] Destroying VM and associated drives...
[raring] Bringing VM 'up'
[raring] Unable to 'up' VM!
[raring] stdout: http://paste.ubuntu.com/5761076/
[raring] stderr: http://paste.ubuntu.com/5761077/
[raring] NOTE: unable to execute tests, marked as failed
[raring] Destroying failed VM to reclaim resources
[raring] Destroying VM and associated drives...
[saucy] Bringing VM 'up'
[saucy] Unable to 'up' VM!
[saucy] stdout: http://paste.ubuntu.com/5761078/
[saucy] stderr: http://paste.ubuntu.com/5761079/
[saucy] NOTE: unable to execute tests, marked as failed
[saucy] Destroying failed VM to reclaim resources
[saucy] Destroying VM and associated drives...

=== modified file 'checkbox-old/debian/changelog'
--- checkbox-old/debian/changelog	2013-06-12 10:46:23 +0000
+++ checkbox-old/debian/changelog	2013-06-13 07:45:34 +0000
@@ -25,6 +25,8 @@
     at least run on those systems where they are supposed to (LP: #1184882)
   * checkbox_qt/qt_interface.py - Order the list of items to be displayed
     alphabetically, so the order is consistent (LP: #1177647)
+  * debian/rules - Add checkbox-hw-collection so that it's treated in the same
+    way as other checkbox derived packages like checkbox-qt (LP: #1188601)
 
   [ Daniel Manrique ]
   * jobs/stress.txt.in: fixed a few inconsistent invocations of sleep_test.
 
=== modified file 'checkbox-old/debian/rules'
--- checkbox-old/debian/rules	2013-06-01 08:23:08 +0000
+++ checkbox-old/debian/rules	2013-06-13 07:45:34 +0000
@@ -28,6 +28,7 @@
 	cp debian/checkbox.postrm debian/checkbox-urwid.postrm
 	cp debian/checkbox.postrm debian/checkbox-gtk.postrm
 	cp debian/checkbox.postrm debian/checkbox-qt.postrm
+	cp debian/checkbox.postrm debian/checkbox-hw-collection.postrm
 	dh_installdeb
 
 override_dh_installdocs:
@@ -35,11 +36,12 @@
 	dh_installdocs -pcheckbox-cli ./README 
 	dh_installdocs -pcheckbox-urwid ./README 
 	dh_installdocs -pcheckbox-gtk ./README 
-	dh_installdocs -pcheckbox-qt ./README 
+	dh_installdocs -pcheckbox-qt ./README
+	dh_installdocs -pcheckbox-hw-collection ./README
 	dh_installdocs
 
 override_dh_clean:
 	-find . -name \*.mo -exec rm {} \;
-	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm debian/checkbox-hw-collection.postrm
 	debconf-updatepo
 	dh_clean