[Python-modules-commits] r11714 - in packages/gamera/trunk/debian (3 files)

jwilk at users.alioth.debian.org jwilk at users.alioth.debian.org
Sat Feb 13 17:37:59 UTC 2010 

    Date: Saturday, February 13, 2010 @ 17:37:57
  Author: jwilk
Revision: 11714

* New upstream release.
  + Drop gui-classifier-glyphs-pane.diff, gui-help-typo.diff,
    gendoc-source-path.diff, callbackset-unpickle.diff: all applied
    upstream.
  + Refresh use-system-modules.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-02-13 16:29:08 UTC (rev 11713)
+++ packages/gamera/trunk/debian/changelog	2010-02-13 17:37:57 UTC (rev 11714)
@@ -1,3 +1,13 @@
+gamera (3.2.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    + Drop gui-classifier-glyphs-pane.diff, gui-help-typo.diff,
+      gendoc-source-path.diff, callbackset-unpickle.diff: all applied
+      upstream.
+    + Refresh use-system-modules.diff.
+
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 13 Feb 2010 18:20:27 +0100
+
 gamera (3.2.3-2) unstable; urgency=low
 
   * Provide detached symbols in the *-dbg package.

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2010-02-13 16:29:08 UTC (rev 11713)
+++ packages/gamera/trunk/debian/patches/series	2010-02-13 17:37:57 UTC (rev 11714)
@@ -1,10 +1,6 @@
-gui-classifier-glyphs-pane.diff
-gui-help-typo.diff
 gendoc-use-wxversion.diff
 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-02-13 16:29:08 UTC (rev 11713)
+++ packages/gamera/trunk/debian/patches/use-system-python-modules.diff	2010-02-13 17:37:57 UTC (rev 11714)
@@ -1,10 +1,10 @@
 Description: Don't use embedded copies of standard Python modules.
 Author: Jakub Wilk <jwilk at debian.org>
 
-Index: gamera-3.2.3/gamera/plugin.py
+Index: gamera-3.2.4/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 20:21:29.000000000 +0100
+--- gamera-3.2.4.orig/gamera/plugin.py	2009-07-03 17:21:41.000000000 +0200
++++ gamera-3.2.4/gamera/plugin.py	2010-02-13 18:25:56.000000000 +0100
 @@ -23,7 +23,6 @@
  from gamera import paths
  from gamera import util
@@ -26,10 +26,10 @@
        return list(methods)
     elif plugin_methods.has_key(pixel_type):
        methods = plugin_methods[pixel_type]
-Index: gamera-3.2.3/gamera/util.py
+Index: gamera-3.2.4/gamera/util.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/util.py	2010-01-26 20:21:29.000000000 +0100
-+++ gamera-3.2.3/gamera/util.py	2010-01-26 20:21:29.000000000 +0100
+--- gamera-3.2.4.orig/gamera/util.py	2009-11-13 20:54:24.000000000 +0100
++++ gamera-3.2.4/gamera/util.py	2010-02-13 18:27:31.000000000 +0100
 @@ -27,7 +27,7 @@
  from gamera.enums import *
  from gamera.gui import has_gui
@@ -82,7 +82,7 @@
 +      result = set.pop(self)
        self.trigger_callback('remove', [result])
        self.trigger_callback('length_change', len(self))
-    
+ 
     def clear(self):
        self.trigger_callback('remove', self)
 -      sets.Set.clear(self)
@@ -108,6 +108,24 @@
        self.trigger_callback('length_change', len(self))
  
     def symmetric_difference_update(self, iterable):
+@@ -545,7 +545,7 @@
+                yield i
+       self.trigger_callback('remove', remove_iter())
+       self.trigger_callback('add', add_iter())
+-      self.Set.symmetric_difference_update(self, iterable)
++      set.symmetric_difference_update(self, iterable)
+       self.trigger_callback('length_change', len(self))
+ 
+    def intersection_update(self, iterable):
+@@ -554,7 +554,7 @@
+             if not i in iterable:
+                yield i
+       self.trigger_callback('remove', iter())
+-      self.Set.intersection_update(self, iterable)
++      set.intersection_update(self, iterable)
+       self.trigger_callback('length_change', len(self))
+ 
+    def union_update(self, other):
 @@ -565,20 +565,19 @@
     def __setstate__(self, data):
        CallbackObject.__init__(self)
@@ -142,10 +160,10 @@
     all_extensions = ";".join(["*.%s" % x for x in extensions])
     types.insert(0, "All images (%s)|%s" % (all_extensions, all_extensions))
     types.append("All files (*.*)|*.*")
-Index: gamera-3.2.3/gamera/stats.py
+Index: gamera-3.2.4/gamera/stats.py
 ===================================================================
---- 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 20:21:29.000000000 +0100
+--- gamera-3.2.4.orig/gamera/stats.py	2009-07-03 17:21:42.000000000 +0200
++++ gamera-3.2.4/gamera/stats.py	2010-02-13 18:25:56.000000000 +0100
 @@ -3063,9 +3063,8 @@
  
  Usage:  dices(x,y)
@@ -158,10 +176,10 @@
      common = len(x.intersection(y))
      total = float(len(x) + len(y))
      return 2*common/total
-Index: gamera-3.2.3/gamera/classify.py
+Index: gamera-3.2.4/gamera/classify.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/classify.py	2010-01-26 20:21:37.000000000 +0100
-+++ gamera-3.2.3/gamera/classify.py	2010-01-26 20:21:43.000000000 +0100
+--- gamera-3.2.4.orig/gamera/classify.py	2009-10-01 17:36:12.000000000 +0200
++++ gamera-3.2.4/gamera/classify.py	2010-02-13 18:25:56.000000000 +0100
 @@ -733,7 +733,7 @@
           return added, removed
  
@@ -171,10 +189,10 @@
        for glyph in glyphs:
           for child in glyph.children_images:
              removed.add(child)
-Index: gamera-3.2.3/gamera/gui/classifier_display.py
+Index: gamera-3.2.4/gamera/gui/classifier_display.py
 ===================================================================
---- gamera-3.2.3.orig/gamera/gui/classifier_display.py	2010-01-26 20:21:50.000000000 +0100
-+++ gamera-3.2.3/gamera/gui/classifier_display.py	2010-01-26 20:22:09.000000000 +0100
+--- gamera-3.2.4.orig/gamera/gui/classifier_display.py	2009-11-13 20:54:24.000000000 +0100
++++ gamera-3.2.4/gamera/gui/classifier_display.py	2010-02-13 18:25:56.000000000 +0100
 @@ -318,7 +318,7 @@
                      (-1,0), (0,-1), (1,0), (0,1),   # +
                      (-1,-1), (-1,1), (1,-1), (1,1)) # x
@@ -193,7 +211,7 @@
           for i in self.GetSelectedIndices():
              selected.add(i)
           new_matches = matches.symmetric_difference(selected)
-@@ -988,7 +988,7 @@
+@@ -989,7 +989,7 @@
        if directory == None:
           gui_util.message("You must provide a directory to load.")
           return
@@ -202,7 +220,7 @@
        if settings:
           try:
              self._SaveClassifierSettings(
-@@ -1087,7 +1087,7 @@
+@@ -1088,7 +1088,7 @@
  
        self._save_by_criteria_dialog = results

More information about the Python-modules-commits mailing list