[vistrails] 19/19: Fix dependencies

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository vistrails.

commit 06c30e15d0a862b74988b942d1f7ec6e3cc01613
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 18 11:43:48 2016 +0000

    Fix dependencies
---
 debian/changelog              |  4 ++--
 debian/control                |  3 ++-
 debian/patches/packages.patch | 18 ++++++++++++++++++
 debian/patches/series         |  1 +
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36696ae..80e589c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-vistrails (2.2.4-1) UNRELEASED; urgency=medium
+vistrails (2.2.4-1) unstable; urgency=medium
 
   * New upstream release
   * Standards-Version: 3.9.8
@@ -9,7 +9,7 @@ vistrails (2.2.4-1) UNRELEASED; urgency=medium
     Closes: #840525, #796994
   * Now depend on python-usagestats
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 13 Sep 2016 12:53:53 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 18 Dec 2016 11:43:33 +0000
 
 vistrails (2.2-2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 80d5625..ce241fb 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Section: science
 Architecture: all 
 Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-qt4, python-matplotlib, 
   python-suds, python-sip, jupyter-qtconsole, python-sklearn,
-  python-vtk6, python-qt4-gl, python-qt4-sql, python-usagestats
+  python-vtk6, python-qt4-gl, python-qt4-sql, python-usagestats,
+  python-xlrd, python-sqlalchemy
 Description: Science visualisation workflow toolkit
  VisTrails is an open-source scientific workflow and provenance management
  system developed at the University of Utah that provides support for 
diff --git a/debian/patches/packages.patch b/debian/patches/packages.patch
new file mode 100644
index 0000000..0db0ff0
--- /dev/null
+++ b/debian/patches/packages.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Change name of dependency; now jupyter in Debian
+Last-Updated: 2016-12-18
+Forwarded: no
+
+Index: vistrails-2.2.4/vistrails/gui/shell.py
+===================================================================
+--- vistrails-2.2.4.orig/vistrails/gui/shell.py
++++ vistrails-2.2.4/vistrails/gui/shell.py
+@@ -65,7 +65,7 @@ def get_shell_dialog():
+     try:
+         deps = {'pip': 'ipython>=1.0',
+                 'linux-ubuntu': 'ipython-qtconsole',
+-                'linux-debian': 'ipython-qtconsole'}
++                'linux-debian': 'jupyter-qtconsole'}
+ 
+         IPython = py_import('IPython.qt.console.rich_ipython_widget', deps,
+                             True)
diff --git a/debian/patches/series b/debian/patches/series
index d851e26..f2d416c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 paths.patch
+packages.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vistrails.git