debian/changelog

+odil (0.10.0-2) UNRELEASED; urgency=medium
+
+  * Team Upload
+
+  [ Matthias Klose ]
+  * Fix typo in build target, make the build a little bit more verbose.
+    Closes: #915396
+
+  [ Andreas Tille ]
+  * debhelper 11
+  * Testsuite: autopkgtest-pkg-python
+  * Secure URI in copyright format
+  * Respect DEB_BUILD_OPTIONS in override_dh_auto_test target
+  * Remove trailing whitespace in debian/control
+  * Remove trailing whitespace in debian/copyright
+  * Remove trailing whitespace in debian/rules
+
+ -- Andreas Tille <tille@debian.org>  Mon, 03 Dec 2018 15:06:56 +0100
+
 odil (0.10.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #914144)

debian/compat

-10
+11

debian/control

@@ -2,8 +2,9 @@ Source: odil
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 Uploaders: Julien Lamy <lamy@unistra.fr>
 Section: science
+Testsuite: autopkgtest-pkg-python
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                d-shlibs (>= 0.81),
                dh-python,
                cmake,
@@ -11,7 +12,7 @@ Build-Depends: debhelper (>= 10),
                pkg-config,
                libjsoncpp-dev,
                libdcmtk-dev | libdcmtk2-dev,
-               libicu-dev (>= 4.8.1.1),
+               libicu-dev,
                zlib1g-dev,
                uuid-dev,
                libboost-dev,
@@ -22,14 +23,15 @@ Build-Depends: debhelper (>= 10),
                pybind11-dev,
                python-pybind11,
                python3-pybind11,
-               libboost-test-dev (>= 1.46.1),
+               libboost-test-dev,
                chrpath,
-               dcmtk (>= 3.6.0),
+               dcmtk,
                python-dev,
                python3-dev,
                python-nose,
                python3-nose
-Build-Depends-Indep: doxygen, graphviz
+Build-Depends-Indep: doxygen,
+                     graphviz
 Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/odil
 Vcs-Git: https://salsa.debian.org/med-team/odil.git
@@ -37,13 +39,14 @@ Homepage: https://github.com/lamyj/odil
 
 Package: libodil0
 Architecture: any
+Multi-Arch: same
 Section: libs
+Testsuite: autopkgtest-pkg-python
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Provides: libdcmtkpp0
 Conflicts: libdcmtkpp0
+Provides: libdcmtkpp0
 Replaces: libdcmtkpp0
-Multi-Arch: same
 Description: C++11 library for the DICOM standard
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based
@@ -57,14 +60,18 @@ Description: C++11 library for the DICOM standard
 
 Package: libodil-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
+Testsuite: autopkgtest-pkg-python
 Depends: libodil0 (= ${binary:Version}),
          ${devlibs:Depends},
          ${misc:Depends}
-Provides: libodil0-dev, libdcmtkpp-dev
-Conflicts: libodil0-dev, libdcmtkpp-dev
-Replaces: libodil0-dev, libdcmtkpp-dev
-Multi-Arch: same
+Conflicts: libodil0-dev,
+           libdcmtkpp-dev
+Provides: libodil0-dev,
+          libdcmtkpp-dev
+Replaces: libodil0-dev,
+          libdcmtkpp-dev
 Description: C++11 library for the DICOM standard (development files)
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based
@@ -76,13 +83,17 @@ Description: C++11 library for the DICOM standard (development files)
 
 Package: libodil-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
+Testsuite: autopkgtest-pkg-python
 Depends: libjs-jquery,
          ${misc:Depends}
-Provides: libodil0-doc, libdcmtkpp0-doc
-Conflicts: libodil0-doc, libdcmtkpp0-doc
-Replaces: libodil0-doc, libdcmtkpp0-doc
-Multi-Arch: foreign
+Conflicts: libodil0-doc,
+           libdcmtkpp0-doc
+Provides: libodil0-doc,
+          libdcmtkpp0-doc
+Replaces: libodil0-doc,
+          libdcmtkpp0-doc
 Description: C++11 library for the DICOM standard (documentation)
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based
@@ -94,12 +105,13 @@ Description: C++11 library for the DICOM standard (documentation)
 
 Package: python-odil
 Architecture: any
+Multi-Arch: foreign
 Section: python
+Testsuite: autopkgtest-pkg-python
 Depends: libodil0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends}
