[Python-modules-commits] r20505 - in packages/python-pipeline/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Sunday, February 19, 2012 @ 00:52:03
  Author: jwilk
Revision: 20505

Undo python-support -> dh_python2 conversion.

Modified:
  packages/python-pipeline/trunk/debian/changelog
  packages/python-pipeline/trunk/debian/control
  packages/python-pipeline/trunk/debian/rules

Modified: packages/python-pipeline/trunk/debian/changelog
===================================================================
--- packages/python-pipeline/trunk/debian/changelog	2012-02-19 00:47:47 UTC (rev 20504)
+++ packages/python-pipeline/trunk/debian/changelog	2012-02-19 00:52:03 UTC (rev 20505)
@@ -5,8 +5,6 @@
   [ Daniele Tricoli ]
   * debian/control
     - Bumped Standards-Version to 3.9.2 (no changes needed)
-  * debian/{control,rules}
-    - Switched to dh_python2
 
   [ Jakub Wilk ]
   * Orphan the package (see: #620067).

Modified: packages/python-pipeline/trunk/debian/control
===================================================================
--- packages/python-pipeline/trunk/debian/control	2012-02-19 00:47:47 UTC (rev 20504)
+++ packages/python-pipeline/trunk/debian/control	2012-02-19 00:52:03 UTC (rev 20505)
@@ -2,11 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
-               python-all (>= 2.6.6-3~),
-               python3-all (>= 3.1.2-7~)
+Build-Depends: debhelper (>= 7.0.50~), python-all, python3-all (>= 3.1.2-7~), python-support (>= 0.6.4)
 Standards-Version: 3.9.2
-X-Python-Version: >= 2.4
+XS-Python-Version: >= 2.4
 X-Python3-Version: >= 3.0
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-pipeline/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-pipeline/trunk/

Modified: packages/python-pipeline/trunk/debian/rules
===================================================================
--- packages/python-pipeline/trunk/debian/rules	2012-02-19 00:47:47 UTC (rev 20504)
+++ packages/python-pipeline/trunk/debian/rules	2012-02-19 00:52:03 UTC (rev 20505)
@@ -22,6 +22,11 @@
 	dh_auto_install
 	cd py3k && python3 setup.py install $(py_setup_install_args) --root=$(CURDIR)/debian/tmp
 
+.PHONY: override_dh_pysupport
+override_dh_pysupport:
+	dh_pysupport -p python-pipeline
+	dh_python3 -p python3-pipeline
+
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -37,7 +42,7 @@
 
 .PHONY: build build-arch build-indep binary binary-arch binary-indep clean
 build binary binary-indep clean:
-	dh $(@) --with python2,python3
+	dh $(@)
 build-indep: build
 build-arch binary-arch:
 	# Nothing to do.