d/install: Migrate to new SOVERSION

diff --git a/debian/control b/debian/control
index 4385f4bbf17a3912ef75d1972c2b340bde976981..ec7b8de8a62f0631fde5356b1770fac1d38619d8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -49,12 +49,10 @@ Description: OFFIS DICOM toolkit data files
  .
  This package contains the DCMTK data files.
 
-Package: libdcmtk18
+Package: libdcmtk19
 Architecture: any
 Section: libs
 Depends: dcmtk-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
-Breaks: libdcmtk16 (= 3.6.7-1)
-Replaces: libdcmtk16 (= 3.6.7-1)
 Multi-Arch: same
 Description: OFFIS DICOM toolkit runtime libraries
  DCMTK includes a collection of libraries and applications for examining,
@@ -70,14 +68,14 @@ Description: OFFIS DICOM toolkit runtime libraries
 Package: libdcmtk-dev
 Architecture: any
 Section: libdevel
-Depends: libdcmtk18 (= ${binary:Version}),
+Depends: libdcmtk19 (= ${binary:Version}),
          libnsl-dev,
          libwrap0-dev,
          libxml2-dev,
          libz-dev,
          ${misc:Depends}
 Suggests: dcmtk-doc
-Provides: libdcmtk18-dev
+Provides: libdcmtk19-dev
 Description: OFFIS DICOM toolkit development libraries and headers
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,

diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install
index 7045a5595879a074668cee1e08ed89c6935a36b8..91277687c5ee86b63dc46cea4d6be3300c4fef05 100644 (file)
--- a/debian/dcmtk-data.install
+++ b/debian/dcmtk-data.install
@@ -1,3 +1,3 @@
-usr/share/dcmtk/*.dic
-usr/share/dcmtk/csmapper/
-usr/share/dcmtk/esdb/
+usr/share/dcmtk-3.6.9/*.dic
+usr/share/dcmtk-3.6.9/csmapper/
+usr/share/dcmtk-3.6.9/esdb/

diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 253157005d3b415ef7105628dafd4ed41a4ca00e..6c84575f3a4785932854e1b29dbff8d0208eb4ca 100644 (file)
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-usr/share/dcmtk/wlistdb
-usr/share/dcmtk/wlistqry
+usr/share/dcmtk-3.6.9/wlistdb
+usr/share/dcmtk-3.6.9/wlistqry

diff --git a/debian/libdcmtk18.install b/debian/libdcmtk18.install
deleted file mode 100644 (file)
index 3de3b10..0000000
--- a/debian/libdcmtk18.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so.*

diff --git a/debian/libdcmtk18.lintian-overrides b/debian/libdcmtk18.lintian-overrides
deleted file mode 100644 (file)
index f0c67bd..0000000
--- a/debian/libdcmtk18.lintian-overrides
+++ /dev/null
@@ -1,5 +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
-libdcmtk18: package-name-doesnt-match-sonames
-libdcmtk18: embedded-library
-libdcmtk18: no-symbols-control-file

diff --git a/debian/libdcmtk19.install b/debian/libdcmtk19.install
new file mode 100644 (file)
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libdcmtk19.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*

diff --git a/debian/libdcmtk19.lintian-overrides b/debian/libdcmtk19.lintian-overrides
new file mode 100644 (file)
index 0000000..d55e514
--- /dev/null
+++ b/debian/libdcmtk19.lintian-overrides
@@ -0,0 +1,5 @@
+# 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
+libdcmtk19: package-name-doesnt-match-sonames
+libdcmtk19: embedded-library
+libdcmtk19: no-symbols-control-file

diff --git a/debian/rules b/debian/rules
index 28f5698d062228a74804ee56a2ecc01e48f9557a..a33f37f1d24d4ee875edcf1305fc180639b5ff95 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -96,12 +96,6 @@ override_dh_installdocs:
 
 override_dh_install-arch:
        dh_install # --list-missing
-       #remove test binaries
-       rm ./debian/dcmtk/usr/bin/*_tests
-       rm ./debian/dcmtk/usr/bin/drttest
-       rm ./debian/dcmtk/usr/bin/mkreport
-       rm ./debian/dcmtk/usr/bin/msgserv
-       rm ./debian/dcmtk/usr/bin/wltest
 
 
 .PHONY: get-orig-source