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

[kitterma-guest at users.alioth.debian.org]

    Date: Monday, January 25, 2010 @ 06:46:29
  Author: kitterma-guest
Revision: 11294

Add quilt and patches from sponsor review/upstream reports.

Added:
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/IPv4IpValidatonError
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/Invalid_exception_names
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/series
Modified:
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/control
  packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/rules

Modified: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/control
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/control	2010-01-24 23:53:22 UTC (rev 11293)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/control	2010-01-25 06:46:29 UTC (rev 11294)
@@ -3,7 +3,7 @@
 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)
+Build-Depends: debhelper (>= 7.2.11), quilt (>= 0.46-7)
 Build-Depends-Indep: python-all (>= 2.5.4-2~), python-support (>= 0.6.4)
 Standards-Version: 3.8.3
 Homepage: http://code.google.com/p/ipaddr-py/

Added: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/IPv4IpValidatonError
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/IPv4IpValidatonError	                        (rev 0)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/IPv4IpValidatonError	2010-01-25 06:46:29 UTC (rev 11294)
@@ -0,0 +1,13 @@
+Index: python-ipaddr-2.0.0/ipaddr.py
+===================================================================
+--- python-ipaddr-2.0.0.orig/ipaddr.py	2010-01-25 01:13:01.000000000 -0500
++++ python-ipaddr-2.0.0/ipaddr.py	2010-01-25 01:13:28.000000000 -0500
+@@ -1656,7 +1656,7 @@
+             return None
+         try:
+             return IPv4Address(int('%s%s' % (hextets[-2], hextets[-1]), 16))
+-        except IPv4IpvalidationError:
++        except IPv4IpValidationError:
+             return None
+     
+ 

Added: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/Invalid_exception_names
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/Invalid_exception_names	                        (rev 0)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/Invalid_exception_names	2010-01-25 06:46:29 UTC (rev 11294)
@@ -0,0 +1,21 @@
+http://code.google.com/p/ipaddr-py/issues/detail?id=50
+
+Index: python-ipaddr-2.0.0/ipaddr.py
+===================================================================
+--- python-ipaddr-2.0.0.orig/ipaddr.py	2010-01-25 00:47:52.000000000 -0500
++++ python-ipaddr-2.0.0/ipaddr.py	2010-01-25 00:49:03.000000000 -0500
+@@ -137,12 +137,12 @@
+ 
+     try:
+         return IPv4Address(address)
+-    except (IPv4IpValidationError, IPv6NetmaskValidationError):
++    except (IPv4IpValidationError, IPv4NetmaskValidationError):
+         pass
+ 
+     try:
+         return IPv6Address(address)
+-    except (IPv6ValidationError, IPv6NetmaskValidationError):
++    except (IPv6IpValidationError, IPv6NetmaskValidationError):
+         pass
+ 
+     raise ValueError('%r does not appear to be an IPv4 or IPv6 address' %

Added: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network	                        (rev 0)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network	2010-01-25 06:46:29 UTC (rev 11294)
@@ -0,0 +1,15 @@
+http://code.google.com/p/ipaddr-py/issues/detail?id=51
+
+Index: python-ipaddr-2.0.0/ipaddr.py
+===================================================================
+--- python-ipaddr-2.0.0.orig/ipaddr.py	2010-01-25 01:01:38.000000000 -0500
++++ python-ipaddr-2.0.0/ipaddr.py	2010-01-25 01:02:08.000000000 -0500
+@@ -1780,7 +1780,7 @@
+         addr = str(address).split('/')
+ 
+         if len(addr) > 2:
+-            raise IPv6IpValidationError(ipaddr)
++            raise IPv6IpValidationError(address)
+ 
+         if not self._is_valid_ip(addr[0]):
+             raise IPv6IpValidationError(addr[0])

Added: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/series
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/patches/series	2010-01-25 06:46:29 UTC (rev 11294)
@@ -0,0 +1,3 @@
+Invalid_exception_names
+NameError_checking_prefixlen_IPv6Network
+IPv4IpValidatonError

Modified: packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/rules
===================================================================
--- packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/rules	2010-01-24 23:53:22 UTC (rev 11293)
+++ packages/python-ipaddr/trunk/python-ipaddr/trunk/debian/rules	2010-01-25 06:46:29 UTC (rev 11294)
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --with quilt