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

[kitterman at users.alioth.debian.org]

    Date: Saturday, May 17, 2014 @ 05:38:50
  Author: kitterman
Revision: 28950

* Drop python3-ipaddr binary since ipaddr is incorporated in python3.3 and
  later as ipaddress and nothing in the archive needs python3-ipaddr
  - Remove binary from debian/control
  - Drop python3 build-depends and X-Python3-Version from debian/control
  - Simplify debian/rules to build for only python2.7
  - Remove python3-ipaddr.docs
* Explicitly depend on dh-python to get the updated version

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

Modified: packages/python-ipaddr/trunk/debian/changelog
===================================================================
--- packages/python-ipaddr/trunk/debian/changelog	2014-05-16 23:04:40 UTC (rev 28949)
+++ packages/python-ipaddr/trunk/debian/changelog	2014-05-17 05:38:50 UTC (rev 28950)
@@ -1,3 +1,15 @@
+python-ipaddr (2.1.11-2) unstable; urgency=low
+
+  * Drop python3-ipaddr binary since ipaddr is incorporated in python3.3 and
+    later as ipaddress and nothing in the archive needs python3-ipaddr
+    - Remove binary from debian/control
+    - Drop python3 build-depends and X-Python3-Version from debian/control
+    - Simplify debian/rules to build for only python2.7
+    - Remove python3-ipaddr.docs
+  * Explicitly depend on dh-python to get the updated version
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 16 May 2014 21:44:51 -0400
+
 python-ipaddr (2.1.11-1) unstable; urgency=medium
 
   [ Jakub Wilk ]

Modified: packages/python-ipaddr/trunk/debian/control
===================================================================
--- packages/python-ipaddr/trunk/debian/control	2014-05-16 23:04:40 UTC (rev 28949)
+++ packages/python-ipaddr/trunk/debian/control	2014-05-17 05:38:50 UTC (rev 28950)
@@ -3,11 +3,10 @@
 Priority: optional
 Maintainer: Scott Kitterman <scott at kitterman.com>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~), python3-all (>= 3.1.3-3)
+Build-Depends: debhelper (>= 7.3.16), python-all (>= 2.6.5-2~), dh-python
 Standards-Version: 3.9.5
 Homepage: http://code.google.com/p/ipaddr-py/
 X-Python-Version: >= 2.4
-X-Python3-Version: >= 3.1
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-ipaddr/trunk/
 Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-ipaddr/trunk/
 
@@ -21,17 +20,5 @@
  This is a pure Python implementation of classes for IPv4/6 addresses and
  networks. It supports comparisons to determine if IP addresses are contained
  inside a defined network, conversion of lists of IP addresses into compact
- CIDR lists, and other IP address manipulation
-
-Package: python3-ipaddr
-Architecture: all
-Depends: ${python3:Depends}, ${misc:Depends}
-Description: Python3 module for working with IP addresses, both IPv4 and IPv6
- This library is used to create/poke/manipulate IPv4 and IPv6 addresses
- and networks in Python3.  It is intended to be fast and lightweight.
- .
- This is a pure Python3 implementation of classes for IPv4/6 addresses and
- networks. It supports comparisons to determine if IP addresses are contained
- inside a defined network, conversion of lists of IP addresses into compact
  CIDR lists, and other IP address manipulation.
 

Modified: packages/python-ipaddr/trunk/debian/rules
===================================================================
--- packages/python-ipaddr/trunk/debian/rules	2014-05-16 23:04:40 UTC (rev 28949)
+++ packages/python-ipaddr/trunk/debian/rules	2014-05-17 05:38:50 UTC (rev 28950)
@@ -2,23 +2,10 @@
 # -*- makefile -*-
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2
 
-override_dh_auto_install:
-	set -e && for pyvers in $(shell pyversions -vr); do \
-		python$$pyvers setup.py install --no-compile -O0 --install-layout=deb \
-			--root $(CURDIR)/debian/python-ipaddr; \
-		python$$pyvers $(CURDIR)/ipaddr_test.py; \
-	done
-	2to3 -w $(CURDIR)/ipaddr.py
-	2to3 -w $(CURDIR)/ipaddr_test.py
-	set -e && for pyvers in $(shell py3versions -sv); do \
-		python$$pyvers setup.py install --no-compile -O0 --install-layout=deb \
-			--root $(CURDIR)/debian/python3-ipaddr; \
-		python$$pyvers $(CURDIR)/ipaddr_test.py; \
-	done
-	mv $(CURDIR)/ipaddr.py.bak $(CURDIR)/ipaddr.py
-	mv $(CURDIR)/ipaddr_test.py.bak $(CURDIR)/ipaddr_test.py
+override_dh_auto_test:
+	python $(CURDIR)/ipaddr_test.py
 
 override_dh_installdocs:
 	cp $(CURDIR)/RELEASENOTES $(CURDIR)/changelog
@@ -28,5 +15,4 @@
 override_dh_auto_clean:
 	rm -rf $(CURDIR)/ipaddr.pyc
 	rm -rf $(CURDIR)/build
-	rm -rf $(CURDIR)/__pycache__
 	dh_clean