[med-svn] [Git][med-team/odil][master] 2 commits: set debhelper with Build-Depends: debhelper-compat (= 12)

Drew Parsons gitlab at salsa.debian.org
Tue Sep 3 18:58:55 BST 2019



Drew Parsons pushed to branch master at Debian Med / odil


Commits:
d4cc2a27 by Drew Parsons at 2019-09-03T17:22:13Z
set debhelper with Build-Depends: debhelper-compat (= 12)

- - - - -
922a0499 by Drew Parsons at 2019-09-03T17:30:08Z
remove python-odil package (Python2 removal)

Closes: #937183.

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- − debian/python-odil.install
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,6 +1,8 @@
 odil (0.10.0-4) UNRELEASED; urgency=medium
 
   * Standards-Version: 4.4.0
+  * set debhelper with Build-Depends: debhelper-compat (= 12)
+  * remove python-odil package (Python2 removal). Closes: #937183.
 
  -- Drew Parsons <dparsons at debian.org>  Wed, 04 Sep 2019 01:20:07 +0800
 


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-12


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Julien Lamy <lamy at unistra.fr>
 Section: science
 Testsuite: autopkgtest-pkg-python
 Priority: optional
-Build-Depends: debhelper (>= 12~),
+Build-Depends: debhelper-compat (= 12),
                d-shlibs (>= 0.81),
                dh-python,
                cmake,
@@ -21,14 +21,11 @@ Build-Depends: debhelper (>= 12~),
                libboost-log-dev,
                libboost-python-dev,
                pybind11-dev,
-               python-pybind11,
                python3-pybind11,
                libboost-test-dev,
                chrpath,
                dcmtk,
-               python-dev,
                python3-dev,
-               python-nose,
                python3-nose
 Build-Depends-Indep: doxygen,
                      graphviz
@@ -100,23 +97,6 @@ Description: C++11 library for the DICOM standard (documentation)
  .
  This package contains the documentation files.
 
-Package: python-odil
-Architecture: any
-Multi-Arch: foreign
-Section: python
-Depends: libodil0 (= ${binary:Version}),
-         ${shlibs:Depends},
-         ${python:Depends},
-         ${misc:Depends}
-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
- error handling, generic access to datasets elements, standard JSON and XML
- representation of datasets, and generic implementation of messages, clients
- and servers for the various DICOM protocols.
- .
- This package contains the Python wrappers.
-
 Package: python3-odil
 Architecture: any
 Multi-Arch: foreign


=====================================
debian/python-odil.install deleted
=====================================
@@ -1,2 +0,0 @@
-usr/lib/python2*/dist-packages/odil/*so
-usr/lib/python2*/dist-packages/odil/*py


=====================================
debian/rules
=====================================
@@ -6,12 +6,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DCMDICTPATH=$(shell ls /usr/share/libdcmtk*/dicom.dic | head -n 1)
 
 # Find all Python versions
-PYTHON2=$(shell pyversions -vrd)
 PYTHON3=$(shell py3versions -vrd)
-ALLPY=$(PYTHON2) $(PYTHON3)
+ALLPY=$(PYTHON3)
 
 %:
-	dh $@ --builddirectory=build --with python2,python3
+	dh $@ --builddirectory=build --with python3
 
 # Base build: no wrappers
 override_dh_auto_configure-arch:
@@ -119,9 +118,6 @@ override_dh_clean:
 	find tests -name "*pyc" -delete
 	rm -rf build-nopy $(ALLPY:%=build-py%) build-indep documentation/_build
 
-override_dh_dwz:
-	echo "Ignore dh_dwz due to 'dwz -q -- debian/python-odil/usr/lib/python2.7/dist-packages/odil/_odil.x86_64-linux-gnu.so returned exit code 1'"
-
 # These steps are not needed for arch-independent packages
 override_dh_auto_configure-indep:
 override_dh_auto_test-indep:



View it on GitLab: https://salsa.debian.org/med-team/odil/compare/84ba68eb39239e8b8646f730211892b6195bbfe3...922a0499d8823f08e5775052e30b550224163bf6

-- 
View it on GitLab: https://salsa.debian.org/med-team/odil/compare/84ba68eb39239e8b8646f730211892b6195bbfe3...922a0499d8823f08e5775052e30b550224163bf6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190903/370a3eaa/attachment-0001.html>


More information about the debian-med-commit mailing list