[vistrails] 17/19: Merge branch 'debian/2.2-branch' into debian/master

[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 2f3ec410fa2916c3d3a30daaf38ead75a3184a8a
Merge: f3ffde6 632e98a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 18 08:59:18 2016 +0000

    Merge branch 'debian/2.2-branch' into debian/master

 debian/changelog | 7 +++++++
 debian/control   | 5 +++++
 2 files changed, 12 insertions(+)

diff --cc debian/changelog
index 0e1321c,68265c4..36696ae
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,17 +1,23 @@@
 -vistrails (2.2-3) UNRELEASED; urgency=medium
 +vistrails (2.2.4-1) UNRELEASED; urgency=medium
  
 -  * Depend on jupyter-qtconsole
 +  * New upstream release
 +  * Standards-Version: 3.9.8
    * DH_COMPAT=10
 +  * Change dependency: ipython-qtconsole -> jupyter-qtconsole 
 +  * Build-Depend on dh-python
 +  * Update copyright owners; make copyright machine readable. 
 +    Closes: #840525, #796994
 +  * Now depend on python-usagestats
  
 - -- Alastair McKinstry <mckinstry at debian.org>  Sun, 18 Dec 2016 08:57:24 +0000
 + -- Alastair McKinstry <mckinstry at debian.org>  Tue, 13 Sep 2016 12:53:53 +0100
  
+ vistrails (2.2-2) unstable; urgency=medium
+ 
+   * Standards-Version: 3.9.8
+   * Drop dependency on ipython-qtconsole for the ipython5 transition
+ 
+  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 11 Oct 2016 15:16:02 +0100
+ 
  vistrails (2.2-1) unstable; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index 80d5625,faaf5be..2a3d4ea
--- a/debian/control
+++ b/debian/control
@@@ -10,8 -10,8 +10,13 @@@ Package: vistrail
  Section: science
  Architecture: all 
  Depends: ${misc:Depends}, ${python:Depends}, python-numpy, python-scipy, python-qt4, python-matplotlib, 
++<<<<<<< HEAD
 +  python-suds, python-sip, jupyter-qtconsole, python-sklearn,
 +  python-vtk6, python-qt4-gl, python-qt4-sql, python-usagestats
++=======
+   python-suds, python-sip, python-sklearn, jupyter-qtconsole,
+   python-vtk6, python-qt4-gl, python-qt4-sql
++>>>>>>> debian/2.2-branch
  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 

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