[Python-apps-commits] r11386 - in packages/djvusmooth/trunk/debian (6 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Tue Oct 7 20:54:59 UTC 2014
Date: Tuesday, October 7, 2014 @ 20:54:58
Author: danstender-guest
Revision: 11386
* New upstream release (Closes: #760546, #762627)
+ dropped wxpython3.0-transition.patch (applied upstream).
+ updated djvusmooth.desktop.patch.
* deb/control: bumped standards to 3.9.6 (no changes needed).
* deb/rules: added DEB_BUILD_OPTIONS line.
Modified:
packages/djvusmooth/trunk/debian/changelog
packages/djvusmooth/trunk/debian/control
packages/djvusmooth/trunk/debian/patches/djvusmooth.desktop.patch
packages/djvusmooth/trunk/debian/patches/series
packages/djvusmooth/trunk/debian/rules
Deleted:
packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
Modified: packages/djvusmooth/trunk/debian/changelog
===================================================================
--- packages/djvusmooth/trunk/debian/changelog 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/changelog 2014-10-07 20:54:58 UTC (rev 11386)
@@ -1,3 +1,13 @@
+djvusmooth (0.2.15-1) UNRELEASED; urgency=medium
+
+ * New upstream release (Closes: #760546, #762627)
+ + dropped wxpython3.0-transition.patch (applied upstream).
+ + updated djvusmooth.desktop.patch.
+ * deb/control: bumped standards to 3.9.6 (no changes needed).
+ * deb/rules: added DEB_BUILD_OPTIONS line.
+
+ -- Daniel Stender <debian at danielstender.com> Tue, 07 Oct 2014 22:47:54 +0200
+
djvusmooth (0.2.14-3) unstable; urgency=low
* wxpython3.0 transition (Closes: #758950):
Modified: packages/djvusmooth/trunk/debian/control
===================================================================
--- packages/djvusmooth/trunk/debian/control 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/control 2014-10-07 20:54:58 UTC (rev 11386)
@@ -9,7 +9,7 @@
python-all,
python-nose
X-Python-Version: >= 2.6
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://jwilk.net/software/djvusmooth
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/djvusmooth/trunk/
Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/djvusmooth/trunk/
Modified: packages/djvusmooth/trunk/debian/patches/djvusmooth.desktop.patch
===================================================================
--- packages/djvusmooth/trunk/debian/patches/djvusmooth.desktop.patch 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/patches/djvusmooth.desktop.patch 2014-10-07 20:54:58 UTC (rev 11386)
@@ -1,15 +1,10 @@
-Description: improvement of upstream .desktop file
-Forwarded: yes
+Description: additions to the upstream .desktop file
+Forwarded: not-needed
Author: Daniel Stender <daniel at danielstender.com>
-Last-Update: 2014-08-23
+Last-Update: 2014-10-07
--- a/extra/djvusmooth.desktop
+++ b/extra/djvusmooth.desktop
-@@ -4,7 +4,10 @@
- Name=djvusmooth
- GenericName=Graphical editor for DjVu
- GenericName[pl]=Graficzny edytor plików DjVu
-+GenericName[de]=Grafischer Editor für DjVu-Dateien
- Exec=/usr/bin/djvusmooth %f
+@@ -9,3 +9,5 @@
Terminal=false
MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu;
Categories=Graphics;
Modified: packages/djvusmooth/trunk/debian/patches/series
===================================================================
--- packages/djvusmooth/trunk/debian/patches/series 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/patches/series 2014-10-07 20:54:58 UTC (rev 11386)
@@ -1,2 +1 @@
-wxpython3.0-transition.patch
djvusmooth.desktop.patch
Deleted: packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch
===================================================================
--- packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/patches/wxpython3.0-transition.patch 2014-10-07 20:54:58 UTC (rev 11386)
@@ -1,137 +0,0 @@
-Description: changes for the wxpython 3.0-transition
-Author: Daniel Stender <debian at danielstender.com>
-Bug: https://bugs.debian.org/758950
-Forwarded: yes
-Reviewed-by: Olly Betts <olly at survex.com>
-Last-Update: 2014-08-25
-
---- a/lib/dependencies.py
-+++ b/lib/dependencies.py
-@@ -14,7 +14,10 @@
- Checks for djvusmooth dependencies.
- '''
-
--WX_VERSIONS = ('2.8-unicode', '2.6-unicode')
-+# wxversion.select() scores based on matching optional components - there's
-+# no -unicode for wx3.0, so we have to ask for -gtk2 or 2.8 will always be
-+# picked if installed.
-+WX_VERSIONS = ('3.0-gtk2', '2.8-unicode')
- DDJVU_API_MIN_VERSION = 26
- PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4)
-
-@@ -55,7 +58,7 @@
- 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.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
-@@ -62,10 +62,6 @@
-
- system_encoding = locale.getpreferredencoding()
-
--if wx.__version__.startswith('2.8.'):
-- wx.Choicebook = wx.Notebook
-- wx.EVT_CHOICEBOOK_PAGE_CHANGED = wx.EVT_NOTEBOOK_PAGE_CHANGED
--
- class OpenDialog(wx.FileDialog):
-
- __wildcard = _(
-@@ -75,7 +71,7 @@
-
- def __init__(self, parent):
- wx.FileDialog.__init__(self, parent,
-- style=wx.OPEN,
-+ style=wx.FD_OPEN,
- wildcard=self.__wildcard,
- message=_('Open a DjVu document')
- )
-@@ -355,7 +351,7 @@
- self.status_bar = self.CreateStatusBar(2, style = wx.ST_SIZEGRIP)
- self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE)
- self.splitter.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.on_splitter_sash_changed)
-- self.sidebar = wx.Choicebook(self.splitter, wx.ID_ANY)
-+ self.sidebar = wx.Notebook(self.splitter, wx.ID_ANY)
- self.text_browser = TextBrowser(self.sidebar)
- self.outline_browser = OutlineBrowser(self.sidebar)
- self.maparea_browser = MapAreaBrowser(self.sidebar)
-@@ -363,7 +359,7 @@
- self.sidebar.AddPage(self.maparea_browser, _('Hyperlinks'))
- self.sidebar.AddPage(self.text_browser, _('Text'))
- self.sidebar.Bind(
-- wx.EVT_CHOICEBOOK_PAGE_CHANGED,
-+ wx.EVT_NOTEBOOK_PAGE_CHANGED,
- self._on_sidebar_page_changed(
- self.on_display_no_nonraster,
- self.on_display_maparea,
---- a/lib/gui/page.py
-+++ b/lib/gui/page.py
-@@ -327,7 +327,7 @@
- }
-
- 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 @@
- if self.GetSize() == size:
- return
- self.SetSize(size)
-- self.SetBestFittingSize(size)
-+ self.SetInitialSize(size)
- self.GetParent().Layout()
- self.GetParent().SetupScrolling()
-
---- a/lib/gui/outline_browser.py
-+++ b/lib/gui/outline_browser.py
-@@ -45,9 +45,11 @@
- self._items = {}
- self._root_item = None
- self._document = None
-+ self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.on_right_click)
- self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.on_begin_edit, self)
- self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.on_end_edit, self)
- self.Bind(wx.EVT_TREE_SEL_CHANGED, self.on_selection_changed, self)
-+ self.Bind(wx.EVT_KEY_DOWN, self.on_key_down)
- self.Bind(wx.EVT_CHAR, self.on_char)
- self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.on_begin_drag)
- self.Bind(wx.EVT_TREE_END_DRAG, self.on_end_drag)
-@@ -108,6 +110,21 @@
- except NotImplementedError:
- return
-
-+ def on_key_down(self, event):
-+ key_code = event.GetKeyCode()
-+ # Steal these keys from wx.TreeCtrl, but check the modifiers so the
-+ # user can still use the with Shift to navigate the tree.
-+ if key_code == wx.WXK_PAGEUP and event.GetModifiers() == 0:
-+ self.GetParent().GetParent().GetParent().on_next_page(event)
-+ elif key_code == wx.WXK_PAGEDOWN and event.GetModifiers() == 0:
-+ self.GetParent().GetParent().GetParent().on_previous_page(event)
-+ elif key_code == wx.WXK_HOME and event.GetModifiers() == wx.MOD_CONTROL:
-+ self.GetParent().GetParent().GetParent().on_first_page(event)
-+ elif key_code == wx.WXK_END and event.GetModifiers() == wx.MOD_CONTROL:
-+ self.GetParent().GetParent().GetParent().on_last_page(event)
-+ else:
-+ event.Skip()
-+
- _WXK_TO_METHOD = {
- wx.WXK_RETURN: do_goto_node,
- wx.WXK_DELETE: do_delete_node
-@@ -179,6 +196,10 @@
- return
- node.notify_select()
-
-+ def on_right_click(self, event):
-+ item = event.GetItem()
-+ self.EditLabel(item)
-+
- def on_begin_edit(self, event):
- item = event.GetItem()
- if not self.do_begin_edit(item):
Modified: packages/djvusmooth/trunk/debian/rules
===================================================================
--- packages/djvusmooth/trunk/debian/rules 2014-10-07 14:17:44 UTC (rev 11385)
+++ packages/djvusmooth/trunk/debian/rules 2014-10-07 20:54:58 UTC (rev 11386)
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
#export DH_VERBOSE=1
+#export DEB_BUILD_OPTIONS=nocheck
%:
dh $@ --with python2
More information about the Python-apps-commits
mailing list