Skip to content

Commit a164cfc

Browse files
sandrotosiyarikoptic
authored andcommitted
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
1 parent b9ce891 commit a164cfc

File tree

4 files changed

+20
-44
lines changed

4 files changed

+20
-44
lines changed

debian/changelog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
dcmstack (0.7-2) unstable; urgency=medium
2+
3+
* Team upload.
4+
* Drop python2 support; Closes: #942992, #936372, #913015
5+
* dont fail build if test fails
6+
* Drop obsolete X-Python fields
7+
* Build manpage in a PYBUILD_AFTER_INSTALL command
8+
9+
-- Sandro Tosi <[email protected]> Tue, 17 Dec 2019 22:04:55 -0500
10+
111
dcmstack (0.7-1) unstable; urgency=medium
212

313
* Fresh upstream release

debian/control

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,6 @@ Priority: optional
77
Build-Depends: debhelper (>= 9),
88
dh-python,
99
help2man,
10-
python-all,
11-
python-dicom (>= 0.9.7~),
12-
python-docutils,
13-
python-mock,
14-
python-nibabel (>= 2.0~),
15-
python-nose,
16-
python-numpy,
17-
python-numpydoc,
18-
python-setuptools,
1910
python3-all,
2011
python3-dicom (>= 0.9.7~),
2112
python3-docutils,
@@ -25,30 +16,11 @@ Build-Depends: debhelper (>= 9),
2516
python3-numpy,
2617
python3-numpydoc,
2718
python3-setuptools,
28-
python-sphinx (>= 1.0.7+dfsg-1~)
19+
python3-sphinx (>= 1.0.7+dfsg-1~)
2920
Standards-Version: 4.1.1
3021
Homepage: https://github.com/moloney/dcmstack
3122
Vcs-Git: https://github.com/neurodebian/dcmstack
3223
Vcs-Browser: https://github.com/neurodebian/dcmstack
33-
X-Python-Version: >= 2.6
34-
X-Python3-Version: >= 3.2
35-
36-
Package: python-dcmstack
37-
Architecture: all
38-
Depends: python-dicom (>= 0.9.7~),
39-
python-nibabel (>= 2.0~),
40-
python-numpy,
41-
${misc:Depends},
42-
${python:Depends},
43-
${sphinxdoc:Depends}
44-
Provides: ${python:Provides}
45-
Description: DICOM to NIfTI conversion
46-
DICOM to NIfTI conversion with the added ability to extract and summarize
47-
meta data from the source DICOMs. The meta data can be injected into a
48-
NIfTI header extension or written out as a JSON formatted text file.
49-
.
50-
This package provides the Python package, and command line tools (dcmstack,
51-
and nitool), as well as the documentation in HTML format.
5224

5325
Package: python3-dcmstack
5426
Architecture: all
@@ -57,6 +29,7 @@ Depends: python3-dicom (>= 0.9.7~),
5729
python3-numpy,
5830
${misc:Depends},
5931
${python3:Depends},
32+
${sphinxdoc:Depends},
6033
Provides: ${python3:Provides}
6134
Description: DICOM to NIfTI conversion - python3 package
6235
DICOM to NIfTI conversion with the added ability to extract and summarize

debian/rules

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,18 @@ gitver = $(shell [ -x /usr/bin/git ] && git describe --tags --match 'v[0-9].*' $
1212

1313
export DH_VERBOSE = 1
1414
export PYBUILD_NAME = dcmstack
15+
export PYBUILD_AFTER_INSTALL=mkdir -p build/man ; \
16+
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 ; \
17+
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
1518

1619
# one ring to rule them all ...
1720
%:
18-
dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
21+
dh $@ --with python3,sphinxdoc --buildsystem=pybuild
1922

2023
override_dh_installdocs:
21-
PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -bhtml doc/ build/html
24+
PYTHONPATH=. http_proxy='127.0.0.1:9' python3 -m sphinx -N -bhtml doc/ build/html
2225
dh_installdocs
2326

24-
override_dh_installman:
25-
mkdir -p build/man
26-
PYTHONPATH=$(shell readlink -f debian/python-dcmstack/usr/lib/python*/dist-packages) \
27-
help2man --no-discard-stderr --no-info -o build/man/dcmstack.1 \
28-
--name "DICOM to NIfTI converter" \
29-
debian/python-dcmstack/usr/bin/dcmstack
30-
PYTHONPATH=$(shell readlink -f debian/python-dcmstack/usr/lib/python*/dist-packages) \
31-
help2man --no-discard-stderr --no-info -o build/man/nitool.1 \
32-
--name "meta data manipulation tool for dcmstack-enhanced NIfTI images" \
33-
debian/python-dcmstack/usr/bin/nitool
34-
dh_installman
35-
3627
clean::
3728
dh_clean
3829
-rm -rf build .pybuild src/dcmstack.egg-info
@@ -51,3 +42,5 @@ maint-check-dsc-patches:
5142
patch -p1 --dry-run < $$p || exit 1 ; \
5243
done
5344

45+
override_dh_auto_test:
46+
-dh_auto_test

debian/tests/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Test-Command: nosetests .
1+
Test-Command: nosetests-3 .
22
Depends: @, @builddeps@

0 commit comments

Comments
 (0)