[Python-modules-commits] r11849 - in packages/gamera/trunk/debian (5 files)

Mon Feb 22 13:43:14 UTC 2010

Date: Monday, February 22, 2010 @ 13:43:11
  Author: jwilk
Revision: 11849

Really remove upstream-applied patches from the source package.

Modified:
  packages/gamera/trunk/debian/changelog
Deleted:
  packages/gamera/trunk/debian/patches/callbackset-unpickle.diff
  packages/gamera/trunk/debian/patches/gendoc-source-path.diff
  packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff
  packages/gamera/trunk/debian/patches/gui-help-typo.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================

--- packages/gamera/trunk/debian/changelog	2010-02-22 08:36:11 UTC (rev 11848)
+++ packages/gamera/trunk/debian/changelog	2010-02-22 13:43:11 UTC (rev 11849)
@@ -2,8 +2,9 @@
 
   * Link _png_support.so with libpng on all Unix architectures (closes:
     #570809). (png-support-libpng.diff)
+  * Really remove upstream-applied patches from the source package.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 21 Feb 2010 23:06:50 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Mon, 22 Feb 2010 14:41:56 +0100
 
 gamera (3.2.4-1) unstable; urgency=low
 

Deleted: packages/gamera/trunk/debian/patches/callbackset-unpickle.diff
===================================================================
--- packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	2010-02-22 08:36:11 UTC (rev 11848)
+++ packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	2010-02-22 13:43:11 UTC (rev 11849)
@@ -1,20 +0,0 @@
-Description: Make gamera.util.CallbackSet objects unpicklable.
-Origin: upstream, 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))
- 

Deleted: packages/gamera/trunk/debian/patches/gendoc-source-path.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-source-path.diff	2010-02-22 08:36:11 UTC (rev 11848)
+++ packages/gamera/trunk/debian/patches/gendoc-source-path.diff	2010-02-22 13:43:11 UTC (rev 11849)
@@ -1,19 +0,0 @@
-Description: Work around python-docutils bug, which broke documentation
- generation.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1190
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1912
-Bug-Debian: http://bugs.debian.org/563139
-
-Index: gamera-3.2.3/gamera/gendoc.py
-===================================================================
---- gamera-3.2.3.orig/gamera/gendoc.py	2009-09-15 13:40:27.000000000 +0200
-+++ gamera-3.2.3/gamera/gendoc.py	2009-12-31 10:19:45.000000000 +0100
-@@ -244,7 +244,7 @@
-                             'stylesheet_path': None,
-                             'stylesheet': 'default.css'}
-                try:
--                  publish_file(source=fd, destination_path=output_file, 
-+                  publish_file(source=fd, source_path=filename, destination_path=output_file, 
-                                writer_name="html", settings_overrides=overrides)
-                except TypeError:
-                   publish_file(source=fd, destination_path=output_file)

Deleted: packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff	2010-02-22 08:36:11 UTC (rev 11848)
+++ packages/gamera/trunk/debian/patches/gui-classifier-glyphs-pane.diff	2010-02-22 13:43:11 UTC (rev 11849)
@@ -1,28 +0,0 @@
-Description: Fix display of classifier glyphs when adding glyphs to the
-  classifier.
-Origin: backport, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1182
-Bug: http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1182
-Bug-Debian: http://bugs.debian.org/555203
-
-Index: gamera-3.2.3/gamera/gui/gamera_display.py
-===================================================================
---- gamera-3.2.3.orig/gamera/gui/gamera_display.py	2009-09-15 16:10:49.000000000 +0200
-+++ gamera-3.2.3/gamera/gui/gamera_display.py	2010-01-26 17:07:30.000000000 +0100
-@@ -1190,6 +1190,17 @@
-                added = True
-          if added and resize:
-             self.resize_grid(False)
-+
-+         # The following code will sort on each add.  It can be
-+         # slow, however, with large classifier databases.  This
-+         # could become a user-configurable option someday - MGD
-+         added = False
-+         for g in glyphs:
-+            if not g in self.glyphs:
-+               self.glyphs.add(g)
-+               added = True
-+         if (added or resize) and self.frame.IsShown():
-+            self.sort_images()
-       finally:
-          self.EndBatch()
-          wx.EndBusyCursor()

Deleted: packages/gamera/trunk/debian/patches/gui-help-typo.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gui-help-typo.diff	2010-02-22 08:36:11 UTC (rev 11848)
+++ packages/gamera/trunk/debian/patches/gui-help-typo.diff	2010-02-22 13:43:11 UTC (rev 11849)
@@ -1,17 +0,0 @@
-Description: Fix a typo in the gamera_gui help text.
-Origin: upstream, http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1189
-Bug: http://tech.groups.yahoo.com/group/gamera-devel/message/1910
-
-Index: gamera-3.2.3/gamera/gui/gui.py
-===================================================================
---- gamera-3.2.3.orig/gamera/gui/gui.py	2010-01-26 12:31:09.000000000 +0100
-+++ gamera-3.2.3/gamera/gui/gui.py	2010-01-26 12:31:12.000000000 +0100
-@@ -68,7 +68,7 @@
-    help="[shell] Run execfile(...) on the given file.  This argument may be given multiple times")
- config.add_option(
-    "-v", "--verbosity-level", type="int", default=1,
--   help="[shell] when non zero, debug messsages on loaded plugins etc. are written to stdout.")
-+   help="[shell] when non zero, debug messages on loaded plugins etc. are written to stdout.")
- 
- 
- main_win = None


