[Python-modules-commits] r14179 - in packages/python-enable/trunk/debian (4 files)

[varun at users.alioth.debian.org]

    Date: Wednesday, August 11, 2010 @ 05:48:52
  Author: varun
Revision: 14179

* Add patches/fix_exceptions.diff to fix Python string exceptions
  (Closes: #585288)
* Remove conflicts on python-enthought-chaco2 - no longer needed
* Bump Standards-Version to 3.9.1

Added:
  packages/python-enable/trunk/debian/patches/fix_exceptions.diff
Modified:
  packages/python-enable/trunk/debian/changelog
  packages/python-enable/trunk/debian/control
  packages/python-enable/trunk/debian/patches/series

Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog	2010-08-10 15:08:52 UTC (rev 14178)
+++ packages/python-enable/trunk/debian/changelog	2010-08-11 05:48:52 UTC (rev 14179)
@@ -1,3 +1,12 @@
+python-enable (3.3.1-2) unstable; urgency=low
+
+  * Add patches/fix_exceptions.diff to fix Python string exceptions
+    (Closes: #585288)
+  * Remove conflicts on python-enthought-chaco2 - no longer needed
+  * Bump Standards-Version to 3.9.1
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 11 Aug 2010 01:33:31 -0400
+
 python-enable (3.3.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2010-08-10 15:08:52 UTC (rev 14178)
+++ packages/python-enable/trunk/debian/control	2010-08-11 05:48:52 UTC (rev 14179)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs, debhelper(>= 7), python-all-dev, python-central,
  python-setuptools, python-setupdocs, python-numpy, python-pyrex, swig,
  libfreetype6-dev, libx11-dev, libglu1-mesa-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 XS-Python-Version: >=2.4
 Homepage: http://pypi.python.org/pypi/Enable
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-enable/trunk
@@ -17,7 +17,6 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python-numpy, python-traitsgui, python-wxgtk2.8,
  python-pkg-resources
-Conflicts: python-enthought-chaco2 (<< 3.0.0)
 XB-Python-Version: ${python:Versions}
 Description: Drawing and interaction packages
  The Enable project provides two related multi-platform packages for

Added: packages/python-enable/trunk/debian/patches/fix_exceptions.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/fix_exceptions.diff	                        (rev 0)
+++ packages/python-enable/trunk/debian/patches/fix_exceptions.diff	2010-08-11 05:48:52 UTC (rev 14179)
@@ -0,0 +1,47 @@
+Author: Varun Hiremath <varun at debian.org>  
+Date: Wed, 11 Aug 2010 01:32:41 -0400
+Description: Fix Python String exceptions. Patch imported from upstream trunk.
+
+diff -urN python-enable-3.3.1.orig/enthought/enable/component.py python-enable-3.3.1/enthought/enable/component.py
+--- python-enable-3.3.1.orig/enthought/enable/component.py	2010-08-11 01:17:59.000000000 -0400
++++ python-enable-3.3.1/enthought/enable/component.py	2010-08-11 01:21:37.000000000 -0400
+@@ -1153,7 +1153,8 @@
+         else:
+             # assume padding is some sort of array type
+             if len(val) != 4:
+-                raise RuntimeError, "Padding must be a 4-element sequence type or an int.  Instead, got" + str(val)
++                raise RuntimeError("Padding must be a 4-element sequence "
++                                   "type or an int.  Instead, got" + str(val))
+             self.padding_left = val[0]
+             self.padding_right = val[1]
+             self.padding_top = val[2]
+diff -urN python-enable-3.3.1.orig/enthought/kiva/pdfmetrics.py python-enable-3.3.1/enthought/kiva/pdfmetrics.py
+--- python-enable-3.3.1.orig/enthought/kiva/pdfmetrics.py	2010-08-11 01:17:59.000000000 -0400
++++ python-enable-3.3.1/enthought/kiva/pdfmetrics.py	2010-08-11 01:18:44.000000000 -0400
+@@ -290,7 +290,7 @@
+ 
+     def makePDFObject(self):
+         # XXX Kiva specific change
+-        raise "Not Implemented"
++        raise NotImplementedError
+ 
+ #for encName in standardEncodings:
+ #    registerEncoding(Encoding(encName))
+@@ -354,7 +354,7 @@
+ 
+     def addObjects(self, doc):
+         # XXX Kiva specific change
+-        raise "Not Implemented"
++        raise NotImplementedError
+ 
+ PFB_MARKER=chr(0x80)
+ PFB_ASCII=chr(1)
+@@ -446,7 +446,7 @@
+ 
+     def addObjects(self, doc):
+         # XXX Kiva specific changes
+-        raise "Not Implemented"
++        raise NotImplementedError
+ 
+ def registerTypeFace(face):
+     assert isinstance(face, TypeFace), 'Not a TypeFace: %s' % face

Modified: packages/python-enable/trunk/debian/patches/series
===================================================================
--- packages/python-enable/trunk/debian/patches/series	2010-08-10 15:08:52 UTC (rev 14178)
+++ packages/python-enable/trunk/debian/patches/series	2010-08-11 05:48:52 UTC (rev 14179)
@@ -1 +1,2 @@
 freetype2.diff
+fix_exceptions.diff