Merge lp:~roadmr/checkbox/packaging-sync-packaging into lp:~checkbox-dev/checkbox/checkbox-packaging

[Daniel Manrique]

Syncs the packaging branches. The only differences should be:

- changelog differences
- checkbox-packaging references checkbox-old in some places.
- checkbox-packaging refers to itself in the control Vcs-Bzr field.

Syncs the packaging branches. The only differences should be:

- changelog differences
- checkbox-packaging references checkbox-old in some places.
- checkbox-packaging refers to itself in the control Vcs-Bzr field.

[Zygmunt Krynicki (zyga)]

Looks good, +1

review: Approve

=== modified file 'debian/checkbox-cli.install'
--- debian/checkbox-cli.install	2013-06-01 14:18:12 +0000
+++ debian/checkbox-cli.install	2013-07-03 21:15:33 +0000
@@ -1,3 +1,3 @@
 usr/bin/checkbox-cli
+usr/lib/python*/*-packages/checkbox_cli/*
 usr/share/checkbox/examples/checkbox-cli.ini
-usr/lib/python*/*-packages/checkbox_cli/*
 
=== modified file 'debian/checkbox-gtk.install'
--- debian/checkbox-gtk.install	2013-06-01 14:18:12 +0000
+++ debian/checkbox-gtk.install	2013-07-03 21:15:33 +0000
@@ -1,4 +1,4 @@
 usr/bin/checkbox-gtk
+usr/lib/python*/*-packages/checkbox_gtk/*
+usr/share/checkbox/examples/checkbox-gtk.ini
 usr/share/checkbox/gtk/*
-usr/share/checkbox/examples/checkbox-gtk.ini
-usr/lib/python*/*-packages/checkbox_gtk/*
 
=== modified file 'debian/checkbox-qt.install'
--- debian/checkbox-qt.install	2013-06-01 14:18:12 +0000
+++ debian/checkbox-qt.install	2013-07-03 21:15:33 +0000
@@ -1,6 +1,6 @@
 usr/bin/checkbox-qt
+usr/lib/checkbox/qt/*
+usr/lib/python*/*-packages/checkbox_qt/*
 usr/share/applications/checkbox-qt.desktop
 usr/share/checkbox/examples/checkbox-qt.ini
 usr/share/dbus-1/services/*
-usr/lib/checkbox/qt/*
-usr/lib/python*/*-packages/checkbox_qt/*
 
=== modified file 'debian/checkbox-urwid.install'
--- debian/checkbox-urwid.install	2013-06-01 14:18:12 +0000
+++ debian/checkbox-urwid.install	2013-07-03 21:15:33 +0000
@@ -1,3 +1,3 @@
 usr/bin/checkbox-urwid
+usr/lib/python*/*-packages/checkbox_urwid/*
 usr/share/checkbox/examples/checkbox-urwid.ini
-usr/lib/python*/*-packages/checkbox_urwid/*
 
=== modified file 'debian/checkbox.install'
--- debian/checkbox.install	2013-06-01 14:18:12 +0000
+++ debian/checkbox.install	2013-07-03 21:15:33 +0000
@@ -1,17 +1,18 @@
-usr/share/icons
-usr/share/locale
+usr/lib/checkbox/bin/*
+usr/lib/python*/*-packages/checkbox/*
+usr/share/apport/general-hooks/checkbox.py
+usr/share/apport/package-hooks/source_checkbox.py
 usr/share/checkbox/backend
-usr/share/checkbox/run
 usr/share/checkbox/configs
 usr/share/checkbox/data/*
+usr/share/checkbox/examples/checkbox.ini
+usr/share/checkbox/examples/network.cfg
+usr/share/checkbox/examples/org.freedesktop.policykit.checkbox.policy usr/share/polkit-1/actions/
 usr/share/checkbox/install/*
 usr/share/checkbox/jobs/*
 usr/share/checkbox/patches/*
 usr/share/checkbox/plugins/*
 usr/share/checkbox/report/*
-usr/share/checkbox/examples/checkbox.ini
-usr/share/checkbox/examples/network.cfg
-usr/lib/python*/*-packages/checkbox/*
-usr/lib/checkbox/bin/*
-usr/share/apport/package-hooks/source_checkbox.py
-usr/share/apport/general-hooks/checkbox.py
+usr/share/checkbox/run
+usr/share/icons
+usr/share/locale
 
=== modified file 'debian/checkbox.postinst'
--- debian/checkbox.postinst	2013-06-01 14:18:12 +0000
+++ debian/checkbox.postinst	2013-07-03 21:15:33 +0000
@@ -3,4 +3,7 @@
 . /usr/share/debconf/confmodule
 . /usr/share/checkbox/install/postinst
 
+cp /usr/share/checkbox/examples/network.cfg /etc/checkbox.d/
+cp /usr/share/checkbox/examples/virtualization.cfg /etc/checkbox.d/
+
 #DEBHELPER#
 
=== modified file 'debian/control'
--- debian/control	2013-07-03 16:01:35 +0000
+++ debian/control	2013-07-03 21:15:33 +0000
@@ -11,13 +11,13 @@
                python,
                python-distutils-extra,
                python-setuptools,
-               python3-setuptools,
                python3-all,
                python3-distutils-extra,
                python3-gi,
                python3-lxml,
                python3-mock,
                python3-pkg-resources,
+               python3-setuptools,
                qt4-qmake
 Vcs-Bzr: https://code.launchpad.net/~checkbox-dev/checkbox/checkbox-packaging
 
@@ -25,10 +25,10 @@
 Section: python
 Architecture: any
 Depends: debconf,
+         gir1.2-gudev-1.0,
+         policykit-1,
          python3-lxml,
-         policykit-1,
          udev,
-         gir1.2-gudev-1.0,
          udisks2 | udisks,
          ${misc:Depends},
          ${python3:Depends},
@@ -120,8 +120,7 @@
 
 Package: checkbox-hw-collection
 Architecture: any
-Depends: checkbox (>= ${source:Version}),
-         ${misc:Depends}
+Depends: checkbox (>= ${source:Version}), ${misc:Depends}
 Description: CLI tool for collecting HW information from a system
  .
  This package provides a tool for collecting hardware information from
 
=== modified file 'debian/rules'
--- debian/rules	2013-06-01 17:32:35 +0000
+++ debian/rules	2013-07-03 21:15:33 +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 checkbox-old/README 
 	dh_installdocs -pcheckbox-urwid checkbox-old/README 
 	dh_installdocs -pcheckbox-gtk checkbox-old/README 
-	dh_installdocs -pcheckbox-qt checkbox-old/README 
+	dh_installdocs -pcheckbox-qt checkbox-old/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