[Python-modules-commits] r19643 - in packages/argparse/trunk/debian (changelog control rules)

[rrs at users.alioth.debian.org]

    Date: Saturday, December 17, 2011 @ 02:07:38
  Author: rrs
Revision: 19643

only ship with << 2.7

Modified:
  packages/argparse/trunk/debian/changelog
  packages/argparse/trunk/debian/control
  packages/argparse/trunk/debian/rules

Modified: packages/argparse/trunk/debian/changelog
===================================================================
--- packages/argparse/trunk/debian/changelog	2011-12-17 02:07:12 UTC (rev 19642)
+++ packages/argparse/trunk/debian/changelog	2011-12-17 02:07:38 UTC (rev 19643)
@@ -1,3 +1,11 @@
+argparse (1.2.1-2) unstable; urgency=low
+
+  * Only ship argparse for Python version lower than 2.7.
+    - argparse is the default option parser with 2.7 and above 
+    Thanks to Arnaud Fontaine for the patch (Closes: #651962)
+
+ -- Ritesh Raj Sarraf <rrs at debian.org>  Sat, 17 Dec 2011 07:26:49 +0530
+
 argparse (1.2.1-1) unstable; urgency=low
 
   [ Sameer Rahmani ]

Modified: packages/argparse/trunk/debian/control
===================================================================
--- packages/argparse/trunk/debian/control	2011-12-17 02:07:12 UTC (rev 19642)
+++ packages/argparse/trunk/debian/control	2011-12-17 02:07:38 UTC (rev 19643)
@@ -3,10 +3,10 @@
 Section: python
 Maintainer: Ritesh Raj Sarraf <rrs at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7), python (>= 2.6.6-3~), python-setuptools
+Build-Depends: debhelper (>= 7), python-all, python (>= 2.6.6-3~), python-setuptools
 Build-Depends-Indep: python-sphinx
 Standards-Version: 3.9.2
-X-Python-Version: >=2.4
+X-Python-Version: >= 2.4, << 2.7
 Vcs-Svn: svn://svn.debian.org/svn/python-modules/packages/argparse/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/argparse/trunk/
 Homepage: http://code.google.com/p/argparse/

Modified: packages/argparse/trunk/debian/rules
===================================================================
--- packages/argparse/trunk/debian/rules	2011-12-17 02:07:12 UTC (rev 19642)
+++ packages/argparse/trunk/debian/rules	2011-12-17 02:07:38 UTC (rev 19643)
@@ -11,9 +11,13 @@
 build-arch: build-stamp
 build-indep: build-stamp
 
+PYVERS := $(shell pyversions -rv)
+
 build-stamp:
 	dh_testdir
-	python setup.py build
+	set -e; for pyver in $(PYVERS); do \
+		python$$pyver setup.py build; \
+	done
 
 	# Generate the docs from the doc sources
 	[ ! -e doc/source ] || sphinx-build doc/source html
@@ -33,7 +37,10 @@
 	[ ! -e html ] || rm -rf html
 	[ ! -e doc.orig ] || mv doc.orig doc
 
-	python setup.py clean --all
+	set -e; for pyver in $(PYVERS); do \
+		python$$pyver setup.py clean --all; \
+	done
+
 	[ -f argparse.pyc ] && rm -f argparse.pyc
 
 	dh_clean
@@ -46,8 +53,11 @@
 
 	[ ! -e doc ] || mv doc doc.orig
 
-	python setup.py install --root $(CURDIR)/debian/python-argparse
-	
+	set -e; for pyver in $(PYVERS); do \
+		python$$pyver setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-argparse; \
+	done
+
 	# Remove jquery.js javascript as per policy 4.13
 	[ ! -e html/_static/jquery.js ] || rm -rf html/_static/jquery.js