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

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

    Date: Tuesday, January 26, 2010 @ 16:38:26
  Author: jwilk-guest
Revision: 11330

Minor tweaks in the changelog and in patch descriptions.

Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/callbackset-unpickle.diff
  packages/gamera/trunk/debian/patches/gendoc-draw-text.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2010-01-26 16:16:12 UTC (rev 11329)
+++ packages/gamera/trunk/debian/changelog	2010-01-26 16:38:26 UTC (rev 11330)
@@ -1,26 +1,26 @@
-gamera (3.2.3-3) UNRELEASED; urgency=low
+gamera (3.2.3-2) UNRELEASED; urgency=low
 
   * Provide detached symbols in the *-dbg package.
   * Switch to source format 3.0 (quilt).
-  * Refresh the fix-paths.diff patch.
   * Make python-gamera-dev “Architecture: all”.
   * Add stricter internel dependencies between python-gamera and
     python-gamera-dev/gamera-gui.
   * Update debian/copyright in accordance to the latest DEP-5 version.
   * Use “XSPV: >= 2.4”, as recent Python Policy frowns on “XSPV: all”.
   * Move the gamera.gui.has_gui module to the python-gamera package.
-  * Work around python-docutils bug, which broke documentation generation
-    (closes: #563139). (gendoc-source-path.diff)
   * Add Debian menu entry.
   * Add freedesktop.org desktop entry.
-  * Make gamera.util.CallbackSet objects unpicklable (closes: #555089).
-  * The sets module is deprecated in Python 2.6. Use set objects, rather than
-    sets.Set objects (updated use-system-modules.diff).
-  * Fix a typo in the gamera_gui help text (gui-help-typo.diff).
-  * Fix display of classifier glyphs when adding glyphs to the classifier
-    (closes: #555203).
+  * Cherry-pick fixes from the upstream VCS:
+    - Work around python-docutils bug, which broke documentation generation
+      (closes: #563139). (gendoc-source-path.diff)
+    - Make gamera.util.CallbackSet objects unpicklable (closes: #555089).
+    - The sets module is deprecated in Python 2.6. Use set objects, rather than
+      sets.Set objects (updated use-system-modules.diff).
+    - Fix a typo in the gamera_gui help text (gui-help-typo.diff).
+    - 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:15:09 +0100
+ -- Jakub Wilk <ubanus at users.sf.net>  Tue, 26 Jan 2010 17:36:14 +0100
 
 gamera (3.2.3-1) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/patches/callbackset-unpickle.diff
===================================================================
--- packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	2010-01-26 16:16:12 UTC (rev 11329)
+++ packages/gamera/trunk/debian/patches/callbackset-unpickle.diff	2010-01-26 16:38:26 UTC (rev 11330)
@@ -1,5 +1,5 @@
 Description: Make gamera.util.CallbackSet objects unpicklable.
-Origin: http://gamera.svn.sourceforge.net/viewvc/gamera?view=rev&revision=1177
+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
 

Modified: packages/gamera/trunk/debian/patches/gendoc-draw-text.diff
===================================================================
--- packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	2010-01-26 16:16:12 UTC (rev 11329)
+++ packages/gamera/trunk/debian/patches/gendoc-draw-text.diff	2010-01-26 16:38:26 UTC (rev 11330)
@@ -1,4 +1,5 @@
-Description: Use a prebuilt image for the draw_text plugin documentation example if X server is not available.
+Description: Use a prebuilt image for the draw_text plugin documentation
+ example if X server is not available.
 Author: Jakub Wilk <ubanus at users.sf.net>
 
 Index: gamera-3.2.2/doc/gendoc.py