Control: tags 791022 + patch pending
On Fri, 03 Jul 2015 at 13:09:39 +0000, Matthias Klose wrote:
> The libstdc++6 transition will be a large one, and it will come with a
> lot of pain. Please help it by preparing the follow-up transitions.
I have uploaded the attached NMU to DELAYED/2. Please tell me if I should
cancel or reschedule it.
S
diffstat for dcmtk-3.6.0 dcmtk-3.6.0
changelog | 8 ++++++++
control | 18 ++++++++++++------
libdcmtk2.dirs | 2 --
libdcmtk2.lintian-overrides | 6 ------
libdcmtk2v5.dirs | 2 ++
libdcmtk2v5.lintian-overrides | 6 ++++++
rules | 8 ++++----
7 files changed, 32 insertions(+), 18 deletions(-)
diff -Nru dcmtk-3.6.0/debian/changelog dcmtk-3.6.0/debian/changelog
--- dcmtk-3.6.0/debian/changelog 2013-09-02 10:07:08.000000000 +0100
+++ dcmtk-3.6.0/debian/changelog 2015-08-23 15:05:28.000000000 +0100
@@ -1,3 +1,11 @@
+dcmtk (3.6.0-15.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rename libdcmtk2 to libdcmtk2v5 for libstdc++ ABI transition,
+ based on Ubuntu patches from Steve Langasek (Closes: #791022)
+
+ -- Simon McVittie <s...@debian.org> Sun, 23 Aug 2015 15:04:07 +0100
+
dcmtk (3.6.0-15) unstable; urgency=low
* Transition to Apache 2.4. Closes: #669740
diff -Nru dcmtk-3.6.0/debian/control dcmtk-3.6.0/debian/control
--- dcmtk-3.6.0/debian/control 2013-09-02 10:07:08.000000000 +0100
+++ dcmtk-3.6.0/debian/control 2015-08-23 15:05:52.000000000 +0100
@@ -36,11 +36,15 @@
.
Note: This version was compiled with libssl support.
-Package: libdcmtk2
+Package: libdcmtk2v5
Section: libs
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: dcmtk (<< 3.6.0)
+Conflicts:
+ dcmtk (<< 3.6.0),
+ libdcmtk2,
+Replaces:
+ libdcmtk2,
Description: OFFIS DICOM toolkit runtime libraries
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
@@ -55,7 +59,7 @@
Package: libdcmtk2-dev
Section: libdevel
Architecture: any
-Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libdcmtk2v5 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Conflicts: libdcmtk1-dev
Replaces: libdcmtk1-dev
Provides: libdcmtk-dev
@@ -101,15 +105,17 @@
This package contains the on-line documentation for the DCMTK libraries
and utilities in HTML format.
-Package: libdcmtk2-dbg
+Package: libdcmtk2v5-dbg
Section: debug
Architecture: any
Priority: extra
-Depends: libdcmtk2 (= ${binary:Version}), ${misc:Depends}
+Depends: libdcmtk2v5 (= ${binary:Version}), ${misc:Depends}
+Conflicts: libdcmtk2-dbg
+Replaces: libdcmtk2-dbg
Description: OFFIS DICOM toolkit library debugging symbols
DCMTK includes a collection of libraries and applications for examining,
constructing and converting DICOM image files, handling offline media,
sending and receiving images over a network connection, as well as
demonstrative image storage and worklist servers.
.
- This package contains the debugging symbols for libdcmtk2.
+ This package contains the debugging symbols for libdcmtk2v5.
diff -Nru dcmtk-3.6.0/debian/libdcmtk2.dirs dcmtk-3.6.0/debian/libdcmtk2.dirs
--- dcmtk-3.6.0/debian/libdcmtk2.dirs 2013-05-29 13:39:32.000000000 +0100
+++ dcmtk-3.6.0/debian/libdcmtk2.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib
-usr/share/libdcmtk2
diff -Nru dcmtk-3.6.0/debian/libdcmtk2.lintian-overrides dcmtk-3.6.0/debian/libdcmtk2.lintian-overrides
--- dcmtk-3.6.0/debian/libdcmtk2.lintian-overrides 2011-08-23 16:40:31.000000000 +0100
+++ dcmtk-3.6.0/debian/libdcmtk2.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-# There is more than one library in one package bundles which makes perfectly
-# sense in this application but does not enable naming the library package apropriately
-libdcmtk2: package-name-doesnt-match-sonames libdcmdata2 libdcmdsig2 libdcmimage2 libdcmimgle2 libdcmjpeg2 libdcmjpls2 libdcmnet2 libdcmpstat2 libdcmqrdb2 libdcmsr2 libdcmtls2 libdcmwlm2 libi2d2 libijg12-2 libijg16-2 libijg8-2 liboflog2 libofstd2
-libdcmtk2: embedded-library usr/lib/libijg12.so.2.0.0: libjpeg
-libdcmtk2: embedded-library usr/lib/libijg16.so.2.0.0: libjpeg
-libdcmtk2: embedded-library usr/lib/libijg8.so.2.0.0: libjpeg
diff -Nru dcmtk-3.6.0/debian/libdcmtk2v5.dirs dcmtk-3.6.0/debian/libdcmtk2v5.dirs
--- dcmtk-3.6.0/debian/libdcmtk2v5.dirs 1970-01-01 01:00:00.000000000 +0100
+++ dcmtk-3.6.0/debian/libdcmtk2v5.dirs 2013-05-29 13:39:32.000000000 +0100
@@ -0,0 +1,2 @@
+usr/lib
+usr/share/libdcmtk2
diff -Nru dcmtk-3.6.0/debian/libdcmtk2v5.lintian-overrides dcmtk-3.6.0/debian/libdcmtk2v5.lintian-overrides
--- dcmtk-3.6.0/debian/libdcmtk2v5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ dcmtk-3.6.0/debian/libdcmtk2v5.lintian-overrides 2015-08-23 15:01:45.000000000 +0100
@@ -0,0 +1,6 @@
+# There is more than one library in one package bundles which makes perfectly
+# sense in this application but does not enable naming the library package apropriately
+libdcmtk2v5: package-name-doesnt-match-sonames libdcmdata2 libdcmdsig2 libdcmimage2 libdcmimgle2 libdcmjpeg2 libdcmjpls2 libdcmnet2 libdcmpstat2 libdcmqrdb2 libdcmsr2 libdcmtls2 libdcmwlm2 libi2d2 libijg12-2 libijg16-2 libijg8-2 liboflog2 libofstd2
+libdcmtk2v5: embedded-library usr/lib/libijg12.so.2.0.0: libjpeg
+libdcmtk2v5: embedded-library usr/lib/libijg16.so.2.0.0: libjpeg
+libdcmtk2v5: embedded-library usr/lib/libijg8.so.2.0.0: libjpeg
diff -Nru dcmtk-3.6.0/debian/rules dcmtk-3.6.0/debian/rules
--- dcmtk-3.6.0/debian/rules 2013-05-29 13:39:32.000000000 +0100
+++ dcmtk-3.6.0/debian/rules 2015-08-23 15:06:05.000000000 +0100
@@ -12,7 +12,7 @@
# Package installation directories
pkg=dcmtk
PKGDIR_DCMTK=$(CURDIR)/debian/$(pkg)
-PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk2
+PKGDIR_DCMTK_LIB=$(CURDIR)/debian/libdcmtk2v5
PKGDIR_DCMTK_DEV=$(CURDIR)/debian/libdcmtk2-dev
PKGDIR_DCMTK_DOC=$(CURDIR)/debian/$(pkg)-doc
PKGDIR_DCMTK_WWW=$(CURDIR)/debian/$(pkg)-www
@@ -166,7 +166,7 @@
dh_install -i
dh_link -i
dh_lintian -i
- dh_strip --dbg-package=libdcmtk2-dbg -i
+ dh_strip --dbg-package=libdcmtk2v5-dbg -i
dh_compress -i
dh_fixperms -i
dh_installdeb -i
@@ -189,13 +189,13 @@
mv $(PKGDIR_DCMTK)/usr/share/libdcmtk2/*.dic $(PKGDIR_DCMTK_LIB)/usr/share/libdcmtk2/
dh_link -a
dh_lintian -a
- dh_strip --dbg-package=libdcmtk2-dbg -a
+ dh_strip --dbg-package=libdcmtk2v5-dbg -a
dh_compress -a
dh_fixperms -a
dh_perl -a
dh_makeshlibs -a -V
dh_installdeb -a
- dh_shlibdeps -a -l debian/libdcmtk2/usr/lib
+ dh_shlibdeps -a -l debian/libdcmtk2v5/usr/lib
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a
