[Python-apps-commits] r11208 - in packages/djvusmooth/trunk/debian (3 files)

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

    Date: Saturday, August 23, 2014 @ 11:52:21
  Author: danstender-guest
Revision: 11208

* wxpython3.0 transition (Closes: #758950):
  * added wxpython3.0-transition.patch.

Added:
  packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
Modified:
  packages/djvusmooth/trunk/debian/changelog
  packages/djvusmooth/trunk/debian/patches/series

Modified: packages/djvusmooth/trunk/debian/changelog
===================================================================
--- packages/djvusmooth/trunk/debian/changelog	2014-08-22 19:14:49 UTC (rev 11207)
+++ packages/djvusmooth/trunk/debian/changelog	2014-08-23 11:52:21 UTC (rev 11208)
@@ -1,9 +1,11 @@
 djvusmooth (0.2.14-3) UNRELEASED; urgency=low
 
-  * d/control: bumped dep on python-wxgtk to 3.0.
+  * wxpython3.0 transition (Closes: #758950):
+    * d/control: bumped dep on python-wxgtk to 3.0.
+    * added wxpython3.0-transition.patch.
   * Fixed upstream-signing-key.
 
- -- Daniel Stender <debian at danielstender.com>  Sun, 10 Aug 2014 16:28:40 +0200
+ -- Daniel Stender <debian at danielstender.com>  Sat, 23 Aug 2014 13:50:34 +0200
 
 djvusmooth (0.2.14-2) unstable; urgency=low
 

Modified: packages/djvusmooth/trunk/debian/patches/series
===================================================================
--- packages/djvusmooth/trunk/debian/patches/series	2014-08-22 19:14:49 UTC (rev 11207)
+++ packages/djvusmooth/trunk/debian/patches/series	2014-08-23 11:52:21 UTC (rev 11208)
@@ -1 +1,2 @@
+wxpython3.0-transition.patch
 djvusmooth.desktop.patch

Added: packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
===================================================================
--- packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch	                        (rev 0)
+++ packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch	2014-08-23 11:52:21 UTC (rev 11208)
@@ -0,0 +1,59 @@
+Description: changes for the wxpython 3.0-transition
+Author: Daniel Stender <debian at danielstender.com>
+Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=758950
+Forwarded: no
+Last-Update: 2014-08-23
+
+--- a/lib/dependencies.py
++++ b/lib/dependencies.py
+@@ -14,7 +14,7 @@
+ Checks for djvusmooth dependencies.
+ '''
+ 
+-WX_VERSIONS = ('2.8-unicode', '2.6-unicode')
++WX_VERSIONS = ('3.0-unicode', '2.8-unicode', '2.6-unicode')
+ DDJVU_API_MIN_VERSION = 26
+ PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
+ 
+@@ -55,7 +55,7 @@ def _check_wx():
+     except ImportError, ex:
+         raise ImportError('%s; perhaps wxPython is not installed' % (ex,))
+     if not wxversion.checkInstalled(WX_VERSIONS):
+-        raise ImportError('wxPython 2.6 or 2.8 with Unicode support is required')
++        raise ImportError('wxPython 2.6, 2.8 or 3.0 with Unicode support is required')
+     wxversion.select(WX_VERSIONS)
+ 
+ _check_signals()
+
+--- a/lib/gui/main.py
++++ b/lib/gui/main.py
+@@ -75,7 +75,7 @@ class OpenDialog(wx.FileDialog):
+ 
+     def __init__(self, parent):
+         wx.FileDialog.__init__(self, parent,
+-            style=wx.OPEN,
++            style=wx.FD_OPEN,
+             wildcard=self.__wildcard,
+             message=_('Open a DjVu document')
+         )
+
+--- a/lib/gui/page.py
++++ b/lib/gui/page.py
+@@ -327,7 +327,7 @@ class TextShape(NodeShape):
+     }
+ 
+     def _get_frame_color(self):
+-        return wx.Color(*self._FRAME_COLORS[self._node.type])
++        return wx.Colour(*self._FRAME_COLORS[self._node.type])
+ 
+     def _get_text(self):
+         if self._node.is_inner():
+@@ -626,7 +626,7 @@ class PageWidget(wx.lib.ogl.ShapeCanvas)
+         if self.GetSize() == size:
+             return
+         self.SetSize(size)
+-        self.SetBestFittingSize(size)
++        self.SetInitialSize(size)
+         self.GetParent().Layout()
+         self.GetParent().SetupScrolling()
+