[Python-apps-commits] r13639 - in packages/mayavi2/trunk/debian (6 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Thu Oct 27 04:02:38 UTC 2016
Date: Thursday, October 27, 2016 @ 04:02:35
Author: varun
Revision: 13639
* New upstream release (Closes: #835144)
* Add p/tvtk_setup.diff (Closes: #839802, #839872)
* Non-maintainer upload.
* Fix compilation against vtk_6.3. (Closes: #830342)
* Add dh-strip-nondeterminism to build-depends.
* Non-maintainer upload.
* Replace void_p by p_void in wxVTKRenderWindowInteractor. (Closes: #812641)
Added:
packages/mayavi2/trunk/debian/patches/tvtk_setup.diff
packages/mayavi2/trunk/debian/patches/vtk_63.py
Modified:
packages/mayavi2/trunk/debian/changelog
packages/mayavi2/trunk/debian/control
packages/mayavi2/trunk/debian/patches/series
packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch
Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog 2016-10-25 21:45:29 UTC (rev 13638)
+++ packages/mayavi2/trunk/debian/changelog 2016-10-27 04:02:35 UTC (rev 13639)
@@ -1,3 +1,25 @@
+mayavi2 (4.5.0-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #835144)
+ * Add p/tvtk_setup.diff (Closes: #839802, #839872)
+
+ -- Varun Hiremath <varun at debian.org> Wed, 26 Oct 2016 23:07:22 -0400
+
+mayavi2 (4.4.3-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix compilation against vtk_6.3. (Closes: #830342)
+ * Add dh-strip-nondeterminism to build-depends.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 25 Aug 2016 21:14:20 +0200
+
+mayavi2 (4.4.3-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Replace void_p by p_void in wxVTKRenderWindowInteractor. (Closes: #812641)
+
+ -- Anton Gladky <gladk at debian.org> Sat, 30 Jan 2016 16:59:03 +0100
+
mayavi2 (4.4.3-2) unstable; urgency=medium
* Add the missing changes from Olly Betts NMU (4.3.1-3.1)
Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control 2016-10-25 21:45:29 UTC (rev 13638)
+++ packages/mayavi2/trunk/debian/control 2016-10-27 04:02:35 UTC (rev 13639)
@@ -4,7 +4,8 @@
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~), dh-python, python-all-dev (>= 2.6.6-3~),
- python-setuptools, python-setupdocs, python-vtk6, python-numpy (>= 1:1.4.1-4~)
+ python-setuptools, python-setupdocs, python-vtk6, python-numpy (>= 1:1.4.1-4~),
+ dh-strip-nondeterminism
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
Homepage: http://code.enthought.com/projects/mayavi/
Modified: packages/mayavi2/trunk/debian/patches/series
===================================================================
--- packages/mayavi2/trunk/debian/patches/series 2016-10-25 21:45:29 UTC (rev 13638)
+++ packages/mayavi2/trunk/debian/patches/series 2016-10-27 04:02:35 UTC (rev 13639)
@@ -2,3 +2,5 @@
help.diff
ipython.diff
wxpy3.0-compat.patch
+vtk_63.py
+tvtk_setup.diff
Added: packages/mayavi2/trunk/debian/patches/tvtk_setup.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/tvtk_setup.diff (rev 0)
+++ packages/mayavi2/trunk/debian/patches/tvtk_setup.diff 2016-10-27 04:02:35 UTC (rev 13639)
@@ -0,0 +1,23 @@
+Index: mayavi2-4.5.0/tvtk/setup.py
+===================================================================
+--- mayavi2-4.5.0.orig/tvtk/setup.py
++++ mayavi2-4.5.0/tvtk/setup.py
+@@ -19,12 +19,18 @@ def configuration(parent_package=None, t
+
+ config.add_subpackage('custom')
+ config.add_subpackage('pipeline')
++ config.add_subpackage('pyface')
++ config.add_subpackage('pyface.*')
++ config.add_subpackage('pyface.*.*')
++ config.add_subpackage('view')
++
+ config.add_data_dir('pipeline/images')
+ config.add_data_dir('pyface/images')
+ config.add_data_dir('tools/images')
+
+ config.add_subpackage('plugins')
+ config.add_subpackage('plugins.*')
++ config.add_subpackage('plugins.*.*')
+
+ config.add_subpackage('tools')
+ config.add_subpackage('util')
Added: packages/mayavi2/trunk/debian/patches/vtk_63.py
===================================================================
--- packages/mayavi2/trunk/debian/patches/vtk_63.py (rev 0)
+++ packages/mayavi2/trunk/debian/patches/vtk_63.py 2016-10-27 04:02:35 UTC (rev 13639)
@@ -0,0 +1,25 @@
+Description: Fix compilation against vtk_6.3
+Author: Anton Gladky <gladk at debian.org>
+Bug-Debian: https://bugs.debian.org/830342
+Last-Update: 2016-08-25
+
+Index: mayavi2-4.5.0/tvtk/vtk_parser.py
+===================================================================
+--- mayavi2-4.5.0.orig/tvtk/vtk_parser.py
++++ mayavi2-4.5.0/tvtk/vtk_parser.py
+@@ -315,11 +315,10 @@ class VTKMethodParser:
+
+ """
+ # VTK 6.2 false built in funcs/methods are ignored
+- if is_version_62():
+- built_in_func = isinstance(method, types.BuiltinFunctionType)
+- built_in_meth = isinstance(method, types.BuiltinMethodType)
+- if not (built_in_func or built_in_meth):
+- return None
++ built_in_func = isinstance(method, types.BuiltinFunctionType)
++ built_in_meth = isinstance(method, types.BuiltinMethodType)
++ if not (built_in_func or built_in_meth):
++ return None
+ # Remove all the C++ function signatures.
+ doc = method.__doc__
+ if doc is None:
Modified: packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch
===================================================================
--- packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch 2016-10-25 21:45:29 UTC (rev 13638)
+++ packages/mayavi2/trunk/debian/patches/wxpy3.0-compat.patch 2016-10-27 04:02:35 UTC (rev 13639)
@@ -6,28 +6,28 @@
Forwarded: no
Last-Update: 2014-09-20
-Index: mayavi2-4.3.1/tvtk/pyface/ui/wx/init.py
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/tvtk/pyface/ui/wx/init.py
++++ mayavi2-4.5.0/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()
++ _app = wx.App(False)
#### EOF ######################################################################
-Index: mayavi2-4.3.1/tvtk/util/wx_gradient_editor.py
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/tvtk/util/wx_gradient_editor.py
++++ mayavi2-4.5.0/tvtk/util/wx_gradient_editor.py
@@ -392,7 +392,7 @@ class wxGradientEditorWidget(wx.Panel, G
- (lookuptable) ``*.grad`` (gradient table for use with this program),
+ (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)
@@ -53,10 +53,10 @@
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
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/docs/source/mayavi/auto/wx_embedding.py
++++ mayavi2-4.5.0/docs/source/mayavi/auto/wx_embedding.py
@@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
kind='subpanel').control
self.Show(True)
@@ -66,10 +66,10 @@
frame = MainWindow(None, wx.ID_ANY)
app.MainLoop()
-Index: mayavi2-4.3.1/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.5.0/docs/source/mayavi/auto/wx_mayavi_embed_in_notebook.py
@@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
self.Show(True)
@@ -78,10 +78,10 @@
+ app = wx.App(False)
frame = MainWindow(None, wx.ID_ANY)
app.MainLoop()
-Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_embedding.py
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/examples/mayavi/interactive/wx_embedding.py
++++ mayavi2-4.5.0/examples/mayavi/interactive/wx_embedding.py
@@ -60,7 +60,7 @@ class MainWindow(wx.Frame):
kind='subpanel').control
self.Show(True)
@@ -91,10 +91,10 @@
frame = MainWindow(None, wx.ID_ANY)
app.MainLoop()
-Index: mayavi2-4.3.1/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
+Index: mayavi2-4.5.0/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
+--- mayavi2-4.5.0.orig/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
++++ mayavi2-4.5.0/examples/mayavi/interactive/wx_mayavi_embed_in_notebook.py
@@ -80,6 +80,6 @@ class MainWindow(wx.Frame):
self.Show(True)
@@ -103,25 +103,3 @@
+ 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))
More information about the Python-apps-commits
mailing list