[Python-modules-commits] r13921 - in packages/pyfiglet/trunk/debian (5 files)

Mon Jul 12 20:17:33 UTC 2010

Date: Monday, July 12, 2010 @ 20:17:21
  Author: stefanor-guest
Revision: 13921

* Convert to dh_python2.
* Bump Standards-Version to 3.9.0, no changes needed.
* get-orig-source: Don't leak uid and umask into source tarball and set -e.
* Correctly subclass str, to fix a deprecation warning under Python 2.6
  (Closes: #588855)

Added:
  packages/pyfiglet/trunk/debian/patches/py26deprecation.diff
Modified:
  packages/pyfiglet/trunk/debian/changelog
  packages/pyfiglet/trunk/debian/control
  packages/pyfiglet/trunk/debian/patches/series
  packages/pyfiglet/trunk/debian/rules

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

--- packages/pyfiglet/trunk/debian/changelog	2010-07-12 19:02:52 UTC (rev 13920)
+++ packages/pyfiglet/trunk/debian/changelog	2010-07-12 20:17:21 UTC (rev 13921)
@@ -1,9 +1,13 @@
 pyfiglet (0.4+dfsg-2) UNRELEASED; urgency=low
 
+  * Convert to dh_python2.
   * Move manpage installation from override rule to debian/manpages file.
-  * Don't leak uid and umask into source tarball and set -e.
+  * Bump Standards-Version to 3.9.0, no changes needed.
+  * get-orig-source: Don't leak uid and umask into source tarball and set -e.
+  * Correctly subclass str, to fix a deprecation warning under Python 2.6
+    (Closes: #588855)
 
- -- Stefano Rivera <stefano at rivera.za.net>  Fri, 12 Mar 2010 20:11:34 +0200
+ -- Stefano Rivera <stefano at rivera.za.net>  Mon, 12 Jul 2010 21:57:41 +0200
 
 pyfiglet (0.4+dfsg-1) unstable; urgency=low
 

Modified: packages/pyfiglet/trunk/debian/control
===================================================================
--- packages/pyfiglet/trunk/debian/control	2010-07-12 19:02:52 UTC (rev 13920)
+++ packages/pyfiglet/trunk/debian/control	2010-07-12 20:17:21 UTC (rev 13921)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Stefano Rivera <stefano at rivera.za.net>
-Build-Depends: debhelper (>= 7.0.50~), python-support
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.5-1)
 XS-Python-Version: all
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Homepage: http://sourceforge.net/projects/pyfiglet/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/pyfiglet/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/pyfiglet/trunk/
@@ -13,6 +13,7 @@
 Package: python-pyfiglet
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
+Breaks: ${python:Breaks}
 Recommends: toilet-fonts
 Suggests: figlet
 Description: Python port of the FIGlet specification

Added: packages/pyfiglet/trunk/debian/patches/py26deprecation.diff
===================================================================
--- packages/pyfiglet/trunk/debian/patches/py26deprecation.diff	                        (rev 0)
+++ packages/pyfiglet/trunk/debian/patches/py26deprecation.diff	2010-07-12 20:17:21 UTC (rev 13921)
@@ -0,0 +1,29 @@
+Description: Correctly subclass str, rather than passing parameters to
+ str.__init__() which triggers a deprecation warning in Python 2.6.
+Author: Stefano Rivera <stefano at rivera.za.net>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/pyfiglet/+bug/603496
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3028609&group_id=200820&atid=975076
+Last-Update: 2010-06-12
+--- a/pyfiglet.py
++++ b/pyfiglet.py
+@@ -189,8 +189,8 @@
+ Rendered figlet font
+ """
+ class FigletString(str):
+-	def __init__(self, *args, **kwargs):
+-		str.__init__(self, *args, **kwargs)
++	def __init__(self, string=''):
++		self.string = string
+ 
+ 		# translation map for reversing ascii art / -> \, etc.
+ 		self.__reverse_map__ = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\')(*+,-.\\0123456789:;>=<?@ABCDEFGHIJKLMNOPQRSTUVWXYZ]/[^_`abcdefghijklmnopqrstuvwxyz}|{~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff'
+@@ -198,6 +198,9 @@
+ 		# translation map for flipping ascii art ^ -> v, etc.
+ 		self.__flip_map__ = '\x00\x01\x02\x03\x04\x05\x06\x07\x08\t\n\x0b\x0c\r\x0e\x0f\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1a\x1b\x1c\x1d\x1e\x1f !"#$%&\'()*+,-.\\0123456789:;<=>?@VBCDEFGHIJKLWNObQbSTUAMXYZ[/]v-`aPcdefghijklwnopqrstu^mxyz{|}~\x7f\x80\x81\x82\x83\x84\x85\x86\x87\x88\x89\x8a\x8b\x8c\x8d\x8e\x8f\x90\x91\x92\x93\x94\x95\x96\x97\x98\x99\x9a\x9b\x9c\x9d\x9e\x9f\xa0\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9\xaa\xab\xac\xad\xae\xaf\xb0\xb1\xb2\xb3\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc\xbd\xbe\xbf\xc0\xc1\xc2\xc3\xc4\xc5\xc6\xc7\xc8\xc9\xca\xcb\xcc\xcd\xce\xcf\xd0\xd1\xd2\xd3\xd4\xd5\xd6\xd7\xd8\xd9\xda\xdb\xdc\xdd\xde\xdf\xe0\xe1\xe2\xe3\xe4\xe5\xe6\xe7\xe8\xe9\xea\xeb\xec\xed\xee\xef\xf0\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8\xf9\xfa\xfb\xfc\xfd\xfe\xff'
+ 
++	def __str__(self):
++		return self.string
++
+ 	def reverse(self):
+ 		out = []
+ 		for row in self.splitlines():

Modified: packages/pyfiglet/trunk/debian/patches/series
===================================================================
--- packages/pyfiglet/trunk/debian/patches/series	2010-07-12 19:02:52 UTC (rev 13920)
+++ packages/pyfiglet/trunk/debian/patches/series	2010-07-12 20:17:21 UTC (rev 13921)
@@ -2,3 +2,4 @@
 tlf-support.diff
 debian-defaults.diff
 setup.py.diff
+py26deprecation.diff

Modified: packages/pyfiglet/trunk/debian/rules
===================================================================
--- packages/pyfiglet/trunk/debian/rules	2010-07-12 19:02:52 UTC (rev 13920)
+++ packages/pyfiglet/trunk/debian/rules	2010-07-12 20:17:21 UTC (rev 13921)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with python2 $@
 
 get-orig-source:
 	set -e; \


