[Python-modules-commits] r20644 - in packages/pexpect/trunk/debian (5 files)

[adejong at users.alioth.debian.org]

    Date: Friday, March 2, 2012 @ 14:39:59
  Author: adejong
Revision: 20644

  * Switch to dh-style debian/rules.
  * Moved packaging from python-central to dh_python2 (Closes: #616935).
  * Drop Conflicts/Replaces on ancient versions which shipped in sarge.

Modified:
  packages/pexpect/trunk/debian/changelog
  packages/pexpect/trunk/debian/compat
  packages/pexpect/trunk/debian/control
  packages/pexpect/trunk/debian/rules
Deleted:
  packages/pexpect/trunk/debian/pycompat

Modified: packages/pexpect/trunk/debian/changelog
===================================================================
--- packages/pexpect/trunk/debian/changelog	2012-03-02 13:58:07 UTC (rev 20643)
+++ packages/pexpect/trunk/debian/changelog	2012-03-02 14:39:59 UTC (rev 20644)
@@ -15,8 +15,11 @@
 
   [ Arthur de Jong ]
   * Switch to 3.0 (quilt) source format.
+  * Switch to dh-style debian/rules.
+  * Moved packaging from python-central to dh_python2 (Closes: #616935).
+  * Drop Conflicts/Replaces on ancient versions which shipped in sarge.
 
- -- Arthur de Jong <adejong at debian.org>  Fri, 02 Mar 2012 14:41:00 +0100
+ -- Arthur de Jong <adejong at debian.org>  Fri, 02 Mar 2012 15:30:00 +0100
 
 pexpect (2.3-1) unstable; urgency=low
 

Modified: packages/pexpect/trunk/debian/compat
===================================================================
--- packages/pexpect/trunk/debian/compat	2012-03-02 13:58:07 UTC (rev 20643)
+++ packages/pexpect/trunk/debian/compat	2012-03-02 14:39:59 UTC (rev 20644)
@@ -1 +1 @@
-4
+7

Modified: packages/pexpect/trunk/debian/control
===================================================================
--- packages/pexpect/trunk/debian/control	2012-03-02 13:58:07 UTC (rev 20643)
+++ packages/pexpect/trunk/debian/control	2012-03-02 14:39:59 UTC (rev 20644)
@@ -1,9 +1,8 @@
 Source: pexpect
 Section: python
 Priority: optional
-Build-Depends-Indep: python-all-dev (>= 2.3.5-10), python-central (>= 0.4.17)
-Build-Depends: debhelper (>= 5.0.37.1)
-XS-Python-Version: all
+Build-Depends-Indep: python-all (>= 2.6.6-3~)
+Build-Depends: debhelper (>= 7.0.50~)
 Maintainer: Ganesan Rajagopal <rganesan at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.8.0
@@ -13,11 +12,7 @@
 
 Package: python-pexpect
 Architecture: all
-Depends: ${python:Depends}
-Provides: ${python:Provides}
-Conflicts: python2.3-pexpect, python2.4-pexpect
-Replaces: python2.3-pexpect, python2.4-pexpect
-XB-Python-Version: ${python:Versions}
+Depends: ${misc:Depends}, ${python:Depends}
 Description: Python module for automating interactive applications
  Pexpect is a pure Python module for spawning child applications;
  controlling them; and responding to expected patterns in their

Deleted: packages/pexpect/trunk/debian/pycompat
===================================================================
--- packages/pexpect/trunk/debian/pycompat	2012-03-02 13:58:07 UTC (rev 20643)
+++ packages/pexpect/trunk/debian/pycompat	2012-03-02 14:39:59 UTC (rev 20644)
@@ -1 +0,0 @@
-2

Modified: packages/pexpect/trunk/debian/rules
===================================================================
--- packages/pexpect/trunk/debian/rules	2012-03-02 13:58:07 UTC (rev 20643)
+++ packages/pexpect/trunk/debian/rules	2012-03-02 14:39:59 UTC (rev 20644)
@@ -1,62 +1,4 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PYVERS	:= $(shell pyversions -vr debian/control)
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog \
-                         | grep ^Version: | cut -d ' ' -f 2 | cut -d '-' -f 1)
-PYMOD	= pexpect
-d	= debian/python-pexpect
-
-build: $(PYVERS:%=build-python%)
-	touch $@
-
-build-python%:
-	dh_testdir
-	python$* setup.py build
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp build-python*
-	rm -rf build dist
-	rm -f *.pyc
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	$(MAKE) -f debian/rules $(PYVERS:%=install-python%)
-
-install-python%:
-	python$* setup.py install --no-compile --root=$(d)
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_installchangelogs -i
-	dh_link -i
-	dh_pycentral -i
-	dh_python -i
-	echo python:Provides=$(foreach pv,$(shell pyversions -s),$(pv)-pexpect)|sed 's/ /, /g' >> debian/python-pexpect.substvars
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	# nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+	dh $@ --with python2