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

[varun at users.alioth.debian.org]

    Date: Wednesday, August 11, 2010 @ 05:50:20
  Author: varun
Revision: 14181

* Add patches/fix_exceptions.diff to fix Python string exceptions
  (Closes: #585289)
* Remove Conflicts on mayavi2, python-enthought-traits - not needed
* Bump Standards-Version to 3.9.1

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

Modified: packages/python-enthoughtbase/trunk/debian/changelog
===================================================================
--- packages/python-enthoughtbase/trunk/debian/changelog	2010-08-11 05:49:07 UTC (rev 14180)
+++ packages/python-enthoughtbase/trunk/debian/changelog	2010-08-11 05:50:20 UTC (rev 14181)
@@ -1,3 +1,12 @@
+python-enthoughtbase (3.0.5-2) unstable; urgency=low
+
+  * Add patches/fix_exceptions.diff to fix Python string exceptions
+    (Closes: #585289)
+  * Remove Conflicts on mayavi2, python-enthought-traits - not needed
+  * Bump Standards-Version to 3.9.1
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 11 Aug 2010 01:49:01 -0400
+
 python-enthoughtbase (3.0.5-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-enthoughtbase/trunk/debian/control
===================================================================
--- packages/python-enthoughtbase/trunk/debian/control	2010-08-11 05:49:07 UTC (rev 14180)
+++ packages/python-enthoughtbase/trunk/debian/control	2010-08-11 05:50:20 UTC (rev 14181)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 7), python-all, python-central (>= 0.6), python-setupdocs
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://pypi.python.org/pypi/EnthoughtBase
 XS-Python-Version: >=2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-enthoughtbase/trunk
@@ -13,7 +13,6 @@
 Package: python-enthoughtbase
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-apptools
-Conflicts: mayavi2 (<< 3.0.0), python-enthought-traits (<< 3.0.0)
 XB-Python-Version: ${python:Versions}
 Description: Core packages for the Enthought Tool Suite
  The EnthoughtBase project includes a few core packages that are used

Added: packages/python-enthoughtbase/trunk/debian/patches/fix_exceptions.diff
===================================================================
--- packages/python-enthoughtbase/trunk/debian/patches/fix_exceptions.diff	                        (rev 0)
+++ packages/python-enthoughtbase/trunk/debian/patches/fix_exceptions.diff	2010-08-11 05:50:20 UTC (rev 14181)
@@ -0,0 +1,24 @@
+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.
+
+Index: python-enthoughtbase-3.0.5/enthought/util/ring_buffer.py
+===================================================================
+--- python-enthoughtbase-3.0.5.orig/enthought/util/ring_buffer.py	2010-02-24 16:13:06.000000000 -0500
++++ python-enthoughtbase-3.0.5/enthought/util/ring_buffer.py	2010-08-11 01:46:24.000000000 -0400
+@@ -33,7 +33,7 @@
+ 
+ class RingBufferFull:
+     def __init__(self,n):
+-        raise "you should use RingBuffer"
++        raise Exception("you should use RingBuffer")
+     def append(self,x):     
+         self.data[self.cur]=x
+         self.cur=(self.cur+1) % self.max
+@@ -50,4 +50,4 @@
+ x.append(6)
+ print x.data,x.get()
+ x.append(7); x.append(8); x.append(9); x.append(10)
+-print x.data,x.get()"""
+\ No newline at end of file
++print x.data,x.get()"""

Added: packages/python-enthoughtbase/trunk/debian/patches/series
===================================================================
--- packages/python-enthoughtbase/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-enthoughtbase/trunk/debian/patches/series	2010-08-11 05:50:20 UTC (rev 14181)
@@ -0,0 +1 @@
+fix_exceptions.diff