r11623 - in packages/trunk/snowballz/debian: . patches

[Peter Pentchev]

Author: roam-guest
Date: 2011-01-07 09:10:36 +0000 (Fri, 07 Jan 2011)
New Revision: 11623

Added:
   packages/trunk/snowballz/debian/patches/list_nohash.patch
Modified:
   packages/trunk/snowballz/debian/changelog
   packages/trunk/snowballz/debian/patches/series
Log:
Acknowledge Sandro Tosi's NMU of 0.9.5.1-2.1; thanks!


Modified: packages/trunk/snowballz/debian/changelog
===================================================================
--- packages/trunk/snowballz/debian/changelog	2011-01-07 09:01:50 UTC (rev 11622)
+++ packages/trunk/snowballz/debian/changelog	2011-01-07 09:10:36 UTC (rev 11623)
@@ -15,9 +15,21 @@
   * Bump Standards-Version to 3.9.1 with no changes.
   * Point the Homepage to the SourceForge snowballz project page.
     Closes: #608361
+  * Acknowledge Sandro Tosi's NMU of 0.9.5.1-2.1; thanks!
 
  -- Peter Pentchev <roam at ringlet.net>  Fri, 07 Jan 2011 10:11:22 +0200
 
+snowballz (0.9.5.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/patches/list_nohash.patch
+    - catch a case where the cellulose celltype tries to get variables from
+      None types; thanks to SevenMachines for the report and patch;
+      Closes: #570742
+    - don't mix tabs with spaces; thanks to Jakub Wilk for alerting on IRC
+
+ -- Sandro Tosi <morph at debian.org>  Wed, 26 May 2010 09:29:26 +0200
+
 snowballz (0.9.5.1-2) unstable; urgency=low
 
   [ Barry deFreese ]

Added: packages/trunk/snowballz/debian/patches/list_nohash.patch
===================================================================
--- packages/trunk/snowballz/debian/patches/list_nohash.patch	                        (rev 0)
+++ packages/trunk/snowballz/debian/patches/list_nohash.patch	2011-01-07 09:10:36 UTC (rev 11623)
@@ -0,0 +1,25 @@
+Subject: Catch a case where the cellulose celltype tries to get variables
+  from None types. e.g containers that set __hash__= None to disable hashing
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/snowballz/+bug/234598 
+Author: Niall Creech <niallcreech at googlemail.com>
+Last-Update: 2010-02-20
+
+Index: snowballz-0.9.5.1/cellulose/celltypes.py
+===================================================================
+--- snowballz-0.9.5.1.orig/cellulose/celltypes.py	2010-02-20 15:37:53.123592334 +0000
++++ snowballz-0.9.5.1/cellulose/celltypes.py	2010-02-20 15:40:11.280466287 +0000
+@@ -63,9 +63,11 @@
+             for name in names:
+                 new = create(name)
+                 old = getattr(cls, name)
+-                try: new.__name__ = old.__name__
+-                except TypeError: pass  # __name__ is readonly in python2.3
+-                new.__doc__ = old.__doc__
++                # Handle the None case, __hash__ now returns this in some cases
++                if old != None:
++                    try: new.__name__ = old.__name__
++                    except TypeError: pass  # __name__ is readonly in python2.3
++                    new.__doc__ = old.__doc__
+                 setattr(cls, name, new)
+
+

Modified: packages/trunk/snowballz/debian/patches/series
===================================================================
--- packages/trunk/snowballz/debian/patches/series	2011-01-07 09:01:50 UTC (rev 11622)
+++ packages/trunk/snowballz/debian/patches/series	2011-01-07 09:10:36 UTC (rev 11623)
@@ -1 +1,2 @@
 typeerror_crash.patch
+list_nohash.patch