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

[Paul Wise]

Author: pabs
Date: 2012-02-04 07:11:36 +0000 (Sat, 04 Feb 2012)
New Revision: 13207

Modified:
   packages/trunk/snowballz/debian/changelog
   packages/trunk/snowballz/debian/patches/list_nohash.patch
   packages/trunk/snowballz/debian/patches/res_config_check.patch
   packages/trunk/snowballz/debian/patches/typeerror_crash.patch
Log:
Clean up the patches

Modified: packages/trunk/snowballz/debian/changelog
===================================================================
--- packages/trunk/snowballz/debian/changelog	2012-02-04 07:04:07 UTC (rev 13206)
+++ packages/trunk/snowballz/debian/changelog	2012-02-04 07:11:36 UTC (rev 13207)
@@ -16,6 +16,7 @@
   [ Paul Wise ]
   * Switch the homepage to the newish upstream one (LP: 889075)
   * Close the launchpad bug for #585118 in the changelog
+  * Clean up the patches
 
  -- Dean Evans <dean at codemonkies.net>  Sat, 04 Feb 2012 17:12:36 +1300
 

Modified: packages/trunk/snowballz/debian/patches/list_nohash.patch
===================================================================
--- packages/trunk/snowballz/debian/patches/list_nohash.patch	2012-02-04 07:04:07 UTC (rev 13206)
+++ packages/trunk/snowballz/debian/patches/list_nohash.patch	2012-02-04 07:11:36 UTC (rev 13207)
@@ -1,13 +1,12 @@
 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-Debian: http://bugs.debian.org/570742
 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
+--- a/cellulose/celltypes.py
++++ b/cellulose/celltypes.py
 @@ -63,9 +63,11 @@
              for name in names:
                  new = create(name)

Modified: packages/trunk/snowballz/debian/patches/res_config_check.patch
===================================================================
--- packages/trunk/snowballz/debian/patches/res_config_check.patch	2012-02-04 07:04:07 UTC (rev 13206)
+++ packages/trunk/snowballz/debian/patches/res_config_check.patch	2012-02-04 07:11:36 UTC (rev 13207)
@@ -1,12 +1,11 @@
 Subject: Check user configs resolution is within range of available
+Bug-Debian: http://bugs.debian.org/585118
 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/snowballz/+bug/591619
 Author: Niall Creech <niallcreech at googlemail.com>
 Last-Update: 2011-01-07
 
-Index: snowballz-0.9.5.1/settings.py
-===================================================================
---- snowballz-0.9.5.1.orig/settings.py	2010-06-09 09:21:45.000000000 +0100
-+++ snowballz-0.9.5.1/settings.py	2010-06-09 09:23:14.000000000 +0100
+--- a/settings.py
++++ b/settings.py
 @@ -25,6 +25,11 @@
          config.set('display', 'resolution', '0')
          save_config()

Modified: packages/trunk/snowballz/debian/patches/typeerror_crash.patch
===================================================================
--- packages/trunk/snowballz/debian/patches/typeerror_crash.patch	2012-02-04 07:04:07 UTC (rev 13206)
+++ packages/trunk/snowballz/debian/patches/typeerror_crash.patch	2012-02-04 07:11:36 UTC (rev 13207)
@@ -1,11 +1,10 @@
-# Copyright (C) 2008  David Martinez Marti <deavidsedice at gmail.com>
-# Distributed under the same license as the game. See debian/copyright.
-# Fixes: #495011
+Author: David Martinez Marti <deavidsedice at gmail.com>
+Description: Fixes crashes with TypeError
+Bug-Debian: http://bugs.debian.org/495011
+Last-Update: 2008-08-15
 
-Index: snowballz-0.9.5.1/data.py
-===================================================================
---- snowballz-0.9.5.1.orig/data.py	2008-08-15 01:12:17.000000000 +0200
-+++ snowballz-0.9.5.1/data.py	2008-08-15 01:14:32.000000000 +0200
+--- a/data.py
++++ b/data.py
 @@ -287,9 +287,10 @@
  
          self.lifetime = self.life/speed