[Python-modules-commits] r33801 - in packages/python-traitsui/trunk/debian (6 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Mon Aug 17 01:44:06 UTC 2015
Date: Monday, August 17, 2015 @ 01:44:05
Author: varun
Revision: 33801
* New upstream release
* Acknowledge previous NMU changes, thanks
* Bump Standards-Version to 3.9.6
* Fix the watch file
* Non-maintainer upload.
* Improve wxpython3.0.patch so mayavi2 works.
* Non-maintainer upload.
* Update to use wxpython3.0 (Closes: #758695):
- New patch: wxpython3.0.patch
* Non-maintainer upload.
* Set permissions in /usr/lib/python*, not /usr/share/pyshared
Closes: #750253
Added:
packages/python-traitsui/trunk/debian/patches/
packages/python-traitsui/trunk/debian/patches/series
packages/python-traitsui/trunk/debian/patches/wxpython3.0.patch
Modified:
packages/python-traitsui/trunk/debian/changelog
packages/python-traitsui/trunk/debian/control
packages/python-traitsui/trunk/debian/rules
Modified: packages/python-traitsui/trunk/debian/changelog
===================================================================
--- packages/python-traitsui/trunk/debian/changelog 2015-08-17 01:16:54 UTC (rev 33800)
+++ packages/python-traitsui/trunk/debian/changelog 2015-08-17 01:44:05 UTC (rev 33801)
@@ -1,3 +1,35 @@
+python-traitsui (4.5.1-1) unstable; urgency=medium
+
+ * New upstream release
+ * Acknowledge previous NMU changes, thanks
+ * Bump Standards-Version to 3.9.6
+ * Fix the watch file
+
+ -- Varun Hiremath <varun at debian.org> Sun, 16 Aug 2015 21:41:09 -0400
+
+python-traitsui (4.4.0-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Improve wxpython3.0.patch so mayavi2 works.
+
+ -- Olly Betts <olly at survex.com> Sat, 20 Sep 2014 00:05:20 +0000
+
+python-traitsui (4.4.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Update to use wxpython3.0 (Closes: #758695):
+ - New patch: wxpython3.0.patch
+
+ -- Olly Betts <olly at survex.com> Sun, 31 Aug 2014 20:18:46 +0000
+
+python-traitsui (4.4.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Set permissions in /usr/lib/python*, not /usr/share/pyshared
+ Closes: #750253
+
+ -- Jonathan Wiltshire <jmw at debian.org> Sun, 06 Jul 2014 21:06:30 +0100
+
python-traitsui (4.4.0-1) unstable; urgency=low
[ Jakub Wilk ]
Modified: packages/python-traitsui/trunk/debian/control
===================================================================
--- packages/python-traitsui/trunk/debian/control 2015-08-17 01:16:54 UTC (rev 33800)
+++ packages/python-traitsui/trunk/debian/control 2015-08-17 01:44:05 UTC (rev 33801)
@@ -5,7 +5,7 @@
Uploaders: Varun Hiremath <varun at debian.org>
Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), python-all (>= 2.6.6-3~)
Build-Depends-Indep: python-setupdocs
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://pypi.python.org/pypi/traitsui
X-Python-Version: >=2.5
Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-traitsui/trunk/
@@ -13,7 +13,7 @@
Package: python-traitsui
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-traits, python-pyface, python-wxgtk2.8
+Depends: ${python:Depends}, ${misc:Depends}, python-traits, python-pyface, python-wxgtk3.0
Breaks: python-traitsgui, python-traitsbackendqt, python-traitsbackendwx
Replaces: python-traitsgui, python-traitsbackendqt, python-traitsbackendwx
Description: traits-capable user interfaces
Added: packages/python-traitsui/trunk/debian/patches/series
===================================================================
--- packages/python-traitsui/trunk/debian/patches/series (rev 0)
+++ packages/python-traitsui/trunk/debian/patches/series 2015-08-17 01:44:05 UTC (rev 33801)
@@ -0,0 +1 @@
+wxpython3.0.patch
Added: packages/python-traitsui/trunk/debian/patches/wxpython3.0.patch
===================================================================
--- packages/python-traitsui/trunk/debian/patches/wxpython3.0.patch (rev 0)
+++ packages/python-traitsui/trunk/debian/patches/wxpython3.0.patch 2015-08-17 01:44:05 UTC (rev 33801)
@@ -0,0 +1,95 @@
+Description: Improve wxPython 3.0 compatibility
+ Fixes an assertion due to not having popped an event handler.
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/758695
+Forwarded: no
+Last-Update: 2014-09-20
+
+Index: python-traitsui-4.4.0/traitsui/wx/helper.py
+===================================================================
+--- python-traitsui-4.4.0.orig/traitsui/wx/helper.py
++++ python-traitsui-4.4.0/traitsui/wx/helper.py
+@@ -361,7 +361,7 @@ class TraitsUIPanel ( wx.Panel ):
+
+ # PyEvtHandler was only introduced in wxPython 2.8.8. Fortunately, it is only
+ # necessary in wxPython 2.8.8.
+-if wx.__version__ < '2.8.8':
++if wx.__version__ < '2.8.8' or wx.__version__ >= '3.0.0':
+
+ class ChildFocusOverride ( object ):
+ def __init__ ( self, window ):
+Index: python-traitsui-4.4.0/traitsui/wx/toolkit.py
+===================================================================
+--- python-traitsui-4.4.0.orig/traitsui/wx/toolkit.py
++++ python-traitsui-4.4.0/traitsui/wx/toolkit.py
+@@ -66,20 +66,20 @@ from helper \
+ #-------------------------------------------------------------------------------
+
+ EventSuffix = {
+- wx.wxEVT_LEFT_DOWN: 'left_down',
+- wx.wxEVT_LEFT_DCLICK: 'left_dclick',
+- wx.wxEVT_LEFT_UP: 'left_up',
+- wx.wxEVT_MIDDLE_DOWN: 'middle_down',
+- wx.wxEVT_MIDDLE_DCLICK: 'middle_dclick',
+- wx.wxEVT_MIDDLE_UP: 'middle_up',
+- wx.wxEVT_RIGHT_DOWN: 'right_down',
+- wx.wxEVT_RIGHT_DCLICK: 'right_dclick',
+- wx.wxEVT_RIGHT_UP: 'right_up',
+- wx.wxEVT_MOTION: 'mouse_move',
+- wx.wxEVT_ENTER_WINDOW: 'enter',
+- wx.wxEVT_LEAVE_WINDOW: 'leave',
+- wx.wxEVT_MOUSEWHEEL: 'mouse_wheel',
+- wx.wxEVT_PAINT: 'paint',
++ wx.EVT_LEFT_DOWN: 'left_down',
++ wx.EVT_LEFT_DCLICK: 'left_dclick',
++ wx.EVT_LEFT_UP: 'left_up',
++ wx.EVT_MIDDLE_DOWN: 'middle_down',
++ wx.EVT_MIDDLE_DCLICK: 'middle_dclick',
++ wx.EVT_MIDDLE_UP: 'middle_up',
++ wx.EVT_RIGHT_DOWN: 'right_down',
++ wx.EVT_RIGHT_DCLICK: 'right_dclick',
++ wx.EVT_RIGHT_UP: 'right_up',
++ wx.EVT_MOTION: 'mouse_move',
++ wx.EVT_ENTER_WINDOW: 'enter',
++ wx.EVT_LEAVE_WINDOW: 'leave',
++ wx.EVT_MOUSEWHEEL: 'mouse_wheel',
++ wx.EVT_PAINT: 'paint',
+ }
+
+ # Types of popup views:
+@@ -394,28 +394,24 @@ class GUIToolkit ( Toolkit ):
+ """
+ if events is None:
+ events = (
+- wx.wxEVT_LEFT_DOWN, wx.wxEVT_LEFT_DCLICK, wx.wxEVT_LEFT_UP,
+- wx.wxEVT_MIDDLE_DOWN, wx.wxEVT_MIDDLE_DCLICK, wx.wxEVT_MIDDLE_UP,
+- wx.wxEVT_RIGHT_DOWN, wx.wxEVT_RIGHT_DCLICK, wx.wxEVT_RIGHT_UP,
+- wx.wxEVT_MOTION, wx.wxEVT_ENTER_WINDOW, wx.wxEVT_LEAVE_WINDOW,
+- wx.wxEVT_MOUSEWHEEL, wx.wxEVT_PAINT
++ wx.EVT_LEFT_DOWN, wx.EVT_LEFT_DCLICK, wx.EVT_LEFT_UP,
++ wx.EVT_MIDDLE_DOWN, wx.EVT_MIDDLE_DCLICK, wx.EVT_MIDDLE_UP,
++ wx.EVT_RIGHT_DOWN, wx.EVT_RIGHT_DCLICK, wx.EVT_RIGHT_UP,
++ wx.EVT_MOTION, wx.EVT_ENTER_WINDOW, wx.EVT_LEAVE_WINDOW,
++ wx.EVT_MOUSEWHEEL, wx.EVT_PAINT
+ )
+ control.SetDropTarget( PythonDropTarget(
+ DragHandler( ui = ui, control = control ) ) )
+ elif events == 'keys':
+- events = ( wx.wxEVT_CHAR, )
++ events = ( wx.EVT_CHAR, )
+
+ if handler is None:
+ handler = ui.route_event
+
+ id = control.GetId()
+- event_handler = wx.EvtHandler()
+- connect = event_handler.Connect
+
+ for event in events:
+- connect( id, id, event, handler )
+-
+- control.PushEventHandler( event_handler )
++ control.Bind( event, handler, control, id, id )
+
+ for child in control.GetChildren():
+ self.hook_events( ui, child, events, handler, drop_target )
Modified: packages/python-traitsui/trunk/debian/rules
===================================================================
--- packages/python-traitsui/trunk/debian/rules 2015-08-17 01:16:54 UTC (rev 33800)
+++ packages/python-traitsui/trunk/debian/rules 2015-08-17 01:44:05 UTC (rev 33801)
@@ -7,15 +7,16 @@
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
DEB_DESTDIR =$(CURDIR)/debian/python-traitsui
PYSHARED =$(DEB_DESTDIR)/usr/share/pyshared
+PYLIBS =$(DEB_DESTDIR)/usr/lib/python*
EXAMPLES =$(DEB_DESTDIR)/usr/share/doc/python-traitsui
install/python-traitsui::
find $(DEB_DESTDIR) -name 'image_LICENSE.txt' -delete
binary-predeb/python-traitsui::
- find $(PYSHARED) -type f | xargs chmod 644
- find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
- find $(EXAMPLES) -type f | xargs chmod 644
+ find $(PYLIBS) -type f -print0 | xargs -0 chmod 644
+ find $(EXAMPLES) -type f -print0 | xargs -0 sed -i '/^#!/d'
+ find $(EXAMPLES) -type f -print0 | xargs -0 chmod 644
get-orig-source:
-uscan --force-download --rename
More information about the Python-modules-commits
mailing list