[Python-modules-commits] r11326 - in packages/gamera/trunk/debian (4 files)

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

    Date: Tuesday, January 26, 2010 @ 11:20:56
  Author: jwilk-guest
Revision: 11326

Make gamera.util.CallbackSet objects unpicklable (closes: #555089).

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

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-01-26 11:08:57 UTC (rev 11325)
+++ packages/gamera/trunk/debian/changelog	2010-01-26 11:20:56 UTC (rev 11326)
@@ -13,8 +13,9 @@
     (closes: #563139). (gendoc-source-path.diff)
   * Add Debian menu entry.
   * Add freedesktop.org desktop entry.
+  * Make gamera.util.CallbackSet objects unpicklable (closes: #555089).
 
- -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 10:44:19 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 12:17:11 +0100
 
 gamera (3.2.3-1) unstable; urgency=low
 

Added: packages/gamera/trunk/debian/patches/callbackset-unpickle.diff
===================================================================
--- packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	2010-01-26 11:20:56 UTC (rev 11326)
@@ -0,0 +1,20 @@
+Description: Make gamera.util.CallbackSet objects unpicklable.
+Origin: http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1177
+Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1878
+Bug-Debian: http://bugs.debian.org/555089
+
+Index: gamera-3.2.3/gamera/util.py
+===================================================================
+--- gamera-3.2.3.orig/gamera/util.py	2010-01-26 12:12:50.000000000 +0100
++++ gamera-3.2.3/gamera/util.py	2010-01-26 12:13:54.000000000 +0100
+@@ -563,8 +563,9 @@
+    extend = update
+ 
+    def __setstate__(self, data):
++      CallbackObject.__init__(self)
+       self.trigger_callback('remove', self)
+-      sets.Set(self, data)
++      sets.Set.__setstate__(self, data)
+       self.trigger_callback('add', self)
+       self.trigger_callback('length_change', len(self))
+ 

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2010-01-26 11:08:57 UTC (rev 11325)
+++ packages/gamera/trunk/debian/patches/series	2010-01-26 11:20:56 UTC (rev 11326)
@@ -2,6 +2,7 @@
 gendoc-draw-text.diff
 gendoc-source-path.diff
 fix-paths.diff
+callbackset-unpickle.diff
 use-system-galib.diff
 use-system-vigra.diff
 use-system-python-modules.diff

Modified: packages/gamera/trunk/debian/patches/use-system-python-modules.diff
===================================================================
--- packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 11:08:57 UTC (rev 11325)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-01-26 11:20:56 UTC (rev 11326)
@@ -1,10 +1,10 @@
 Description: Don't use embedded copies of standard Python modules.
 Author: Jakub Wilk <ubanus at users.sf.net>
 
-Index: gamera-3.2.0+svn1154/gamera/plugin.py
+Index: gamera-3.2.3/gamera/plugin.py
 ===================================================================
---- gamera-3.2.0+svn1154.orig/gamera/plugin.py	2009-09-04 19:26:37.000000000 +0200
-+++ gamera-3.2.0+svn1154/gamera/plugin.py	2009-09-04 19:27:03.000000000 +0200
+--- gamera-3.2.3.orig/gamera/plugin.py	2010-01-26 12:11:44.000000000 +0100
++++ gamera-3.2.3/gamera/plugin.py	2010-01-26 12:14:05.000000000 +0100
 @@ -23,7 +23,7 @@
  from gamera import paths
  from gamera import util
@@ -14,10 +14,10 @@
  from types import *
  from enums import *
  
-Index: gamera-3.2.0+svn1154/gamera/util.py
+Index: gamera-3.2.3/gamera/util.py
 ===================================================================
---- gamera-3.2.0+svn1154.orig/gamera/util.py	2009-09-04 19:26:37.000000000 +0200
-+++ gamera-3.2.0+svn1154/gamera/util.py	2009-09-04 19:27:03.000000000 +0200
+--- gamera-3.2.3.orig/gamera/util.py	2010-01-26 12:13:54.000000000 +0100
++++ gamera-3.2.3/gamera/util.py	2010-01-26 12:14:05.000000000 +0100
 @@ -27,7 +27,8 @@
  from gamera.enums import *
  from gamera.gui import has_gui
@@ -28,7 +28,7 @@
  
  config.add_option(
     "-p", "--progress-bar", action="store_true",
-@@ -571,7 +572,6 @@
+@@ -572,7 +573,6 @@
  def get_file_extensions(mode):
     from gamera import plugin
     import os.path