d/patches: Remove version from install paths

diff --git a/debian/dcmtk-data.install b/debian/dcmtk-data.install
index ffb532b150764741d80c0e870c6dc98beafcd542..7045a5595879a074668cee1e08ed89c6935a36b8 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/*.dic
+usr/share/dcmtk/csmapper/
+usr/share/dcmtk/esdb/

diff --git a/debian/dcmtk-doc.doc-base b/debian/dcmtk-doc.doc-base
index 761ca1fcaa0d6e9469107643838e9917693ed3be..eb33f9e611af790f977df0066cfa29ac8ac08f2f 100644 (file)
--- 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-3.6.8/html/index.html
-Files: /usr/share/doc/dcmtk/dcmtk-3.6.8/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 9c1434e790ebaa3c946debdfeac8a659bb2f60a6..470bae5f3af52d8f0d8dcd65a971361955bf8e3e 100644 (file)
--- 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 5f0305a08cc8f4a56b0437c73149a07473c2abde..253157005d3b415ef7105628dafd4ed41a4ca00e 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/wlistdb
+usr/share/dcmtk/wlistqry

diff --git a/debian/dcmtk.install b/debian/dcmtk.install
index 8f2456a4b69cdfb26a0e634b397153fd1ce77d53..3867465e680ea4300436714027b69e22bd18a67e 100644 (file)
--- a/debian/dcmtk.install
+++ b/debian/dcmtk.install
@@ -1,8 +1,8 @@
-etc/dcmtk-*/*
+etc/dcmtk/*
 usr/bin/*
-usr/share/dcmtk-*/*.css
-usr/share/dcmtk-*/*.dump
-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/*.dump
+usr/share/dcmtk/*.lut
+usr/share/dcmtk/dcm2xml.dtd
+usr/share/dcmtk/dsr2xml.xsd
+usr/share/dcmtk/dumppat.txt

diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch
index f15623b22f0b0608227d047e2462db90b6f5822a..4da6ebaffaec81521226d9639e6f2590a1e2487c 100644 (file)
--- a/debian/patches/07_dont_export_all_executables.patch
+++ b/debian/patches/07_dont_export_all_executables.patch
@@ -6,9 +6,11 @@ Description: Don't add executables to cmake exports
  to configure the according package. 
 Bug-Debian: https://bugs.debian.org/803304
 Author: Gert Wollny <gw.fossdev@gmail.com>
---- a/CMake/dcmtkMacros.cmake
-+++ b/CMake/dcmtkMacros.cmake
-@@ -60,11 +60,11 @@
+Index: dcmtk/CMake/dcmtkMacros.cmake
+===================================================================
+--- dcmtk.orig/CMake/dcmtkMacros.cmake
++++ dcmtk/CMake/dcmtkMacros.cmake
+@@ -55,11 +55,11 @@ macro(DCMTK_ADD_EXECUTABLE PROGRAM)
          endif()
  
          # Collect executable as part of global DCMTK_EXECUTABLE_TARGETS property

diff --git a/debian/patches/fake_version.patch b/debian/patches/fake_version.patch
new file mode 100644 (file)
index 0000000..2aaa135
--- /dev/null
+++ b/debian/patches/fake_version.patch
@@ -0,0 +1,31 @@
+Description: Fake a release
+Author: Mathieu Malaterre <malat@debian.org>
+Forwarded: not-needed
+Last-Update: 2022-10-18
+
+Index: dcmtk/CMake/dcmtkPrepare.cmake
+===================================================================
+--- dcmtk.orig/CMake/dcmtkPrepare.cmake
++++ dcmtk/CMake/dcmtkPrepare.cmake
+@@ -33,17 +33,17 @@ endif()
+ #  a development snapshot and an even number indicates an official release.)
+ set(DCMTK_MAJOR_VERSION 3)
+ set(DCMTK_MINOR_VERSION 6)
+-set(DCMTK_BUILD_VERSION 7)
++set(DCMTK_BUILD_VERSION 8)
+ # The ABI is not guaranteed to be stable between different snapshots/releases,
+ # so this particular version number is increased for each snapshot or release.
+-set(DCMTK_ABI_VERSION 17)
++set(DCMTK_ABI_VERSION 18)
+ 
+ # Package "release" settings (some are currently unused and, therefore, disabled)
+ set(DCMTK_PACKAGE_NAME "dcmtk")
+-set(DCMTK_PACKAGE_DATE "DEV")
++set(DCMTK_PACKAGE_DATE "2022-10-24")
+ set(DCMTK_PACKAGE_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}.${DCMTK_BUILD_VERSION}")
+ set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${DCMTK_BUILD_VERSION})
+-set(DCMTK_PACKAGE_VERSION_SUFFIX "+")
++set(DCMTK_PACKAGE_VERSION_SUFFIX "")
+ #set(DCMTK_PACKAGE_TARNAME "dcmtk-${DCMTK_PACKAGE_VERSION}")
+ #set(DCMTK_PACKAGE_STRING "dcmtk ${DCMTK_PACKAGE_VERSION}")
+ #set(DCMTK_PACKAGE_BUGREPORT "bugs@dcmtk.org")

diff --git a/debian/patches/remove_version.patch b/debian/patches/remove_version.patch
new file mode 100644 (file)
index 0000000..033fced
--- /dev/null
+++ b/debian/patches/remove_version.patch
@@ -0,0 +1,22 @@
+Description: Remove version
+Author: Mathieu Malaterre <malat@debian.org>
+Forwarded: not-needed
+Last-Update: 2023-11-06
+
+Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
+===================================================================
+--- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
++++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
+@@ -180,9 +180,9 @@ else()
+ 
+   # Modify the installation paths for configuration files, data files and documents
+   # by adding a subdirectory with the DCMTK name and version number
+-  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+-  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk-${DCMTK_COMPLETE_PACKAGE_VERSION}")
+-  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}-${DCMTK_COMPLETE_PACKAGE_VERSION}")
++  set(CMAKE_INSTALL_FULL_SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/dcmtk")
++  set(CMAKE_INSTALL_FULL_DATADIR "${CMAKE_INSTALL_FULL_DATADIR}/dcmtk")
++  set(CMAKE_INSTALL_FULL_DOCDIR "${CMAKE_INSTALL_FULL_DOCDIR}")
+ 
+   # These variables are defined as macros in osconfig.h and must end with a path separator
+   set(DCMTK_DEFAULT_CONFIGURATION_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/")

diff --git a/debian/patches/series b/debian/patches/series
index d6f66074af8968de2b4e7a23ba2f3bf3defad2cf..4558c419425ed798d3694b77164ba713cd5b0f97 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,5 @@
 #ab61e8577ff0974efcfae2907c48baf6023c1160.patch
 #1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch
 #f06a867513524664a1b03dfcf812d8b60fdd02cc.patch
-version.patch
+fake_version.patch
+remove_version.patch

diff --git a/debian/patches/version.patch b/debian/patches/version.patch
deleted file mode 100644 (file)
index 2aaa135..0000000
--- a/debian/patches/version.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Fake a release
-Author: Mathieu Malaterre <malat@debian.org>
-Forwarded: not-needed
-Last-Update: 2022-10-18
-
-Index: dcmtk/CMake/dcmtkPrepare.cmake
-===================================================================
---- dcmtk.orig/CMake/dcmtkPrepare.cmake
-+++ dcmtk/CMake/dcmtkPrepare.cmake
-@@ -33,17 +33,17 @@ endif()
- #  a development snapshot and an even number indicates an official release.)
- set(DCMTK_MAJOR_VERSION 3)
- set(DCMTK_MINOR_VERSION 6)
--set(DCMTK_BUILD_VERSION 7)
-+set(DCMTK_BUILD_VERSION 8)
- # The ABI is not guaranteed to be stable between different snapshots/releases,
- # so this particular version number is increased for each snapshot or release.
--set(DCMTK_ABI_VERSION 17)
-+set(DCMTK_ABI_VERSION 18)
- 
- # Package "release" settings (some are currently unused and, therefore, disabled)
- set(DCMTK_PACKAGE_NAME "dcmtk")
--set(DCMTK_PACKAGE_DATE "DEV")
-+set(DCMTK_PACKAGE_DATE "2022-10-24")
- set(DCMTK_PACKAGE_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}.${DCMTK_BUILD_VERSION}")
- set(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${DCMTK_BUILD_VERSION})
--set(DCMTK_PACKAGE_VERSION_SUFFIX "+")
-+set(DCMTK_PACKAGE_VERSION_SUFFIX "")
- #set(DCMTK_PACKAGE_TARNAME "dcmtk-${DCMTK_PACKAGE_VERSION}")
- #set(DCMTK_PACKAGE_STRING "dcmtk ${DCMTK_PACKAGE_VERSION}")
- #set(DCMTK_PACKAGE_BUGREPORT "bugs@dcmtk.org")