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

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

    Date: Friday, February 19, 2010 @ 19:11:32
  Author: kitterma-guest
Revision: 11813

Prep for update to 2.1.0.

Modified:
  packages/python-ipaddr/trunk/debian/changelog
  packages/python-ipaddr/trunk/debian/control
  packages/python-ipaddr/trunk/debian/patches/IPv4IpValidationError
  packages/python-ipaddr/trunk/debian/patches/series
Deleted:
  packages/python-ipaddr/trunk/debian/patches/Invalid_exception_names
  packages/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network

Modified: packages/python-ipaddr/trunk/debian/changelog
===================================================================
--- packages/python-ipaddr/trunk/debian/changelog	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/changelog	2010-02-19 19:11:32 UTC (rev 11813)
@@ -1,3 +1,13 @@
+python-ipaddr (2.1.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Drop debian/patches/Invalid_exception_names and
+      NameError_checking_prefixlen_IPv6Network (incorporated upstream)
+    - Update debian/patches/IPv4IpValidationError for new exception names
+  * Bump standards version to 3.8.4 without further change
+
+ -- Scott Kitterman <scott at kitterman.com>  Fri, 19 Feb 2010 13:32:39 -0500
+
 python-ipaddr (2.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #566724)

Modified: packages/python-ipaddr/trunk/debian/control
===================================================================
--- packages/python-ipaddr/trunk/debian/control	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/control	2010-02-19 19:11:32 UTC (rev 11813)
@@ -5,7 +5,7 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 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
+Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/ipaddr-py/
 XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-ipaddr/trunk/

Modified: packages/python-ipaddr/trunk/debian/patches/IPv4IpValidationError
===================================================================
--- packages/python-ipaddr/trunk/debian/patches/IPv4IpValidationError	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/patches/IPv4IpValidationError	2010-02-19 19:11:32 UTC (rev 11813)
@@ -1,15 +1,15 @@
 Reported upstream as http://code.google.com/p/ipaddr-py/issues/detail?id=55
 
-Index: python-ipaddr-2.0.0/ipaddr.py
+Index: ipaddr-2.1.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 @@
+--- ipaddr-2.1.0.orig/ipaddr.py	2010-02-13 22:00:07.000000000 -0500
++++ ipaddr-2.1.0/ipaddr.py	2010-02-19 13:55:04.000000000 -0500
+@@ -1685,7 +1685,7 @@
              return None
          try:
              return IPv4Address(int('%s%s' % (hextets[-2], hextets[-1]), 16))
 -        except IPv4IpvalidationError:
-+        except IPv4IpValidationError:
++        except AddressValueError:
              return None
-     
  
+ 

Deleted: packages/python-ipaddr/trunk/debian/patches/Invalid_exception_names
===================================================================
--- packages/python-ipaddr/trunk/debian/patches/Invalid_exception_names	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/patches/Invalid_exception_names	2010-02-19 19:11:32 UTC (rev 11813)
@@ -1,21 +0,0 @@
-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' %

Deleted: packages/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network
===================================================================
--- packages/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/patches/NameError_checking_prefixlen_IPv6Network	2010-02-19 19:11:32 UTC (rev 11813)
@@ -1,15 +0,0 @@
-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])

Modified: packages/python-ipaddr/trunk/debian/patches/series
===================================================================
--- packages/python-ipaddr/trunk/debian/patches/series	2010-02-19 18:47:57 UTC (rev 11812)
+++ packages/python-ipaddr/trunk/debian/patches/series	2010-02-19 19:11:32 UTC (rev 11813)
@@ -1,3 +1 @@
-Invalid_exception_names
-NameError_checking_prefixlen_IPv6Network
 IPv4IpValidationError