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

Tue Aug 26 08:04:35 UTC 2014

Date: Tuesday, August 26, 2014 @ 08:04:33
  Author: danstender-guest
Revision: 30253

  + added wxpython3.0-transition.diff.
  + added suppress-wxdebug-assertion-messages.diff (Closes: #758578).

Added:
  packages/gamera/trunk/debian/patches/suppress-wxdebug-assertion-messages.diff
  packages/gamera/trunk/debian/patches/wxpython3.0-transition.diff
    (from rev 30139, packages/gamera/trunk/debian/patches/fix-gamera_display.diff)
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series
Deleted:
  packages/gamera/trunk/debian/patches/fix-gamera_display.diff

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

--- packages/gamera/trunk/debian/changelog	2014-08-26 00:27:59 UTC (rev 30252)
+++ packages/gamera/trunk/debian/changelog	2014-08-26 08:04:33 UTC (rev 30253)
@@ -4,14 +4,16 @@
     --extend-diff-ignore in deb/sources/options).
   * bumped python-wxgtk dependencies to 3.0 (Closes: #757208):
     + updated gendoc-use-wxversion.diff and gendoc-draw-text.diff.
-    + added fix-gamera_display.diff.
+    + added wxpython3.0-transition.diff.
+    + added suppress-wxdebug-assertion-messages.diff (Closes: #758578).
+    + bumped deps in deb/control.
   * bumped debhelper level to 9:
    + changed deb/compat, updated version in d/control.
    + removed deb/dh_buildid (obsolete).
   * deb/rules: added -X.txt to dh_compress for docs package (and adjusted
     .docs-base accordingly).
 
- -- Daniel Stender <debian at danielstender.com>  Mon, 18 Aug 2014 19:24:05 +0200
+ -- Daniel Stender <debian at danielstender.com>  Tue, 26 Aug 2014 10:00:02 +0200
 
 gamera (3.4.1-1) unstable; urgency=medium
 

Deleted: packages/gamera/trunk/debian/patches/fix-gamera_display.diff
===================================================================
--- packages/gamera/trunk/debian/patches/fix-gamera_display.diff	2014-08-26 00:27:59 UTC (rev 30252)
+++ packages/gamera/trunk/debian/patches/fix-gamera_display.diff	2014-08-26 08:04:33 UTC (rev 30253)
@@ -1,15 +0,0 @@
-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):

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2014-08-26 00:27:59 UTC (rev 30252)
+++ packages/gamera/trunk/debian/patches/series	2014-08-26 08:04:33 UTC (rev 30253)
@@ -1,4 +1,5 @@
-fix-gamera_display.diff
+suppress-wxdebug-assertion-messages.diff
+wxpython3.0-transition.diff
 gendoc-use-wxversion.diff
 gendoc-draw-text.diff
 fix-paths.diff

Added: packages/gamera/trunk/debian/patches/suppress-wxdebug-assertion-messages.diff
===================================================================
--- packages/gamera/trunk/debian/patches/suppress-wxdebug-assertion-messages.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/suppress-wxdebug-assertion-messages.diff	2014-08-26 08:04:33 UTC (rev 30253)
@@ -0,0 +1,18 @@
+Description: suppress wxdebug assertion messages
+ gamera-gui: prevent warning on not properly closed event handlers
+ on exit
+Author: Daniel Stender <debian at danielstender.com>
+Bug: http://bugs.debian.org/cgi-bin/758578
+Forwarded: no-needed
+Last-Update: 2014-08-26
+
+--- a/gamera/gui/gui.py
++++ b/gamera/gui/gui.py
+@@ -569,6 +569,7 @@ def run(startup=_show_shell):
+ 
+       # wxWindows calls this method to initialize the application
+       def OnInit(self):
++         self.SetAssertMode(wx.PYAPP_ASSERT_SUPPRESS)
+          self.SetAppName("Gamera")
+          self.splash = GameraSplash()
+          self.splash.Show()

Copied: packages/gamera/trunk/debian/patches/wxpython3.0-transition.diff (from rev 30139, packages/gamera/trunk/debian/patches/fix-gamera_display.diff)
===================================================================
--- packages/gamera/trunk/debian/patches/wxpython3.0-transition.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/wxpython3.0-transition.diff	2014-08-26 08:04:33 UTC (rev 30253)
@@ -0,0 +1,46 @@
+Description: updates for the wxpython3.0-transition
+ The call of wx.InitAllImageHandlers() is no-op in 2.8 anyway,
+ cf. http://bugs.debian.org/758578, so completely disabled here
+Bug: http://bugs.debian.org/757208
+Author: Daniel Stender <debian at danielstender.com>
+Forwarded: no
+Last-Update: 2014-08-26
+
+--- a/gamera/gui/gamera_display.py
++++ b/gamera/gui/gamera_display.py
+@@ -39,8 +39,8 @@ import gamera.plugins.gui_support  # Gam
+ ##############################################################################
+ 
+ # we want this done on import
+-if int(wx.__version__.split('.')[1]) < 9:
+-    wx.InitAllImageHandlers() # deprecated since wxPython 2.9
++# if int(wx.__version__.split('.')[1]) < 9:
++#     wx.InitAllImageHandlers() # deprecated since wxPython 2.9
+ 
+ def _sort_by_nrows(a, b):
+    return cmp(a.nrows, b.nrows)
+
+--- a/gamera/gui/gui_util.py
++++ b/gamera/gui/gui_util.py
+@@ -94,7 +94,7 @@ class FileDialog(wx.FileDialog):
+       if cls.last_directory is None:
+          cls.last_directory = path.abspath(config.get("default_dir"))
+       if multiple:
+-         self._flags |= wx.MULTIPLE
++         self._flags |= wx.FD_MULTIPLE
+          self._multiple = True
+       else:
+          self._multiple = False
+@@ -121,10 +121,10 @@ class FileDialog(wx.FileDialog):
+          return filename
+ 
+ class OpenFileDialog(FileDialog):
+-   _flags = wx.OPEN
++   _flags = wx.FD_OPEN
+ 
+ class SaveFileDialog(FileDialog):
+-   _flags = wx.SAVE|wx.OVERWRITE_PROMPT
++   _flags = wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT
+ 
+ def open_file_dialog(parent, extensions="*.*", multiple=0):
+    return OpenFileDialog(parent, extensions, multiple).show()


