[Python-modules-commits] r20042 - in packages/ipy/trunk/debian (8 files)

Wed Jan 18 16:34:17 UTC 2012

Date: Wednesday, January 18, 2012 @ 16:34:15
  Author: kitterman
Revision: 20042

* Team upload
* New upstream version
  - Update debian/copyright
* Convert to dh_python2
  - Drop build-depends on python-support
  - Remove debian/pyversions
  - Version python-all build-dep
  - Build --with python2
* Add support for Python3
  - Add new python3-ipy binary to debian/control
  - Add python3-all to build-depends
  - Build --with python3
  - Override dh_auto_build/install to build for python and python3
  - Override dh_auto_clean to remove python3 build directory
  - Not running tests for python3, since test/test_IPy.py is python only
  - Rename debian/docs to python-ipy.docs and python3-ipy.docs so docs are
    installed in both packages
* Drop old conflicts on python2.3/2.4-ipy
* Drop unneeded python:Provides
* Bump standards version to 3.9.2 without further change
* Update Homepage: field in debian/control with new upstream location on
  github

Added:
  packages/ipy/trunk/debian/python-ipy.docs
  packages/ipy/trunk/debian/python3-ipy.docs
Modified:
  packages/ipy/trunk/debian/changelog
  packages/ipy/trunk/debian/control
  packages/ipy/trunk/debian/copyright
  packages/ipy/trunk/debian/rules
Deleted:
  packages/ipy/trunk/debian/docs
  packages/ipy/trunk/debian/pyversions

Modified: packages/ipy/trunk/debian/changelog
===================================================================

--- packages/ipy/trunk/debian/changelog	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/changelog	2012-01-18 16:34:15 UTC (rev 20042)
@@ -1,3 +1,30 @@
+ipy (1:0.75-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream version
+    - Update debian/copyright
+  * Convert to dh_python2
+    - Drop build-depends on python-support
+    - Remove debian/pyversions
+    - Version python-all build-dep
+    - Build --with python2
+  * Add support for Python3
+    - Add new python3-ipy binary to debian/control
+    - Add python3-all to build-depends
+    - Build --with python3
+    - Override dh_auto_build/install to build for python and python3
+    - Override dh_auto_clean to remove python3 build directory
+    - Not running tests for python3, since test/test_IPy.py is python only
+    - Rename debian/docs to python-ipy.docs and python3-ipy.docs so docs are
+      installed in both packages
+  * Drop old conflicts on python2.3/2.4-ipy
+  * Drop unneeded python:Provides
+  * Bump standards version to 3.9.2 without further change
+  * Update Homepage: field in debian/control with new upstream location on
+    github
+
+ -- Scott Kitterman <scott at kitterman.com>  Wed, 18 Jan 2012 07:23:32 -0500
+
 ipy (1:0.72-1) unstable; urgency=low
 
   * New upstream version.

Modified: packages/ipy/trunk/debian/control
===================================================================
--- packages/ipy/trunk/debian/control	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/control	2012-01-18 16:34:15 UTC (rev 20042)
@@ -3,21 +3,28 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bzed at debian.org>, Morten Werner Forsbring <werner at debian.org>
-Build-Depends: debhelper (>= 7.3.5), python-all
-Build-Depends-Indep: python-support (>= 0.7.1), python-docutils
-Standards-Version: 3.8.3
-Homepage: http://software.inl.fr/trac/trac.cgi/wiki/IPy
+Build-Depends: debhelper (>= 7.3.5), python-all (>= 2.6.5-2~), python3-all
+Build-Depends-Indep: python-docutils
+Standards-Version: 3.9.2
+Homepage: https://github.com/haypo/python-ipy/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/ipy/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/ipy/trunk/
 
 Package: python-ipy
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}
-Provides: ${python:Provides}
-Conflicts: python2.3-ipy, python2.4-ipy
-Replaces: python2.3-ipy, python2.4-ipy
 Description: Python module for handling IPv4 and IPv6 addresses and networks
  IPy is a Python module for handling IPv4 and IPv6 addresses and
  networks in a fashion similar to perl's Net::IP and friends. The IP
  class allows a comfortable parsing and handling for most notations in
  use for IPv4 and IPv6 addresses and networks.
+
+Package: python3-ipy
+Architecture: all
+Depends: ${python3:Depends}, ${misc:Depends}
+Description: Python3 module for handling IPv4 and IPv6 addresses and networks
+ IPy is a Python3 module for handling IPv4 and IPv6 addresses and
+ networks in a fashion similar to perl's Net::IP and friends. The IP
+ class allows a comfortable parsing and handling for most notations in
+ use for IPv4 and IPv6 addresses and networks.
+

Modified: packages/ipy/trunk/debian/copyright
===================================================================
--- packages/ipy/trunk/debian/copyright	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/copyright	2012-01-18 16:34:15 UTC (rev 20042)
@@ -8,26 +8,43 @@
 
 Upstream Authors:
 
+    Authors
+    =======
+
+    Maximillian Dornseif <md AT hudora.de>
+       > IPy author and maintainer until the version 0.42
+    Victor Stinner <victor.stinner AT haypocalc.com>
+       > new maintainer since the version 0.5
+
+    Contributors
+    ============
+
+    Aras Vaichas <arasv AT magtech.com.au>
+       > fix __getitem__ for IP object of size 1
+    Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA at gmail.com>
+       > IP('0.0.0.0/0') + IP('0.0.0.0/0') raises an error
+    Bernhard Frauendienst <contact AT obeliks.de>
+       > fix IPv6 parser
     James Teh <james.teh AT netboxblue.com>
-        - make_net option patch
+       > make_net option patch
     Jean Gillaux <jgillaux AT inl.fr>
-        - Fix netmask "/0.0.0.0"
+       > fix netmask "/0.0.0.0"
     Mark Johnston
-        - bringing IPy to Python 2.3
+       > bringing IPy to Python 2.3
     Matthew Flanagan <mattimustang AT gmail.com>
-        - Fix strCompressed()
-    Maximillian Dornseif <md AT hudora.de>
-        - IPy author and maintainer until version 0.42
+       > fix strCompressed()
+    Robert Nickel <rnickel AT scea.com>
+       > fix setup.py bdist_rpm
     Samuel Krempp
-        - fix __cmp__() bug
+       > fix __cmp__() bug
     Shell, Hin-lik Hung
-        - bring IPy to OpenBSD ports
+       > bring IPy to OpenBSD ports
     Skinny Puppy
-        - __add__() now always  returns a value
-    Victor Stinner <victor.stinner AT inl.fr>
-        - Patch setup.py for setuptools, maintainer since version 0.5
+       > __add__() now always  returns a value
+    Sander Steffann (sander AT steffann.nl)
+       > Fix the IPv6 address range descriptions
     William McVey <wam AT cisco.com>
-        - Fix IP.__nonzero__()
+       > Fix IP.__nonzero__()
 
 
 Copyright:
@@ -61,12 +78,3 @@
     (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
     SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
-Files with different Copyrights/Licenses:
-
-rest.css:
-
-    Author: David Goodger
-    Contact: goodger at users.sourceforge.net
-    copyright: This stylesheet has been placed in the public domain.
-

Deleted: packages/ipy/trunk/debian/docs
===================================================================
--- packages/ipy/trunk/debian/docs	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/docs	2012-01-18 16:34:15 UTC (rev 20042)
@@ -1,2 +0,0 @@
-README
-IPy.html

Added: packages/ipy/trunk/debian/python-ipy.docs
===================================================================
--- packages/ipy/trunk/debian/python-ipy.docs	                        (rev 0)
+++ packages/ipy/trunk/debian/python-ipy.docs	2012-01-18 16:34:15 UTC (rev 20042)
@@ -0,0 +1,2 @@
+README
+IPy.html

Added: packages/ipy/trunk/debian/python3-ipy.docs
===================================================================
--- packages/ipy/trunk/debian/python3-ipy.docs	                        (rev 0)
+++ packages/ipy/trunk/debian/python3-ipy.docs	2012-01-18 16:34:15 UTC (rev 20042)
@@ -0,0 +1,2 @@
+README
+IPy.html

Deleted: packages/ipy/trunk/debian/pyversions
===================================================================
--- packages/ipy/trunk/debian/pyversions	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/pyversions	2012-01-18 16:34:15 UTC (rev 20042)
@@ -1 +0,0 @@
-2.2-

Modified: packages/ipy/trunk/debian/rules
===================================================================
--- packages/ipy/trunk/debian/rules	2012-01-18 16:33:42 UTC (rev 20041)
+++ packages/ipy/trunk/debian/rules	2012-01-18 16:34:15 UTC (rev 20042)
@@ -4,10 +4,32 @@
 #export DH_VERBOSE=1
 
 PYTHONS:=$(shell pyversions -vr)
+PYTHON3S:=$(shell py3versions -vr)
 
 %:
-	dh $@
+	dh $@ --with python2,python3
 
+override_dh_auto_build:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py build; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py build; \
+	done
+
+override_dh_auto_install:
+	set -e && for pyvers in $(PYTHONS); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python-ipy; \
+	done
+	set -e && for pyvers in $(PYTHON3S); do \
+		python$$pyvers setup.py install --install-layout=deb \
+			--root $(CURDIR)/debian/python3-ipy; \
+	done
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(CURDIR)/build
 IPy.html:
 	rst2html README IPy.html 
 
@@ -15,7 +37,7 @@
 binary-arch:
 	# nothing to do here.
 binary-indep: $(PYTHONS:%=test/test-%-stamp) IPy.html
-	dh $@
+	dh $@ --with python2,python3
 
 test/test-%-stamp:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))


