Merge lp:~cr3/checkbox/packaging into lp:~tiagosh/checkbox/qt4-dbus

[Marc Tardif]

Note that I renamed checkbox_qt/frontend to qt/frontend so that checkbox_qt only contains Python code and I also renamed /usr/bin/checkbox-qt-gui to /usr/share/checkbox/qt/checkbox-qt-service. The package now runs successfully.

Once this merge request is approved, I will then merge into trunk where we should continue hacking.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-01 14:47:34 +0000
+++ .bzrignore	2012-02-07 22:38:32 +0000
@@ -19,6 +19,10 @@
 gtk/checkbox-gtk.glade.bak
 gtk/checkbox-gtk.gladep
 gtk/checkbox-gtk.gladep.bak
+qt/frontend/Makefile
+qt/frontend/checkbox-qt-service
+qt/frontend/moc_qtfront.cpp
+qt/frontend/ui_qtfront.h
 lock
 plugins.bpickle
 plugins.bpickle.old
 
=== modified file 'debian/checkbox-qt.install'
--- debian/checkbox-qt.install	2011-12-05 15:25:22 +0000
+++ debian/checkbox-qt.install	2012-02-07 22:38:32 +0000
@@ -2,4 +2,5 @@
 usr/share/applications/checkbox-qt.desktop
 usr/share/checkbox/qt/*
 usr/share/checkbox/examples/checkbox-qt.ini
+usr/share/dbus-1/services/*
 usr/lib/python*/*-packages/checkbox_qt/*
 
=== modified file 'debian/checkbox-qt.links'
--- debian/checkbox-qt.links	2011-12-05 15:25:22 +0000
+++ debian/checkbox-qt.links	2012-02-07 22:38:32 +0000
@@ -1,1 +1,1 @@
-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
 
=== modified file 'debian/control'
--- debian/control	2012-02-01 18:41:55 +0000
+++ debian/control	2012-02-07 22:38:32 +0000
@@ -57,7 +57,7 @@
  This package provides a non-interactive interface for SRU testing.
 
 Package: checkbox-qt
-Architecture: all
+Architecture: any
 Depends: checkbox (= ${source:Version}), libqtgui4, libqt4-dbus
 Description: QT4 interface for checkbox
  This project provides an extensible interface for system testing. The
 
=== modified file 'debian/rules'
--- debian/rules	2012-02-01 18:41:55 +0000
+++ debian/rules	2012-02-07 22:38:32 +0000
@@ -4,13 +4,14 @@
 	dh "$@" --with translations,python2
 
 override_dh_auto_build:
-	cd checkbox_qt/frontend; qmake-qt4; make; cd ../..; cp checkbox_qt/frontend/checkbox-qt-gui bin/checkbox-qt-gui
+	(cd qt/frontend; qmake-qt4; make)
 	dh_auto_build
 
 override_dh_installdeb:
 	cp debian/checkbox.postrm debian/checkbox-cli.postrm
 	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-sru.postrm
 	dh_installdeb
 
@@ -19,11 +20,12 @@
 	dh_installdocs -pcheckbox-cli ./README 
 	dh_installdocs -pcheckbox-urwid ./README 
 	dh_installdocs -pcheckbox-gtk ./README 
+	dh_installdocs -pcheckbox-qt ./README 
 	dh_installdocs -pcheckbox-sru ./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-sru.postrm
+	-rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm debian/checkbox-sru.postrm
 	debconf-updatepo
 	dh_clean
 
=== modified file 'qt/com.canonical.QtCheckbox.service'
--- qt/com.canonical.QtCheckbox.service	2012-02-01 18:41:55 +0000
+++ qt/com.canonical.QtCheckbox.service	2012-02-07 22:38:32 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.QtCheckbox
-Exec=/usr/bin/checkbox-qt-gui
+Exec=/usr/share/checkbox/qt/checkbox-qt-service
 
=== renamed directory 'checkbox_qt/frontend' => 'qt/frontend'
=== modified file 'qt/frontend/frontend.pro'
--- checkbox_qt/frontend/frontend.pro	2012-02-01 18:41:55 +0000
+++ qt/frontend/frontend.pro	2012-02-07 22:38:32 +0000
@@ -4,9 +4,9 @@
 #
 #-------------------------------------------------
 
-QT       += core gui dbus
+QT       += core dbus service
 
-TARGET = checkbox-qt-gui
+TARGET = checkbox-qt-service
 TEMPLATE = app
 
 
 
=== modified file 'setup.py'
--- setup.py	2012-02-01 18:41:55 +0000
+++ setup.py	2012-02-07 22:38:32 +0000
@@ -228,8 +228,8 @@
         ("share/checkbox/report/images/", ["report/images/*"]),
         ("share/checkbox/scripts/", ["scripts/*"]),
         ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
+        ("share/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
         ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
-        ("share/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png"]),
         ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
         ("share/apport/general-hooks/", ["apport/checkbox.py"])],
     scripts = ["bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-sru",