From: Mathieu Malaterre <malat@debian.org>
Date: Mon, 7 Nov 2022 09:43:52 +0000 (+0100)
Subject: d/install: Start migrating to new 18 ABI
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~63
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=49fcfd8762b6ac129740b9c2cfaa8f3032c2651f;p=dcmtk.git

d/install: Start migrating to new 18 ABI
---

diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install
new file mode 100644
index 00000000..c4b0a17c
--- /dev/null
+++ b/debian/dcmtk-data.install
@@ -0,0 +1,3 @@
+usr/share/dcmtk-*/*.dic
+usr/share/dcmtk-*/esdb/
+usr/share/dcmtk-*/csmapper/
diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base
index eb33f9e6..cae97d1c 100644
--- a/debian/dcmtk-doc.doc-base
+++ b/debian/dcmtk-doc.doc-base
@@ -8,5 +8,5 @@ Abstract:  This manual comprises the complete on-line documentation for the
 Section: Science/Medicine
 
 Format: HTML
-Index: /usr/share/doc/dcmtk/dcmtk/html/index.html
-Files: /usr/share/doc/dcmtk/dcmtk/html/*
+Index: /usr/share/doc/dcmtk-*/dcmtk/html/index.html
+Files: /usr/share/doc/dcmtk-*/dcmtk/html/*
diff --git a/debian/dcmtk-doc.docs b/debian/dcmtk-doc.docs
index 470bae5f..9c1434e7 100644
--- a/debian/dcmtk-doc.docs
+++ b/debian/dcmtk-doc.docs
@@ -1 +1 @@
-usr/share/doc/dcmtk/
+usr/share/doc/dcmtk-*/
diff --git a/debian/dcmtk.examples b/debian/dcmtk.examples
index 2c44e66e..5f0305a0 100644
--- a/debian/dcmtk.examples
+++ b/debian/dcmtk.examples
@@ -1,2 +1,2 @@
-debian/tmp/usr/share/dcmtk/wlistdb
-debian/tmp/usr/share/dcmtk/wlistqry
+usr/share/dcmtk-*/wlistdb
+usr/share/dcmtk-*/wlistqry
diff --git a/debian/dcmtk.install b/debian/dcmtk.install
index 9c2b398c..4d647310 100644
--- a/debian/dcmtk.install
+++ b/debian/dcmtk.install
@@ -1,7 +1,8 @@
-etc/dcmtk/*
+etc/dcmtk-*/*
 usr/bin/*
-usr/share/dcmtk/*.css
-usr/share/dcmtk/*.lut
-usr/share/dcmtk/dcm2xml.dtd
-usr/share/dcmtk/dsr2xml.xsd
-usr/share/dcmtk/dumppat.txt
+usr/share/dcmtk-*/*.css
+usr/share/dcmtk-*/*.lut
+usr/share/dcmtk-*/dcm2xml.dtd
+usr/share/dcmtk-*/dsr2xml.xsd
+usr/share/dcmtk-*/dumppat.txt
+usr/share/dcmtk-*/*.dump
diff --git a/debian/libdcmtk-dev.install b/debian/libdcmtk-dev.install
index e6e70000..c6ffc6e6 100644
--- a/debian/libdcmtk-dev.install
+++ b/debian/libdcmtk-dev.install
@@ -1,4 +1,4 @@
 usr/include/dcmtk/*
 usr/lib/*/*.so
 usr/lib/*/cmake/
-usr/lib/*/pkgconfig
\ No newline at end of file
+usr/lib/*/pkgconfig
diff --git a/debian/libdcmtk17.install b/debian/libdcmtk17.install
deleted file mode 100644
index 59844d52..00000000
--- a/debian/libdcmtk17.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/*.so.*
-usr/share/libdcmtk17/*.dic
diff --git a/debian/libdcmtk17.lintian-overrides b/debian/libdcmtk17.lintian-overrides
deleted file mode 100644
index 92ea7680..00000000
--- a/debian/libdcmtk17.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
-libdcmtk17: package-name-doesnt-match-sonames
-libdcmtk17: embedded-library
-libdcmtk17: no-symbols-control-file
diff --git a/debian/libdcmtk18.install b/debian/libdcmtk18.install
new file mode 100644
index 00000000..3de3b10a
--- /dev/null
+++ b/debian/libdcmtk18.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/libdcmtk18.lintian-overrides b/debian/libdcmtk18.lintian-overrides
new file mode 100644
index 00000000..92ea7680
--- /dev/null
+++ b/debian/libdcmtk18.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
+libdcmtk17: package-name-doesnt-match-sonames
+libdcmtk17: embedded-library
+libdcmtk17: no-symbols-control-file
diff --git a/debian/tests/control b/debian/tests/control
index 71db9e6c..06cec718 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: run-unit-test
-Depends: @, python3-pydicom
+Depends: python3-pydicom, @
 Restrictions: allow-stderr