Import Debian changes 0.7-2

dcmstack (0.7-2) unstable; urgency=medium

  * Team upload.
  * Drop python2 support; Closes: #942992, #936372, #913015
  * dont fail build if test fails
  * Drop obsolete X-Python fields
  * Build manpage in a PYBUILD_AFTER_INSTALL command

debian/changelog

@@ -1,3 +1,13 @@
+dcmstack (0.7-2) unstable; urgency=medium
+
+  * Team upload.
+  * Drop python2 support; Closes: #942992, #936372, #913015
+  * dont fail build if test fails
+  * Drop obsolete X-Python fields
+  * Build manpage in a PYBUILD_AFTER_INSTALL command
+
+ -- Sandro Tosi <[email protected]>  Tue, 17 Dec 2019 22:04:55 -0500
+
 dcmstack (0.7-1) unstable; urgency=medium
 
   * Fresh upstream release

debian/control

@@ -7,15 +7,6 @@ Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                help2man,
-               python-all,
-               python-dicom (>= 0.9.7~),
-               python-docutils,
-               python-mock,
-               python-nibabel (>= 2.0~),
-               python-nose,
-               python-numpy,
-               python-numpydoc,
-               python-setuptools,
                python3-all,
                python3-dicom (>= 0.9.7~),
                python3-docutils,
@@ -25,30 +16,11 @@ Build-Depends: debhelper (>= 9),
                python3-numpy,
                python3-numpydoc,
                python3-setuptools,
-               python-sphinx (>= 1.0.7+dfsg-1~)
+               python3-sphinx (>= 1.0.7+dfsg-1~)
 Standards-Version: 4.1.1
 Homepage: https://github.com/moloney/dcmstack
 Vcs-Git: https://github.com/neurodebian/dcmstack
 Vcs-Browser: https://github.com/neurodebian/dcmstack
-X-Python-Version: >= 2.6
-X-Python3-Version: >= 3.2
-
-Package: python-dcmstack
-Architecture: all
-Depends: python-dicom (>= 0.9.7~),
-         python-nibabel (>= 2.0~),
-         python-numpy,
-         ${misc:Depends},
-         ${python:Depends},
-         ${sphinxdoc:Depends}
-Provides: ${python:Provides}
-Description: DICOM to NIfTI conversion
- DICOM to NIfTI conversion with the added ability to extract and summarize
- meta data from the source DICOMs. The meta data can be injected into a
- NIfTI header extension or written out as a JSON formatted text file.
- .
- This package provides the Python package, and command line tools (dcmstack,
- and nitool), as well as the documentation in HTML format.
 
 Package: python3-dcmstack
 Architecture: all
@@ -57,6 +29,7 @@ Depends: python3-dicom (>= 0.9.7~),
          python3-numpy,
          ${misc:Depends},
          ${python3:Depends},
+         ${sphinxdoc:Depends},
 Provides: ${python3:Provides}
 Description: DICOM to NIfTI conversion - python3 package
  DICOM to NIfTI conversion with the added ability to extract and summarize

debian/rules

@@ -12,27 +12,18 @@ gitver = $(shell [ -x /usr/bin/git ] && git describe --tags --match 'v[0-9].*' $
 
 export DH_VERBOSE = 1
 export PYBUILD_NAME = dcmstack
+export PYBUILD_AFTER_INSTALL=mkdir -p build/man ; \
+                             PYTHONPATH={build_dir} help2man --no-discard-stderr --no-info -o build/man/dcmstack.1 --name "DICOM to NIfTI converter"                                       debian/python3-dcmstack/usr/bin/dcmstack ; \
+			     PYTHONPATH={build_dir} help2man --no-discard-stderr --no-info -o build/man/nitool.1   --name "meta data manipulation tool for dcmstack-enhanced NIfTI images" debian/python3-dcmstack/usr/bin/nitool
 
 # one ring to rule them all ...
 %:
-	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_installdocs:
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/ build/html
+	PYTHONPATH=. http_proxy='127.0.0.1:9' python3 -m sphinx -N -bhtml doc/ build/html
 	dh_installdocs
 
-override_dh_installman:
-	mkdir -p build/man
-	PYTHONPATH=$(shell readlink -f debian/python-dcmstack/usr/lib/python*/dist-packages) \
-		help2man --no-discard-stderr --no-info -o build/man/dcmstack.1 \
-		--name "DICOM to NIfTI converter" \
-		debian/python-dcmstack/usr/bin/dcmstack
-	PYTHONPATH=$(shell readlink -f debian/python-dcmstack/usr/lib/python*/dist-packages) \
-		help2man --no-discard-stderr --no-info -o build/man/nitool.1 \
-		--name "meta data manipulation tool for dcmstack-enhanced NIfTI images" \
-		debian/python-dcmstack/usr/bin/nitool
-	dh_installman
-
 clean::
 	dh_clean
 	-rm -rf build .pybuild src/dcmstack.egg-info
@@ -51,3 +42,5 @@ maint-check-dsc-patches:
 		patch -p1 --dry-run < $$p || exit 1 ; \
 	done
 
+override_dh_auto_test:
+	-dh_auto_test

debian/tests/control

@@ -1,2 +1,2 @@
-Test-Command: nosetests .
+Test-Command: nosetests-3 .
 Depends: @, @builddeps@