[Python-apps-commits] r10747 - in packages/plainbox-provider-checkbox/trunk/debian (3 files)

[zyga-guest at users.alioth.debian.org]

    Date: Monday, April 7, 2014 @ 21:44:25
  Author: zyga-guest
Revision: 10747

* debian/control: drop X-Python3-Version
* debian/control: make plainbox-provider-checkbox depend on python and
  python2.7 (for some scripts) rather than suggesting them.

Modified:
  packages/plainbox-provider-checkbox/trunk/debian/changelog
  packages/plainbox-provider-checkbox/trunk/debian/control
  packages/plainbox-provider-checkbox/trunk/debian/rules

Modified: packages/plainbox-provider-checkbox/trunk/debian/changelog
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/changelog	2014-04-07 21:33:50 UTC (rev 10746)
+++ packages/plainbox-provider-checkbox/trunk/debian/changelog	2014-04-07 21:44:25 UTC (rev 10747)
@@ -6,10 +6,9 @@
   * debian/rules: stop using pybuild and use manage.py
     {i18n,build,install,validate} instead. This also drops dependency on
     python3-distutils-extra and replaces that with intltool
-  * debian/rules: override dh_python3 with private directory path in
-    override_dh_python3 target to generate ${python3:Depends} and maintainer
-    scripts (XXX: this doesn't seem to work, dh-gencontrol says
-    ${python3:Depends} is still undefined. 
+  * debian/control: drop X-Python3-Version
+  * debian/control: make plainbox-provider-checkbox depend on python and
+    python2.7 (for some scripts) rather than suggesting them.
   * debian/upstream/signing-key.asc: Use armoured gpg keys to avoid having to
     keep binary files in Debian packaging. Also, replace that with my key
     since I made the 0.3 release upstream.

Modified: packages/plainbox-provider-checkbox/trunk/debian/control
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/control	2014-04-07 21:33:50 UTC (rev 10746)
+++ packages/plainbox-provider-checkbox/trunk/debian/control	2014-04-07 21:44:25 UTC (rev 10747)
@@ -9,10 +9,10 @@
  debhelper (>= 9),
  dh-python,
  intltool,
+ python (>= 2.7),
  python3,
  python3-plainbox (>= 0.5.3),
 Standards-Version: 3.9.5
-X-Python3-Version: >= 3.2
 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
@@ -21,9 +21,10 @@
 Architecture: any
 Depends:
  ${misc:Depends},
- ${python3:Depends},
  ${shlibs:Depends},
  plainbox-provider-resource-generic (>= 0.3),
+ python (>= 2.7),
+ python2.7,
  python3,
 Recommends: gir1.2-gst-plugins-base-1.0,
             gir1.2-gstreamer-1.0,
@@ -48,7 +49,6 @@
           nmap,
           obexd-client,
           obexftp,
-          python (>= 2.7),
           render-bench,
           smartmontools,
           sox,

Modified: packages/plainbox-provider-checkbox/trunk/debian/rules
===================================================================
--- packages/plainbox-provider-checkbox/trunk/debian/rules	2014-04-07 21:33:50 UTC (rev 10746)
+++ packages/plainbox-provider-checkbox/trunk/debian/rules	2014-04-07 21:44:25 UTC (rev 10747)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-export DH_VERBOSE=1
 
 %:
-	dh $@ --with=python3
+	dh $@
 
 override_dh_auto_clean:
 	python3 manage.py clean
@@ -18,17 +17,3 @@
 	python3 manage.py install \
 		--prefix=/usr --layout=unix \
 		--root=$(CURDIR)/debian/plainbox-provider-checkbox/
-
-# There are some python2.7 scripts but dh_python3 --exclude doesn't seem to
-# work reliably so just replace the shebang manually assuming they all got
-# mangled to python3.
-py27_script_list=glob_test screenshot_validation sleep_test
-
-override_dh_python3:
-	dh_python3 \
-		-p plainbox-provider-checkbox \
-		--verbose \
-		--shebang=/usr/bin/python3 \
-		/usr/lib/2013.com.canonical.certification:checkbox/bin
-	sed -e 's:#! /usr/bin/python3:#! /usr/bin/python:' -i \
-		$(foreach py27_script,$(py27_script_list), debian/plainbox-provider-checkbox/usr/lib/2013.com.canonical.certification:checkbox/bin/$(py27_script))