Checkbox

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

  1. packaging
  2. Merge into qt4-dbus
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1162
Proposed branch: lp:~cr3/checkbox/packaging
Merge into: lp:~tiagosh/checkbox/qt4-dbus
Diff against target: 118 lines (+15/-8)
8 files modified
.bzrignore (+4/-0)
debian/checkbox-qt.install (+1/-0)
debian/checkbox-qt.links (+1/-1)
debian/control (+1/-1)
debian/rules (+4/-2)
qt/com.canonical.QtCheckbox.service (+1/-1)
qt/frontend/frontend.pro (+2/-2)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~cr3/checkbox/packaging
Reviewer Review Type Date Requested Status
Tiago Salem Herrmann Pending
Review via email: mp+91938@code.launchpad.net

Description of the change

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.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-02-01 14:47:34 +0000
3+++ .bzrignore 2012-02-07 22:38:32 +0000
4@@ -19,6 +19,10 @@
5 gtk/checkbox-gtk.glade.bak
6 gtk/checkbox-gtk.gladep
7 gtk/checkbox-gtk.gladep.bak
8+qt/frontend/Makefile
9+qt/frontend/checkbox-qt-service
10+qt/frontend/moc_qtfront.cpp
11+qt/frontend/ui_qtfront.h
12 lock
13 plugins.bpickle
14 plugins.bpickle.old
15
16=== modified file 'debian/checkbox-qt.install'
17--- debian/checkbox-qt.install 2011-12-05 15:25:22 +0000
18+++ debian/checkbox-qt.install 2012-02-07 22:38:32 +0000
19@@ -2,4 +2,5 @@
20 usr/share/applications/checkbox-qt.desktop
21 usr/share/checkbox/qt/*
22 usr/share/checkbox/examples/checkbox-qt.ini
23+usr/share/dbus-1/services/*
24 usr/lib/python*/*-packages/checkbox_qt/*
25
26=== modified file 'debian/checkbox-qt.links'
27--- debian/checkbox-qt.links 2011-12-05 15:25:22 +0000
28+++ debian/checkbox-qt.links 2012-02-07 22:38:32 +0000
29@@ -1,1 +1,1 @@
30-usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-gtk.1.gz
31+usr/share/man/man1/checkbox.1.gz usr/share/man/man1/checkbox-qt.1.gz
32
33=== modified file 'debian/control'
34--- debian/control 2012-02-01 18:41:55 +0000
35+++ debian/control 2012-02-07 22:38:32 +0000
36@@ -57,7 +57,7 @@
37 This package provides a non-interactive interface for SRU testing.
38
39 Package: checkbox-qt
40-Architecture: all
41+Architecture: any
42 Depends: checkbox (= ${source:Version}), libqtgui4, libqt4-dbus
43 Description: QT4 interface for checkbox
44 This project provides an extensible interface for system testing. The
45
46=== modified file 'debian/rules'
47--- debian/rules 2012-02-01 18:41:55 +0000
48+++ debian/rules 2012-02-07 22:38:32 +0000
49@@ -4,13 +4,14 @@
50 dh "$@" --with translations,python2
51
52 override_dh_auto_build:
53- cd checkbox_qt/frontend; qmake-qt4; make; cd ../..; cp checkbox_qt/frontend/checkbox-qt-gui bin/checkbox-qt-gui
54+ (cd qt/frontend; qmake-qt4; make)
55 dh_auto_build
56
57 override_dh_installdeb:
58 cp debian/checkbox.postrm debian/checkbox-cli.postrm
59 cp debian/checkbox.postrm debian/checkbox-urwid.postrm
60 cp debian/checkbox.postrm debian/checkbox-gtk.postrm
61+ cp debian/checkbox.postrm debian/checkbox-qt.postrm
62 cp debian/checkbox.postrm debian/checkbox-sru.postrm
63 dh_installdeb
64
65@@ -19,11 +20,12 @@
66 dh_installdocs -pcheckbox-cli ./README
67 dh_installdocs -pcheckbox-urwid ./README
68 dh_installdocs -pcheckbox-gtk ./README
69+ dh_installdocs -pcheckbox-qt ./README
70 dh_installdocs -pcheckbox-sru ./README
71 dh_installdocs
72
73 override_dh_clean:
74 -find . -name \*.mo -exec rm {} \;
75- -rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-sru.postrm
76+ -rm -f debian/checkbox-cli.postrm debian/checkbox-urwid.postrm debian/checkbox-gtk.postrm debian/checkbox-qt.postrm debian/checkbox-sru.postrm
77 debconf-updatepo
78 dh_clean
79
80=== modified file 'qt/com.canonical.QtCheckbox.service'
81--- qt/com.canonical.QtCheckbox.service 2012-02-01 18:41:55 +0000
82+++ qt/com.canonical.QtCheckbox.service 2012-02-07 22:38:32 +0000
83@@ -1,3 +1,3 @@
84 [D-BUS Service]
85 Name=com.canonical.QtCheckbox
86-Exec=/usr/bin/checkbox-qt-gui
87+Exec=/usr/share/checkbox/qt/checkbox-qt-service
88
89=== renamed directory 'checkbox_qt/frontend' => 'qt/frontend'
90=== modified file 'qt/frontend/frontend.pro'
91--- checkbox_qt/frontend/frontend.pro 2012-02-01 18:41:55 +0000
92+++ qt/frontend/frontend.pro 2012-02-07 22:38:32 +0000
93@@ -4,9 +4,9 @@
94 #
95 #-------------------------------------------------
96
97-QT += core gui dbus
98+QT += core dbus service
99
100-TARGET = checkbox-qt-gui
101+TARGET = checkbox-qt-service
102 TEMPLATE = app
103
104
105
106=== modified file 'setup.py'
107--- setup.py 2012-02-01 18:41:55 +0000
108+++ setup.py 2012-02-07 22:38:32 +0000
109@@ -228,8 +228,8 @@
110 ("share/checkbox/report/images/", ["report/images/*"]),
111 ("share/checkbox/scripts/", ["scripts/*"]),
112 ("share/checkbox/gtk/", ["gtk/checkbox-gtk.ui", "gtk/*.png"]),
113+ ("share/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png", "qt/frontend/checkbox-qt-service"]),
114 ("share/dbus-1/services/", ["qt/com.canonical.QtCheckbox.service"]),
115- ("share/checkbox/qt/", ["qt/checkbox-qt.ui", "qt/*.png"]),
116 ("share/apport/package-hooks/", ["apport/source_checkbox.py"]),
117 ("share/apport/general-hooks/", ["apport/checkbox.py"])],
118 scripts = ["bin/checkbox-cli", "bin/checkbox-gtk", "bin/checkbox-sru",

Subscribers

People subscribed via source and target branches