[Python-apps-commits] r12496 - in packages/mayavi2/trunk/debian (6 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Fri Oct 16 22:58:32 UTC 2015
Date: Friday, October 16, 2015 @ 22:58:30
Author: varun
Revision: 12496
* Add the missing changes from Olly Betts NMU (4.3.1-3.1)
* d/control: Add dh-python to BD
* Non-maintainer upload with maintainer's permission.
* Update for wxpython3.0 (Closes: #758939):
+ New patch: wxpy3.0-compat.patch
Added:
packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch
Modified:
packages/mayavi2/trunk/debian/changelog
packages/mayavi2/trunk/debian/control
packages/mayavi2/trunk/debian/patches/ipython.diff
packages/mayavi2/trunk/debian/patches/series
packages/mayavi2/trunk/debian/rules
Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog 2015-10-15 20:26:18 UTC (rev 12495)
+++ packages/mayavi2/trunk/debian/changelog 2015-10-16 22:58:30 UTC (rev 12496)
@@ -1,3 +1,10 @@
+mayavi2 (4.4.3-2) unstable; urgency=medium
+
+ * Add the missing changes from Olly Betts NMU (4.3.1-3.1)
+ * d/control: Add dh-python to BD
+
+ -- Varun Hiremath <varun at debian.org> Fri, 16 Oct 2015 18:39:34 -0400
+
mayavi2 (4.4.3-1) unstable; urgency=medium
* New upstream release (Closes: #784839)
@@ -13,6 +20,14 @@
-- Varun Hiremath <varun at debian.org> Tue, 26 May 2015 10:08:07 -0400
+mayavi2 (4.3.1-3.1) unstable; urgency=medium
+
+ * Non-maintainer upload with maintainer's permission.
+ * Update for wxpython3.0 (Closes: #758939):
+ + New patch: wxpy3.0-compat.patch
+
+ -- Olly Betts <olly at survex.com> Tue, 07 Oct 2014 06:40:35 +0000
+
mayavi2 (4.3.1-3) unstable; urgency=medium
* d/rules: remove references to pyshared (Closes: #746762)
Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control 2015-10-15 20:26:18 UTC (rev 12495)
+++ packages/mayavi2/trunk/debian/control 2015-10-16 22:58:30 UTC (rev 12496)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders: Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~),
+Build-Depends: debhelper (>= 7.0.50~), dh-python, python-all-dev (>= 2.6.6-3~),
python-setuptools, python-setupdocs, python-vtk6, python-numpy (>= 1:1.4.1-4~)
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
@@ -14,7 +14,7 @@
Package: mayavi2
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-traits, python-traitsui, python-wxgtk2.8, python-numpy,
+ python-traits, python-traitsui, python-wxgtk3.0, python-numpy,
python-vtk6, python-pkg-resources, python-envisage,
python-apptools (>= 4.0.0-1), libjs-jquery, python-configobj
Suggests: python-scipy, ipython
Modified: packages/mayavi2/trunk/debian/patches/ipython.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/ipython.diff 2015-10-15 20:26:18 UTC (rev 12495)
+++ packages/mayavi2/trunk/debian/patches/ipython.diff 2015-10-16 22:58:30 UTC (rev 12496)
@@ -1,8 +1,8 @@
-Index: mayavi2-4.0.0/mayavi/tests/README.txt
+Index: mayavi2-4.3.1/mayavi/tests/README.txt
===================================================================
---- mayavi2-4.0.0.orig/mayavi/tests/README.txt 2011-12-08 03:55:09.000000000 -0500
-+++ mayavi2-4.0.0/mayavi/tests/README.txt 2011-12-08 03:55:36.000000000 -0500
-@@ -47,7 +47,6 @@
+--- mayavi2-4.3.1.orig/mayavi/tests/README.txt
++++ mayavi2-4.3.1/mayavi/tests/README.txt
+@@ -47,7 +47,6 @@ The IPython Shell can be embedded anywhe
You need to import the `IPython` module and then add the following
lines wherver you want to embed the shell::
Modified: packages/mayavi2/trunk/debian/patches/series
===================================================================
--- packages/mayavi2/trunk/debian/patches/series 2015-10-15 20:26:18 UTC (rev 12495)
+++ packages/mayavi2/trunk/debian/patches/series 2015-10-16 22:58:30 UTC (rev 12496)
@@ -1,3 +1,4 @@
pyinterpreter.diff
help.diff
ipython.diff
+wxpy3.0-compat.patch
Added: packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch
===================================================================
--- packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch (rev 0)
+++ packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch 2015-10-16 22:58:30 UTC (rev 12496)
@@ -0,0 +1,127 @@
+Description: Fixes for wxPython 3.0
+ Retains compatibility with 2.8 - there wx.InitAllImageHandlers() is a no-op,
+ wx.HIDE_READONLY is 0, and wx.PySimpleApp() issues a deprecation warning.
+Author: Olly Betts <olly at survex.com>
+Bug-Debian: https://bugs.debian.org/758939
+Forwarded: no
+Last-Update: 2014-09-20
+
+Index: mayavi2-4.3.1/tvtk/pyface/ui/wx/init.py
+===================================================================
+--- mayavi2-4.3.1.orig/tvtk/pyface/ui/wx/init.py
++++ mayavi2-4.3.1/tvtk/pyface/ui/wx/init.py
+@@ -22,10 +22,6 @@ if wx.VERSION < (2, 6):
+ _app = wx.GetApp()
+
+ if _app is None:
+- _app = wx.PySimpleApp()
++ _app = wx.App(False)
+-
+- # Before we can load any images we have to initialize wxPython's image
+- # handlers.
+- wx.InitAllImageHandlers()
+
+ #### EOF ######################################################################
+Index: mayavi2-4.3.1/tvtk/util/wx_gradient_editor.py
+===================================================================
+--- mayavi2-4.3.1.orig/tvtk/util/wx_gradient_editor.py
++++ mayavi2-4.3.1/tvtk/util/wx_gradient_editor.py
+@@ -392,7 +392,7 @@ class wxGradientEditorWidget(wx.Panel, G
+ (lookuptable) ``*.grad`` (gradient table for use with this program),
+ and ``*.jpg`` (image of the gradient)
+ """
+- dlg = wx.FileDialog(self, "Save LUT to...", style=wx.SAVE)
++ dlg = wx.FileDialog(self, "Save LUT to...", style=wx.FD_SAVE)
+ wildcard = "Gradient Files (.grad)|*.grad|" \
+ "All files (*.*)|*.*"
+ dlg.SetWildcard(wildcard)
+@@ -405,7 +405,7 @@ class wxGradientEditorWidget(wx.Panel, G
+ """
+ Load a ``*.grad`` lookuptable file using wxpython dialog
+ """
+- style = wx.OPEN | wx.HIDE_READONLY
++ style = wx.FD_OPEN
+ dlg = wx.FileDialog(self, "Open a file", style=style)
+ wildcard = "Gradient Files (.grad)|*.grad|" \
+ "All files (*.*)|*.*"
+@@ -510,7 +510,7 @@ def main():
+ """If we had a vtk window running, update it here"""
+ print("Update Render Window")
+
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+ editor = wxGradientEditor(table,
+ on_color_table_changed,
+ colors=['rgb', 'a', 'h', 's', 'v'],
+Index: mayavi2-4.3.1/docs/source/mayavi/auto/wx_embedding.py
+===================================================================
+--- mayavi2-4.3.1.orig/docs/source/mayavi/auto/wx_embedding.py
++++ mayavi2-4.3.1/docs/source/mayavi/auto/wx_embedding.py
+@@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
+ kind='subpanel').control
+ self.Show(True)
+
+-app = wx.PySimpleApp()
++app = wx.App(False)
+ frame = MainWindow(None, wx.ID_ANY)
+ app.MainLoop()
+
+Index: mayavi2-4.3.1/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
+===================================================================
+--- mayavi2-4.3.1.orig/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.3.1/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
+@@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
+ self.Show(True)
+
+ if __name__ == '__main__':
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+ frame = MainWindow(None, wx.ID_ANY)
+ app.MainLoop()
+Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_embedding.py
+===================================================================
+--- mayavi2-4.3.1.orig/examples/mayavi/interactive/wx_embedding.py
++++ mayavi2-4.3.1/examples/mayavi/interactive/wx_embedding.py
+@@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
+ kind='subpanel').control
+ self.Show(True)
+
+-app = wx.PySimpleApp()
++app = wx.App(False)
+ frame = MainWindow(None, wx.ID_ANY)
+ app.MainLoop()
+
+Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
+===================================================================
+--- mayavi2-4.3.1.orig/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.3.1/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
+@@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
+ self.Show(True)
+
+ if __name__ == '__main__':
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+ frame = MainWindow(None, wx.ID_ANY)
+ app.MainLoop()
+Index: mayavi2-4.3.1/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
+===================================================================
+--- mayavi2-4.3.1.orig/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
++++ mayavi2-4.3.1/tvtk/pyface/ui/wx/wxVTKRenderWindowInteractor.py
+@@ -21,7 +21,7 @@ Creation:
+
+ wxVTKRenderWindowInteractor(parent, ID, stereo=0, [wx keywords]):
+
+- You should create a wx.PySimpleApp() or some other wx**App before
++ You should create a wx.App(False) or some other wx.App subclass before
+ creating the window.
+
+ Behaviour:
+@@ -695,7 +695,7 @@ def wxVTKRenderWindowInteractorConeExamp
+ """Like it says, just a simple example
+ """
+ # every wx app needs an app
+- app = wx.PySimpleApp()
++ app = wx.App(False)
+
+ # create the top-level frame, sizer and wxVTKRWI
+ frame = wx.Frame(None, -1, "wxVTKRenderWindowInteractor", size=(400,400))
Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules 2015-10-15 20:26:18 UTC (rev 12495)
+++ packages/mayavi2/trunk/debian/rules 2015-10-16 22:58:30 UTC (rev 12496)
@@ -37,5 +37,8 @@
dh_link $(JQUERY) /usr/share/doc/mayavi2/docs/build/mayavi/html/jquery.js
dh_link $(JQUERY) /usr/share/doc/mayavi2/docs/build/tvtk/html/jquery.js
+override_dh_strip_nondeterminism:
+ dh_strip_nondeterminism -Xpng
+
get-orig-source:
-uscan --force-download --repack --rename
More information about the Python-apps-commits
mailing list