[Python-apps-commits] r6768 - in packages/cnetworkmanager/trunk/debian (7 files)

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

    Date: Tuesday, March 15, 2011 @ 06:22:58
  Author: cjsmo-guest
Revision: 6768

updated package to use dh_python2, fixed string exceptions closes #585194

Added:
  packages/cnetworkmanager/trunk/debian/patches/
  packages/cnetworkmanager/trunk/debian/patches/01_pbkdf2_str_exception_fix
  packages/cnetworkmanager/trunk/debian/patches/series
Modified:
  packages/cnetworkmanager/trunk/debian/changelog
  packages/cnetworkmanager/trunk/debian/control
  packages/cnetworkmanager/trunk/debian/rules
Deleted:
  packages/cnetworkmanager/trunk/debian/pycompat

Modified: packages/cnetworkmanager/trunk/debian/changelog
===================================================================
--- packages/cnetworkmanager/trunk/debian/changelog	2011-03-14 21:07:35 UTC (rev 6767)
+++ packages/cnetworkmanager/trunk/debian/changelog	2011-03-15 06:22:58 UTC (rev 6768)
@@ -1,8 +1,18 @@
-cnetworkmanager (0.21.1-2) UNRELEASED; urgency=low
+cnetworkmanager (0.21.1-2) unstable; urgency=low
 
-  * Add watch file.
+  [ Charlie Smotherman ]
+  * Added 01_pbkdf2_str_exception_fix.  Closes: #585194
+  * Updated package to use dh_python2.
+  * Removed pycentral from DEB_PYTHON_SYSTEM= in debian/rules.
+  * Removed debian/pycompat.
+  * debian/control
+    - increased cdbs min version to (>=0.4.90~).
+    - removed B-D-I on python-support.
+    - added X-P-V >=2.6.
+    - increased python min version to (>=2.6.6-3~)
+    - bumped standards version to 3.9.1 no changes needed.
 
- -- Jakub Wilk <jwilk at debian.org>  Fri, 17 Sep 2010 12:12:59 +0200
+ -- Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>  Mon, 14 Mar 2011 22:41:52 -0500
 
 cnetworkmanager (0.21.1-1.1) unstable; urgency=low
 

Modified: packages/cnetworkmanager/trunk/debian/control
===================================================================
--- packages/cnetworkmanager/trunk/debian/control	2011-03-14 21:07:35 UTC (rev 6767)
+++ packages/cnetworkmanager/trunk/debian/control	2011-03-15 06:22:58 UTC (rev 6768)
@@ -3,8 +3,9 @@
 Priority: extra
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: W. Martin Borgert <debacle at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), python, python-support, xsltproc, docbook-xsl
-Standards-Version: 3.8.4
+Build-Depends: cdbs (>=0.4.90~), debhelper (>= 7), python (>= 2.6.6-3~), xsltproc, docbook-xsl
+X-Python-Version: >=2.6
+Standards-Version: 3.9.1
 Homepage: http://vidner.net/martin/software/cnetworkmanager/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/cnetworkmanager/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/cnetworkmanager/trunk/

Added: packages/cnetworkmanager/trunk/debian/patches/01_pbkdf2_str_exception_fix
===================================================================
--- packages/cnetworkmanager/trunk/debian/patches/01_pbkdf2_str_exception_fix	                        (rev 0)
+++ packages/cnetworkmanager/trunk/debian/patches/01_pbkdf2_str_exception_fix	2011-03-15 06:22:58 UTC (rev 6768)
@@ -0,0 +1,17 @@
+Description:  Python string exceptions no more allowed in Python 2.6
+Origin:  Debian
+Author: Charlie Smotherman <cjsmo at cableone.net>
+
+Index: cnetworkmanager-0.21.1/networkmanager/applet/pbkdf2.py
+===================================================================
+--- cnetworkmanager-0.21.1.orig/networkmanager/applet/pbkdf2.py	2011-03-14 22:25:14.000000000 -0500
++++ cnetworkmanager-0.21.1/networkmanager/applet/pbkdf2.py	2011-03-14 22:26:02.000000000 -0500
+@@ -50,7 +50,7 @@
+ 
+ def xorstr( a, b ):
+ 	if len(a) != len(b):
+-		raise "xorstr(): lengths differ"
++		raise Exception("xorstr(): lengths differ")
+ 
+ 	ret = ''
+ 	for i in range(len(a)):

Added: packages/cnetworkmanager/trunk/debian/patches/series
===================================================================
--- packages/cnetworkmanager/trunk/debian/patches/series	                        (rev 0)
+++ packages/cnetworkmanager/trunk/debian/patches/series	2011-03-15 06:22:58 UTC (rev 6768)
@@ -0,0 +1 @@
+01_pbkdf2_str_exception_fix

Deleted: packages/cnetworkmanager/trunk/debian/pycompat
===================================================================
--- packages/cnetworkmanager/trunk/debian/pycompat	2011-03-14 21:07:35 UTC (rev 6767)
+++ packages/cnetworkmanager/trunk/debian/pycompat	2011-03-15 06:22:58 UTC (rev 6768)
@@ -1 +0,0 @@
-2

Modified: packages/cnetworkmanager/trunk/debian/rules
===================================================================
--- packages/cnetworkmanager/trunk/debian/rules	2011-03-14 21:07:35 UTC (rev 6767)
+++ packages/cnetworkmanager/trunk/debian/rules	2011-03-15 06:22:58 UTC (rev 6768)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pysupport
+DEB_PYTHON_SYSTEM=
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk