[vistrails] 02/19: SV: 3.9.6
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sat Jul 29 14:21:49 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository vistrails.
commit c01af42e57a705bb9e8aefcef61fc0379351fc3c
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jun 8 15:43:20 2015 +0100
SV: 3.9.6
---
debian/control | 2 +-
debian/patches/indent_fixes.patch | 178 --------------------------------------
debian/patches/run.patch | 15 ----
3 files changed, 1 insertion(+), 194 deletions(-)
diff --git a/debian/control b/debian/control
index 5c706a5..fc132f2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
Priority: extra
Maintainer: Alastair McKinstry <mckinstry at debian.org>
Build-Depends: debhelper (>= 9), python-all-dev, python-numpy
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.vistrails.org/index.php/Main_Page
Package: vistrails
diff --git a/debian/patches/indent_fixes.patch b/debian/patches/indent_fixes.patch
deleted file mode 100644
index 77b596d..0000000
--- a/debian/patches/indent_fixes.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix indentation, which broke on install.
-Last-Updated: 2014-05-14
-Forwarded: no
-
-Index: vistrails-2.1.1/contrib/cdat/scripts/cdatwindow_init_inc.py
-===================================================================
---- vistrails-2.1.1.orig/contrib/cdat/scripts/cdatwindow_init_inc.py
-+++ vistrails-2.1.1/contrib/cdat/scripts/cdatwindow_init_inc.py
-@@ -1,85 +1,85 @@
-
-- ##########################################################################
-- # included from cdatwindow_init_inc.py
-- #display = sip.unwrapinstance(QtGui.QX11Info.display())
-- #vcs._vcs.setdisplay(display)
--
-- #cdat GUI modules
-- global cdatWindow
-- cdatWindow = QCDATWindow()
-- cdatWindow.show()
--
-- reg.add_module(CDATCell,namespace='cdat')
-- reg.add_input_port(CDATCell, 'slab1',
-- (TransientVariable, "variable to be plotted"))
-- reg.add_input_port(CDATCell, 'slab2',
-- (TransientVariable, "variable to be plotted"))
-- reg.add_input_port(CDATCell, 'plotType',
-- (core.modules.basic_modules.String, "Plot type"))
-- reg.add_input_port(CDATCell, 'template',
-- (core.modules.basic_modules.String, "template name"))
-- reg.add_input_port(CDATCell, 'gmName',
-- (core.modules.basic_modules.String, "graphics method name"))
-- reg.add_input_port(CDATCell, 'canvas',
-- (Canvas, "Canvas object"))
-- reg.add_input_port(CDATCell, 'col',
-- (core.modules.basic_modules.Integer, "Cell Col"))
-- reg.add_input_port(CDATCell, 'row',
-- (core.modules.basic_modules.Integer, "Cell Row"))
-- reg.add_input_port(CDATCell, 'continents',
-- (core.modules.basic_modules.Integer,
-- "continents type number"), True)
--
-- reg.add_module(Variable, namespace='cdat')
-- reg.add_module(Quickplot, namespace='cdat')
-- reg.add_input_port(Variable, 'id',
-- (core.modules.basic_modules.String,
-- ""))
-- reg.add_input_port(Variable, 'type',
-- (core.modules.basic_modules.String,
-- "variable, axis, or weighted-axis"))
-- reg.add_input_port(Variable, 'inputVariable',
-- (core.modules.basic_modules.List,
-- ""))
-- reg.add_output_port(Variable, 'variable',
-- (get_late_type('cdms2.tvariable.TransientVariable'),
-- ""))
-- reg.add_input_port(Variable, 'axes',
-- (core.modules.basic_modules.String, "Axes of variables"))
-- reg.add_input_port(Variable, 'axesOperations',
-- (core.modules.basic_modules.String, "Axes Operations"))
-- reg.add_input_port(Variable, 'cdmsfile',
-- (CdmsFile, "cdmsfile"))
--
-- reg.add_module(GraphicsMethod, namespace='cdat')
-- reg.add_input_port(GraphicsMethod, 'gmName',
-- (core.modules.basic_modules.String,
-- "Get the graphics method object of the given name."))
-- reg.add_input_port(GraphicsMethod, 'plotType',
-- (core.modules.basic_modules.String, "Plot type"))
-- reg.add_input_port(GraphicsMethod, 'slab1',
-- (get_late_type('cdms2.tvariable.TransientVariable'),
-- "slab1"))
-- reg.add_input_port(GraphicsMethod, 'slab2',
-- (get_late_type('cdms2.tvariable.TransientVariable'),
-- "slab2"))
-- reg.add_input_port(GraphicsMethod, 'color_1',
-- (core.modules.basic_modules.Integer, "color_1"), True)
-- reg.add_input_port(GraphicsMethod, 'color_2',
-- (core.modules.basic_modules.Integer, "color_2"), True)
-- reg.add_input_port(GraphicsMethod, 'level_1',
-- (core.modules.basic_modules.Float, "level_1"), True)
-- reg.add_input_port(GraphicsMethod, 'level_2',
-- (core.modules.basic_modules.Float, "level_2"), True)
-- reg.add_output_port(GraphicsMethod, 'slab1',
-- (get_late_type('cdms2.tvariable.TransientVariable'),
-- "slab1"))
-- reg.add_output_port(GraphicsMethod, 'slab2',
-- (get_late_type('cdms2.tvariable.TransientVariable'),
-- "slab2"))
-- reg.add_output_port(GraphicsMethod, 'canvas', (Canvas, "Canvas object"))
--
-- # end of cdatwindow_init_inc.py
-- ##########################################################################
-+##########################################################################
-+# included from cdatwindow_init_inc.py
-+#display = sip.unwrapinstance(QtGui.QX11Info.display())
-+#vcs._vcs.setdisplay(display)
-+
-+#cdat GUI modules
-+global cdatWindow
-+cdatWindow = QCDATWindow()
-+cdatWindow.show()
-+
-+reg.add_module(CDATCell,namespace='cdat')
-+reg.add_input_port(CDATCell, 'slab1',
-+ (TransientVariable, "variable to be plotted"))
-+reg.add_input_port(CDATCell, 'slab2',
-+ (TransientVariable, "variable to be plotted"))
-+reg.add_input_port(CDATCell, 'plotType',
-+ (core.modules.basic_modules.String, "Plot type"))
-+reg.add_input_port(CDATCell, 'template',
-+ (core.modules.basic_modules.String, "template name"))
-+reg.add_input_port(CDATCell, 'gmName',
-+ (core.modules.basic_modules.String, "graphics method name"))
-+reg.add_input_port(CDATCell, 'canvas',
-+ (Canvas, "Canvas object"))
-+reg.add_input_port(CDATCell, 'col',
-+ (core.modules.basic_modules.Integer, "Cell Col"))
-+reg.add_input_port(CDATCell, 'row',
-+ (core.modules.basic_modules.Integer, "Cell Row"))
-+reg.add_input_port(CDATCell, 'continents',
-+ (core.modules.basic_modules.Integer,
-+ "continents type number"), True)
-+
-+reg.add_module(Variable, namespace='cdat')
-+reg.add_module(Quickplot, namespace='cdat')
-+reg.add_input_port(Variable, 'id',
-+ (core.modules.basic_modules.String,
-+ ""))
-+reg.add_input_port(Variable, 'type',
-+ (core.modules.basic_modules.String,
-+ "variable, axis, or weighted-axis"))
-+reg.add_input_port(Variable, 'inputVariable',
-+ (core.modules.basic_modules.List,
-+ ""))
-+reg.add_output_port(Variable, 'variable',
-+ (get_late_type('cdms2.tvariable.TransientVariable'),
-+ ""))
-+reg.add_input_port(Variable, 'axes',
-+ (core.modules.basic_modules.String, "Axes of variables"))
-+reg.add_input_port(Variable, 'axesOperations',
-+ (core.modules.basic_modules.String, "Axes Operations"))
-+reg.add_input_port(Variable, 'cdmsfile',
-+ (CdmsFile, "cdmsfile"))
-+
-+reg.add_module(GraphicsMethod, namespace='cdat')
-+reg.add_input_port(GraphicsMethod, 'gmName',
-+ (core.modules.basic_modules.String,
-+ "Get the graphics method object of the given name."))
-+reg.add_input_port(GraphicsMethod, 'plotType',
-+ (core.modules.basic_modules.String, "Plot type"))
-+reg.add_input_port(GraphicsMethod, 'slab1',
-+ (get_late_type('cdms2.tvariable.TransientVariable'),
-+ "slab1"))
-+reg.add_input_port(GraphicsMethod, 'slab2',
-+ (get_late_type('cdms2.tvariable.TransientVariable'),
-+ "slab2"))
-+reg.add_input_port(GraphicsMethod, 'color_1',
-+ (core.modules.basic_modules.Integer, "color_1"), True)
-+reg.add_input_port(GraphicsMethod, 'color_2',
-+ (core.modules.basic_modules.Integer, "color_2"), True)
-+reg.add_input_port(GraphicsMethod, 'level_1',
-+ (core.modules.basic_modules.Float, "level_1"), True)
-+reg.add_input_port(GraphicsMethod, 'level_2',
-+ (core.modules.basic_modules.Float, "level_2"), True)
-+reg.add_output_port(GraphicsMethod, 'slab1',
-+ (get_late_type('cdms2.tvariable.TransientVariable'),
-+ "slab1"))
-+reg.add_output_port(GraphicsMethod, 'slab2',
-+ (get_late_type('cdms2.tvariable.TransientVariable'),
-+ "slab2"))
-+reg.add_output_port(GraphicsMethod, 'canvas', (Canvas, "Canvas object"))
-+
-+# end of cdatwindow_init_inc.py
-+##########################################################################
-+
-
--
diff --git a/debian/patches/run.patch b/debian/patches/run.patch
deleted file mode 100644
index 90fc7a3..0000000
--- a/debian/patches/run.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Standardize the install of vistrails for packaging.
- Don't call apt, etc. in distribution packages.
-Forwarded: not-needed
-Last-Updated: 2014-04-06
-
-Index: vistrails-2.1.1/vistrails/run.py
-===================================================================
---- vistrails-2.1.1.orig/vistrails/run.py 2014-04-05 00:17:37.000000000 +0100
-+++ vistrails-2.1.1/vistrails/run.py 2014-04-05 02:25:55.061984526 +0100
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python2.7
- ###############################################################################
- ##
- ## Copyright (C) 2011-2014, NYU-Poly.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vistrails.git
More information about the debian-science-commits
mailing list