Merge lp:~zyga/checkbox/fix-1307980-plainbox-provider-checkbox into lp:~checkbox-dev/checkbox/ppa-packaging-plainbox-provider-checkbox

[Zygmunt Krynicki]

[Sylvain Pineau (sylvain-pineau)]

Looks good. +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-10 09:58:41 +0000
+++ debian/changelog	2014-04-16 14:00:11 +0000
@@ -1,6 +1,11 @@
 plainbox-provider-checkbox (0.5~dev) UNRELEASED; urgency=medium
   
   * Automatic PPA build
+  * Synchronize with Debian packaging
+  * debian/control: drop dependency on dh-python 
+  * debian/control: build-depend on python3-checkbox-support
+  * debian/control: re-indent and sort dependencies
+  * debian/rules: don't pass --with=python3
 
  -- Zygmunt Krynicki <[e-mail]>  Thu, 10 Apr 2014 11:47:31 +0200
 

=== modified file 'debian/control'
--- debian/control	2014-04-10 09:58:41 +0000
+++ debian/control	2014-04-16 14:00:11 +0000
@@ -7,10 +7,10 @@
            Python Applications Packaging Team <[e-mail]>
 Build-Depends:
  debhelper (>= 9),
- dh-python,
  intltool,
  python (>= 2.7),
  python3,
+ python3-checkbox-support (>= 0.2),
  python3-plainbox (>= 0.5.3),
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-checkbox/trunk/
@@ -26,35 +26,37 @@
  python (>= 2.7),
  python2.7,
  python3,
-Recommends: gir1.2-gst-plugins-base-1.0,
-            gir1.2-gstreamer-1.0,
-            gstreamer1.0-plugins-good,
-            gstreamer1.0-pulseaudio,
-            libgstreamer1.0-0,
-            pm-utils,
-            python3-apt,
-            python3-dbus,
-            python3-gi
-Suggests: bonnie++,
-          bootchart,
-          curl,
-          ethtool,
-          fwts,
-          git-core,
-          glmark2,
-          glmark2-es2,
-          hdparm,
-          lshw,
-          mesa-utils,
-          nmap,
-          obexd-client,
-          obexftp,
-          render-bench,
-          smartmontools,
-          sox,
-          stress,
-          sysstat,
-          wmctrl
+Recommends:
+ gir1.2-gst-plugins-base-1.0,
+ gir1.2-gstreamer-1.0,
+ gstreamer1.0-plugins-good,
+ gstreamer1.0-pulseaudio,
+ libgstreamer1.0-0,
+ pm-utils,
+ python3-apt,
+ python3-dbus,
+ python3-gi
+Suggests:
+ bonnie++,
+ bootchart,
+ curl,
+ ethtool,
+ fwts,
+ git-core,
+ glmark2,
+ glmark2-es2,
+ hdparm,
+ lshw,
+ mesa-utils,
+ nmap,
+ obexd-client,
+ obexftp,
+ render-bench,
+ smartmontools,
+ sox,
+ stress,
+ sysstat,
+ wmctrl
 Description: CheckBox provider for PlainBox
  This package provides the CheckBox jobs collection, i.e the hardware test
  definitions and scripts originally included with CheckBox.

=== modified file 'debian/rules'
--- debian/rules	2014-04-10 09:58:41 +0000
+++ debian/rules	2014-04-16 14:00:11 +0000
@@ -2,7 +2,7 @@
 PPA_DISPLACEMENT=providers/plainbox-provider-checkbox
 
 %:
-	dh $@ --with=python3 --sourcedirectory=$(PPA_DISPLACEMENT)
+	dh $@ --sourcedirectory=$(PPA_DISPLACEMENT)
 
 override_dh_auto_clean:
 	cd $(PPA_DISPLACEMENT) && python3 manage.py clean

=== added directory 'debian/upstream'
=== added file 'debian/upstream/signing-key.asc'
--- debian/upstream/signing-key.asc	1970-01-01 00:00:00 +0000
+++ debian/upstream/signing-key.asc	2014-04-16 14:00:11 +0000
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+xxGS57/Nmfbij8UuxgkLtw==
+=4Jty
+-----END PGP PUBLIC KEY BLOCK-----

=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2014-04-16 14:00:11 +0000
@@ -0,0 +1,4 @@
+version=3
+opts=pgpsigurlmangle=s/$/.asc/ \
+    http://launchpad.net/plainbox-provider-checkbox/+download/ \
+    https://launchpad\.net/plainbox-provider-checkbox/.*/.*/\+download/2013\.com\.canonical\.certification.checkbox-(.*).tar.gz