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

[varun at users.alioth.debian.org]

    Date: Monday, October 18, 2010 @ 03:08:55
  Author: varun
Revision: 14636

* New upstream release
* d/copyright: Remove BSD license references
* d/control: Add cython to Build-Depends
* Drop patches/fix_exceptions.diff -- merged upstream

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

Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog	2010-10-18 02:36:33 UTC (rev 14635)
+++ packages/python-enable/trunk/debian/changelog	2010-10-18 03:08:55 UTC (rev 14636)
@@ -1,3 +1,12 @@
+python-enable (3.3.2-1) experimental; urgency=low
+
+  * New upstream release
+  * d/copyright: Remove BSD license references
+  * d/control: Add cython to Build-Depends
+  * Drop patches/fix_exceptions.diff -- merged upstream
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 17 Oct 2010 23:00:23 -0400
+
 python-enable (3.3.1-3) unstable; urgency=low
 
   * debian/control: Add python-enthoughtbase to Depends (Closes: #599479)

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2010-10-18 02:36:33 UTC (rev 14635)
+++ packages/python-enable/trunk/debian/control	2010-10-18 03:08:55 UTC (rev 14636)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>
 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
+ libfreetype6-dev, libx11-dev, libglu1-mesa-dev, cython
 Standards-Version: 3.9.1
 XS-Python-Version: >=2.4
 Homepage: http://pypi.python.org/pypi/Enable

Modified: packages/python-enable/trunk/debian/copyright
===================================================================
--- packages/python-enable/trunk/debian/copyright	2010-10-18 02:36:33 UTC (rev 14635)
+++ packages/python-enable/trunk/debian/copyright	2010-10-18 03:08:55 UTC (rev 14636)
@@ -376,7 +376,6 @@
 
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL', the
-complete text of the GNU Lesser General Public License can be found in
-`/usr/share/common-licenses/LGPL', and the complete text of the BSD
-License can be found in `/usr/share/common-licenses/BSD'
+Public License can be found in `/usr/share/common-licenses/GPL' and
+the complete text of the GNU Lesser General Public License can be
+found in `/usr/share/common-licenses/LGPL'.

Deleted: packages/python-enable/trunk/debian/patches/fix_exceptions.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/fix_exceptions.diff	2010-10-18 02:36:33 UTC (rev 14635)
+++ packages/python-enable/trunk/debian/patches/fix_exceptions.diff	2010-10-18 03:08:55 UTC (rev 14636)
@@ -1,47 +0,0 @@
-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-10-18 02:36:33 UTC (rev 14635)
+++ packages/python-enable/trunk/debian/patches/series	2010-10-18 03:08:55 UTC (rev 14636)
@@ -1,2 +1 @@
 freetype2.diff
-fix_exceptions.diff