d/rules: Add dcmtk-data package

diff --git a/debian/control b/debian/control
index cf06adf7b0b66e682853db9164f3592ba86c05ae..7526c7a3098b6e796ec04d9a8273e04c770aba32 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
 Source: dcmtk
 Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
-Uploaders: Gert Wollny <gewo@debian.org>,
-           Mathieu Malaterre <malat@debian.org>
+Uploaders: Gert Wollny <gewo@debian.org>, Mathieu Malaterre <malat@debian.org>
 Section: science
 Priority: optional
 Build-Depends: cmake,
@@ -14,9 +13,9 @@ Build-Depends: cmake,
                libtiff-dev,
                libwrap0-dev,
                libxml2-dev,
+               xxd,
                zlib1g-dev
-Build-Depends-Indep: doxygen,
-                     graphviz
+Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 4.6.1
 Vcs-Browser: https://salsa.debian.org/med-team/dcmtk
 Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git
@@ -25,9 +24,7 @@ Rules-Requires-Root: no
 
 Package: dcmtk
 Architecture: any
-Depends: adduser,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: adduser, ${misc:Depends}, ${shlibs:Depends}
 Description: OFFIS DICOM toolkit command line utilities
  DCMTK includes a collection of libraries and applications for examining,
  constructing and converting DICOM image files, handling offline media,
@@ -38,11 +35,22 @@ Description: OFFIS DICOM toolkit command line utilities
  .
  Note: This version was compiled with libssl support.
 
-Package: libdcmtk17
+Package: dcmtk-data
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: OFFIS DICOM toolkit data files
+ 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 DCMTK data files.
+
+Package: libdcmtk18
 Architecture: any
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: dcmtk-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libdcmtk16 (= 3.6.7-1)
 Replaces: libdcmtk16 (= 3.6.7-1)
 Multi-Arch: same
@@ -60,7 +68,7 @@ Description: OFFIS DICOM toolkit runtime libraries
 Package: libdcmtk-dev
 Architecture: any
 Section: libdevel
-Depends: libdcmtk17 (= ${binary:Version}),
+Depends: libdcmtk18 (= ${binary:Version}),
          libpng-dev,
          libssl-dev,
          libtiff-dev,
@@ -68,7 +76,7 @@ Depends: libdcmtk17 (= ${binary:Version}),
          libxml2-dev,
          ${misc:Depends}
 Suggests: dcmtk-doc
-Provides: libdcmtk17-dev
+Provides: libdcmtk18-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,
@@ -85,8 +93,7 @@ Package: dcmtk-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Suggests: dcmtk,
-          libdcmtk-dev
+Suggests: dcmtk, libdcmtk-dev
 Multi-Arch: foreign
 Description: OFFIS DICOM toolkit documentation
  DCMTK includes a collection of libraries and applications for examining,

diff --git a/debian/rules b/debian/rules
index ecefa16f1ba760fc8987a9e8233fb1fb112b41db..5b2a3c8dd48fefe0007087d9218b256e92d8535c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,9 +36,10 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \
  -DDCMTK_WITH_ZLIB:BOOL=ON \
  -DDCMTK_WITH_ICONV:BOOL=OFF \
  -DDCMTK_WITH_ICU:BOOL=OFF \
+ -DDCMTK_WITH_STDLIBC_ICONV:BOOL=OFF \
  -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \
  -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk17 \
+ -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk18 \
  -DCMAKE_SKIP_RPATH:BOOL=OFF \
  -DDCMTK_ENABLE_STL:BOOL=ON \
  -DCMAKE_CXX_STANDARD:STRING=17
@@ -80,8 +81,6 @@ override_dh_install-arch:
        rm ./debian/dcmtk/usr/bin/mkreport
        rm ./debian/dcmtk/usr/bin/msgserv
        rm ./debian/dcmtk/usr/bin/wltest
-       rm ./debian/tmp/usr/share/dcmtk/SC.dump
-       rm ./debian/tmp/usr/share/dcmtk/VLP.dump
 
 
 .PHONY: get-orig-source