diff -Nru nipype-1.1.1/debian/changelog nipype-1.1.1/debian/changelog --- nipype-1.1.1/debian/changelog 2018-08-03 17:00:43.000000000 +0000 +++ nipype-1.1.1/debian/changelog 2018-08-09 18:26:03.000000000 +0000 @@ -1,3 +1,12 @@ +nipype (1.1.1-2) unstable; urgency=medium + + * debian/control + - point vcs fields to salsa + * debian/patches/deb_simplify_requires temporary patch to resolve + uninstallable state on older debian/ubuntus + + -- Yaroslav Halchenko Thu, 09 Aug 2018 14:26:03 -0400 + nipype (1.1.1-1) unstable; urgency=medium * Fresh upstream release diff -Nru nipype-1.1.1/debian/control nipype-1.1.1/debian/control --- nipype-1.1.1/debian/control 2018-08-03 17:00:43.000000000 +0000 +++ nipype-1.1.1/debian/control 2018-08-09 18:26:03.000000000 +0000 @@ -28,8 +28,8 @@ ipython (>= 1~) | ipython1x, Build-Conflicts: python-networkx (<=1.0~rc1~) Homepage: http://nipy.sourceforge.net/nipype/ -Vcs-Git: git://git.debian.org/git/pkg-exppsy/nipype.git -Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/nipype.git +Vcs-Git: https://salsa.debian.org/neurodebian-team/nipype.git +Vcs-Browser: https://salsa.debian.org/neurodebian-team/nipype Standards-Version: 4.1.2 diff -Nru nipype-1.1.1/debian/patches/deb_no_explicit_pydot nipype-1.1.1/debian/patches/deb_no_explicit_pydot --- nipype-1.1.1/debian/patches/deb_no_explicit_pydot 2018-08-03 17:00:43.000000000 +0000 +++ nipype-1.1.1/debian/patches/deb_no_explicit_pydot 2018-08-09 18:26:03.000000000 +0000 @@ -9,5 +9,5 @@ + # 'pydotplus', + # 'pydot>=%s' % PYDOT_MIN_VERSION, 'packaging', - 'futures; python_version == "2.7"', + 'futures', ] diff -Nru nipype-1.1.1/debian/patches/deb_simplify_requires nipype-1.1.1/debian/patches/deb_simplify_requires --- nipype-1.1.1/debian/patches/deb_simplify_requires 1970-01-01 00:00:00.000000000 +0000 +++ nipype-1.1.1/debian/patches/deb_simplify_requires 2018-08-09 18:26:03.000000000 +0000 @@ -0,0 +1,21 @@ +From: Yaroslav Halchenko +Subject: BF(TEMP): remove python_version== from requires spec + + Is not understood by older dh_python e.g. on debian stretch + leading to a bizzare dependency. It would need to be removed for + python3 support + +Origin: NeuroDebian +Last-Update: 2018-08-09 + +--- a/nipype/info.py ++++ b/nipype/info.py +@@ -148,7 +148,7 @@ REQUIRES = [ + 'pydotplus', + 'pydot>=%s' % PYDOT_MIN_VERSION, + 'packaging', +- 'futures; python_version == "2.7"', ++ 'futures', + ] + + if sys.version_info <= (3, 4): diff -Nru nipype-1.1.1/debian/patches/series nipype-1.1.1/debian/patches/series --- nipype-1.1.1/debian/patches/series 2018-08-03 17:00:43.000000000 +0000 +++ nipype-1.1.1/debian/patches/series 2018-08-09 18:26:03.000000000 +0000 @@ -1,3 +1,4 @@ +deb_simplify_requires deb_pytest_xdist_no-nauto deb_no_explicit_pydot deb_imgmath_optional