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

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

    Date: Tuesday, August 12, 2014 @ 10:53:50
  Author: danstender-guest
Revision: 30139

corrected patch description

Added:
  packages/gamera/trunk/debian/patches/fix-gamera_display.diff
    (from rev 30138, packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff)
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series
Deleted:
  packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2014-08-12 10:32:29 UTC (rev 30138)
+++ packages/gamera/trunk/debian/changelog	2014-08-12 10:53:50 UTC (rev 30139)
@@ -3,12 +3,12 @@
   * d/rules: disabled tests on powerpc (Closes: #757168).
   * bumped python-wxgtk dependencies to 3.0 (Closes: #757208):
     + updated gendoc-use-wxversion.diff and gendoc-draw-text.diff.
-    + added fix-wx-deprecation-check.diff.
+    + added fix-gamera_display.diff.
   * bumped debhelper level to 9:
    + changed d/compat, updated version in d/control.
    + removed d/dh_buildid (obsolete).
 
- -- Daniel Stender <debian at danielstender.com>  Tue, 12 Aug 2014 12:17:40 +0200
+ -- Daniel Stender <debian at danielstender.com>  Tue, 12 Aug 2014 12:37:57 +0200
 
 gamera (3.4.1-1) unstable; urgency=medium
 

Copied: packages/gamera/trunk/debian/patches/fix-gamera_display.diff (from rev 30138, packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff)
===================================================================
--- packages/gamera/trunk/debian/patches/fix-gamera_display.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/fix-gamera_display.diff	2014-08-12 10:53:50 UTC (rev 30139)
@@ -0,0 +1,15 @@
+Description: wx.InitAllImageHandlers call doesn't recognize wx 3.0
+Author: Daniel Stender <debian at danielstender.com>
+Forwarded: no
+Last-Update: 2014-08-12
+--- a/gamera/gui/gamera_display.py
++++ b/gamera/gui/gamera_display.py
+@@ -39,7 +39,7 @@ import gamera.plugins.gui_support  # Gam
+ ##############################################################################
+ 
+ # we want this done on import
+-if int(wx.__version__.split('.')[1]) < 9:
++if (int(wx.__version__.split('.')[0]) == 2) and (int(wx.__version__.split('.')[1]) < 9):
+     wx.InitAllImageHandlers() # deprecated since wxPython 2.9
+ 
+ def _sort_by_nrows(a, b):

Deleted: packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff	2014-08-12 10:32:29 UTC (rev 30138)
+++ packages/gamera/trunk/debian/patches/fix-wx-deprecation-check.diff	2014-08-12 10:53:50 UTC (rev 30139)
@@ -1,15 +0,0 @@
-Description: wx deprecation check doesn't recognize 3.0
-Author: Daniel Stender <debian at danielstender.com>
-Forwarded: no
-Last-Update: 2014-08-12
---- a/gamera/gui/gamera_display.py
-+++ b/gamera/gui/gamera_display.py
-@@ -39,7 +39,7 @@ import gamera.plugins.gui_support  # Gam
- ##############################################################################
- 
- # we want this done on import
--if int(wx.__version__.split('.')[1]) < 9:
-+if (int(wx.__version__.split('.')[0]) == 2) and (int(wx.__version__.split('.')[1]) < 9):
-     wx.InitAllImageHandlers() # deprecated since wxPython 2.9
- 
- def _sort_by_nrows(a, b):

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2014-08-12 10:32:29 UTC (rev 30138)
+++ packages/gamera/trunk/debian/patches/series	2014-08-12 10:53:50 UTC (rev 30139)
@@ -1,4 +1,4 @@
-fix-wx-deprecation-check.diff
+fix-gamera_display.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff