5 files changed, 46 insertions, 25 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..06fedd2
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,11 @@
+Tip: to test-build this package using an otherwise-vanilla sbuild for precise,
+you can use this command:
+
+sbuild -d precise \
+ --extra-repository="deb http://archive.ubuntu.com/ubuntu precise universe" \
+ --chroot-setup-commands="apt-key adv --keyserver keyserver.ubuntu.com --recv-key 1B4B6B2D2BBDF2BD" \
+ --extra-repository="deb http://ppa.launchpad.net/checkbox-dev/ppa/ubuntu precise main"
+
+It will enable universe and the development PPA and built the package locally
+against what is available in the PPA. This lessens the requirements to maintain
+a custom sbuild chroot just for building this package.
diff --git a/debian/changelog b/debian/changelog
index 74200c8..b5484ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+plainbox-provider-checkbox (0.21.3-1~ppa1) precise; urgency=medium
+
+ * Create a backport for precise, for the Hardware Certification Tools PPA.
+ This version has different packaging, not based on dh-python (sadly), so
+ that it can build natively on 12.04.
+ * Copy most dependencies over from the PPA packaging. It seems that most
+ discrepancies are caused by the attempt to , ahem, sidestep requirements
+ to follow the MIR (Main Inclusion Request) process for some of the things
+ that are actually needed to run some tests. For the purpose of making the
+ transition less costly I've opted into adopting the PPA packaging. At the
+ same time I've filed a bug to reconcile dependencies into one (and to move
+ them to the provider upstream via the packaging meta-data unit system).
+ (The bug in question is http://pad.lv/1481691)
+ * Discard the "manage.py packaging" step because of http://pad.lv/1481727
+ * Run wrap-and-sort on everything
+
+ -- Zygmunt Krynicki <zygmunt.krynicki@canonical.com> Wed, 05 Aug 2015 10:31:25 +0200
+
 plainbox-provider-checkbox (0.21.3-1) unstable; urgency=medium
 
 * New upstream maintenance release:
diff --git a/debian/control b/debian/control
index 652883e..f116376 100644
--- a/debian/control
+++ b/debian/control
@@ -6,15 +6,13 @@ Uploaders: Sylvain Pineau <sylvain.pineau@canonical.com>,
 Zygmunt Krynicki <zygmunt.krynicki@canonical.com>,
 Python Applications Packaging Team <python-apps-team@lists.alioth.debian.org>
 Build-Depends: debhelper (>= 9),
- dh-python,
 intltool,
 plainbox-provider-resource-generic (>= 0.17),
 python (>= 2.7),
 python3,
 python3-checkbox-support (>= 0.18),
- python3-debian,
 python3-plainbox (>= 0.22)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/plainbox-provider-checkbox/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/plainbox-provider-checkbox/trunk/
 Homepage: http://launchpad.net/checkbox
@@ -27,40 +25,39 @@ Depends: plainbox-provider-resource-generic (>= 0.17),
 python3,
 python3-checkbox-support (>= 0.18),
 ${misc:Depends},
- ${plainbox:Depends},
 ${shlibs:Depends}
-Recommends: gir1.2-gst-plugins-base-1.0,
+Recommends: bonnie++,
+ curl,
+ ethtool,
+ gir1.2-gst-plugins-base-1.0,
 gir1.2-gstreamer-1.0,
 gstreamer1.0-plugins-good,
 gstreamer1.0-pulseaudio,
+ hdparm,
 libgstreamer1.0-0,
+ lshw,
+ nmap,
+ obexd-client,
 pm-utils,
 python3-apt,
 python3-dbus,
 python3-gi,
- ${plainbox:Recommends}
-Suggests: bonnie++,
- bootchart,
- curl,
- ethtool,
+ python3-guacamole,
+ smartmontools,
+ sysstat
+Suggests: bootchart,
+ fswebcam,
 fwts,
- git-core,
 glmark2,
 glmark2-es2,
- hdparm,
- lshw,
+ gtkperf,
+ imagemagick,
 mesa-utils,
- nmap,
- obexd-client,
 obexftp,
 render-bench,
- smartmontools,
 sox,
 stress,
- sysstat,
- wmctrl,
- ${plainbox:Suggests}
-X-Plainbox-Provider: yes
+ 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.
diff --git a/debian/copyright b/debian/copyright
index 73c8143..83e320c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -87,4 +87,3 @@ License: GPL-3
 .
 On Debian-based systems the full text of the GPL, version 3, can be found at
 /usr/share/common-licenses/GPL-3.
-
diff --git a/debian/rules b/debian/rules
index dbc8326..60d6a39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,3 @@ override_dh_auto_install:
 	# But don't modify the name, it has to be exactly as before
 	sed -i -e 's!name = $(terse_id)!name = $(verbose_id)!g' \
 	$(CURDIR)/debian/$(pkg_name)/usr/share/plainbox-providers-1/$(terse_id).provider
-
-override_dh_gencontrol:
-	python3 manage.py packaging
-	dh_gencontrol