-Multi-Arch: foreign
 Description: C++11 library for the DICOM standard (Python wrappers)
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based
@@ -111,12 +123,13 @@ Description: C++11 library for the DICOM standard (Python wrappers)
 
 Package: python3-odil
 Architecture: any
+Multi-Arch: foreign
 Section: python
+Testsuite: autopkgtest-pkg-python
 Depends: libodil0 (= ${binary:Version}),
          ${shlibs:Depends},
          ${python3:Depends},
          ${misc:Depends}
-Multi-Arch: foreign
 Description: C++11 library for the DICOM standard (Python 3 wrappers)
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based
@@ -128,7 +141,9 @@ Description: C++11 library for the DICOM standard (Python 3 wrappers)
 
 Package: odil
 Architecture: all
-Depends: python3-odil, ${python3:Depends}, ${misc:Depends}
+Depends: python3-odil,
+         ${python3:Depends},
+         ${misc:Depends}
 Description: C++11 library for the DICOM standard (application)
  Odil leverages C++ constructs to provide a user-friendly API of the
  different parts of the DICOM standard. Included in Odil are exception-based

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Odil
 Upstream-Contact: Julien Lamy <lamy@unistra.fr>
 Source: https://github.com/lamyj/odil

debian/rules

@@ -24,12 +24,14 @@ override_dh_auto_build-nopy:
 # WARNING: Python2 and Python3 MUST be built sequentially since they use the
 # same build directory
 override_dh_auto_build-py: override_dh_auto_build-nopy
+	set -e; \
 	for Python in $(ALLPY); do \
+	  echo "=== Building for Python $${Python} ==="; \
 	  cp -a build-nopy build; \
 	  dh_auto_configure -- \
 	    -DBUILD_EXAMPLES=OFF \
 	    -DBUILD_PYTHON_WRAPPERS=ON -DBUILD_JAVASCRIPT_WRAPPERS=OFF \
-	    -DPYTHON_EXECUTABLE=/usr/bin/python$${Python} \
+	    -DPYTHON_EXECUTABLE=/usr/bin/python$${Python}; \
 	  dh_auto_build; \
 	  mv build build-py$${Python}; \
 	done
@@ -47,15 +49,20 @@ override_dh_auto_build-indep:
 
 # Run C++ tests only on base build
 override_dh_auto_test-arch-nopy:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	ln -s build-nopy build
 	cd build && ../tests/run --no-network -e ".*"
 	rm build
+endif
 
 # Run Python tests only on python build
 # WARNING: Python2 and Python3 MUST be tested sequentially since they use the
 # same build directory
 override_dh_auto_test-arch-py: override_dh_auto_test-arch-nopy
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+	set -e; \
 	for Python in $(ALLPY); do \
+	  echo "=== Testing for Python $${Python} ==="; \
 	  ln -s build-py$${Python} build; \
 	  ln -sr ./build/wrappers/python ./build/odil; \
 	  ln -sr ./wrappers/python/*.py ./build/odil; \
@@ -68,6 +75,7 @@ override_dh_auto_test-arch-py: override_dh_auto_test-arch-nopy
 	  rm ./build/odil; \
 	  rm build; \
 	done
+endif
 
 override_dh_auto_test-arch: override_dh_auto_test-arch-nopy override_dh_auto_test-arch-py
 
@@ -79,7 +87,9 @@ override_dh_auto_install-arch-nopy:
 # WARNING: Python2 and Python3 MUST be installed sequentially since they use the
 # same build directory
 override_dh_auto_install-arch-py: override_dh_auto_install-arch-nopy
+	set -e; \
 	for Python in $(ALLPY); do \
+	  echo "=== Installing for Python $${Python} ==="; \
 	  ln -s build-py$${Python} build; \
 	  $(MAKE) -C build/wrappers/python install DESTDIR=$(CURDIR)/debian/tmp; \
 	  rm build; \