[Python-modules-commits] r11331 - in packages/gamera/trunk/debian (2 files)

[jwilk-guest at users.alioth.debian.org]

    Date: Tuesday, January 26, 2010 @ 17:29:08
  Author: jwilk-guest
Revision: 11331

set() doesn't accept None as an argument, while sets.Set() does.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/use-system-python-modules.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-01-26 16:38:26 UTC (rev 11330)
+++ packages/gamera/trunk/debian/changelog	2010-01-26 17:29:08 UTC (rev 11331)
@@ -20,7 +20,7 @@
     - Fix display of classifier glyphs when adding glyphs to the classifier
       (closes: #555203).
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 17:36:14 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 18:28:18 +0100
 
 gamera (3.2.3-1) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 16:38:26 UTC (rev 11330)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 17:29:08 UTC (rev 11331)
@@ -4,7 +4,7 @@
 Index: gamera-3.2.3/gamera/plugin.py
 ===================================================================
 --- gamera-3.2.3.orig/gamera/plugin.py	2009-05-08 11:03:50.000000000 +0200
-+++ gamera-3.2.3/gamera/plugin.py	2010-01-26 12:22:49.000000000 +0100
++++ gamera-3.2.3/gamera/plugin.py	2010-01-26 18:27:00.000000000 +0100
 @@ -23,7 +23,6 @@
  from gamera import paths
  from gamera import util
@@ -28,8 +28,8 @@
        methods = plugin_methods[pixel_type]
 Index: gamera-3.2.3/gamera/util.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/util.py	2010-01-26 12:21:21.000000000 +0100
-+++ gamera-3.2.3/gamera/util.py	2010-01-26 12:22:20.000000000 +0100
+--- gamera-3.2.3.orig/gamera/util.py	2010-01-26 18:26:59.000000000 +0100
++++ gamera-3.2.3/gamera/util.py	2010-01-26 18:27:10.000000000 +0100
 @@ -27,7 +27,7 @@
  from gamera.enums import *
  from gamera.gui import has_gui
@@ -47,7 +47,7 @@
 +class CallbackSet(set, CallbackObject):
     def __init__(self, initset=None):
 -      sets.Set.__init__(self, initset)
-+      set.__init__(self, initset)
++      set.__init__(self, initset or ())
        CallbackObject.__init__(self)
  
     def __del__(self):
@@ -144,8 +144,8 @@
     types.append("All files (*.*)|*.*")
 Index: gamera-3.2.3/gamera/stats.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/stats.py	2010-01-26 12:22:56.000000000 +0100
-+++ gamera-3.2.3/gamera/stats.py	2010-01-26 12:24:04.000000000 +0100
+--- gamera-3.2.3.orig/gamera/stats.py	2009-06-17 09:15:15.000000000 +0200
++++ gamera-3.2.3/gamera/stats.py	2010-01-26 18:27:00.000000000 +0100
 @@ -3063,9 +3063,8 @@
  
  Usage:  dices(x,y)