Adapt patch and exclude patches applied upstream

diff --git a/debian/changelog b/debian/changelog
index 8d8141103698d7b128b8eb1bafd3836cbeed76ce..2f9aa583b60070fe65c07e3b0bf32b562794de3d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,6 @@ dcmtk (3.6.7-1) UNRELEASED; urgency=medium
   * Drop useless get-orig-source target (routine-update)
   * Remove trailing whitespace in debian/changelog (routine-update)
   * Remove trailing whitespace in debian/rules (routine-update)
-  TODO: Refresh patches
 
  -- Andreas Tille <tille@debian.org>  Mon, 02 May 2022 15:51:57 +0200
 

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index cf267edc83fa7c8c4688262920041548666b2f6e..3de5f5deaa6ed026556e8651c70ac02f373f2bf5 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -2,57 +2,61 @@ Description: Install dict to versioned dir
 Bug-Debian: https://bugs.debian.org/709123
 Forwarded: no
 Author: Mathieu Malaterre <malat@debian.org>
-Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
-===================================================================
---- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
-+++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -114,15 +114,7 @@ endif()
- #endif()
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -118,23 +118,8 @@ endif()
  
  # Configure file
--
+ 
 -# Windows being windows, it lies about its processor type to 32 bit binaries
 -set(SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
 -if(NOT SYSTEM_PROCESSOR)
--  set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-  if(WIN32 AND NOT CYGWIN)
+-    if(CMAKE_GENERATOR_PLATFORM)
+-      set(SYSTEM_PROCESSOR "${CMAKE_GENERATOR_PLATFORM}")
+-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
+-      set(SYSTEM_PROCESSOR "x64")
+-    elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+-      set(SYSTEM_PROCESSOR "Win32")
+-    endif()
+-  else()
+-    set(SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
+-  endif()
 -endif()
--# CMake doesn't provide a configure-style system type string
+ # CMake doesn't provide a configure-style system type string
 -set(CANONICAL_HOST_TYPE "${SYSTEM_PROCESSOR}-${CMAKE_SYSTEM_NAME}")
--DCMTK_UNSET(SYSTEM_PROCESSOR)
 +set(CANONICAL_HOST_TYPE "Debian")
+ DCMTK_UNSET(SYSTEM_PROCESSOR)
  
  # Configure dictionary path and install prefix
- if(WIN32 AND NOT CYGWIN)
-@@ -134,10 +126,10 @@ if(WIN32 AND NOT CYGWIN)
+@@ -147,10 +132,10 @@ if(WIN32 AND NOT CYGWIN)
    set(ENVIRONMENT_PATH_SEPARATOR ";")
    # Set dictionary path to the data dir inside install main dir (prefix)
-   if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+   if(DCMTK_DEFAULT_DICT STREQUAL "external")
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\dcmtk\\\\private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIC}\\\\private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${CMAKE_INSTALL_DATADIR}\\\\private.dic")
      endif()
       # Again, for Windows strip all / from path and replace it with \\.
      string(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
-@@ -155,10 +147,10 @@ else()
+@@ -168,10 +153,10 @@ else()
    set(ENVIRONMENT_PATH_SEPARATOR ":")
    # Set dictionary path to the data dir inside install main dir (prefix).
-   if(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+   if(DCMTK_DEFAULT_DICT STREQUAL "external")
 -    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/dicom.dic")
-+    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/dicom.dic")
++    set(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dicom.dic")
      # If private dictionary should be utilized, add it to default dictionary path.
      if(ENABLE_PRIVATE_TAGS)
 -      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/dcmtk/private.dic")
-+      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIC}/private.dic")
++      set(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${CMAKE_INSTALL_DATADIR}/private.dic")
      endif()
    else()
      set(DCM_DICT_DEFAULT_PATH "")
-Index: dcmtk/dcmdata/data/CMakeLists.txt
-===================================================================
---- dcmtk.orig/dcmdata/data/CMakeLists.txt
-+++ dcmtk/dcmdata/data/CMakeLists.txt
+--- a/dcmdata/data/CMakeLists.txt
++++ b/dcmdata/data/CMakeLists.txt
 @@ -1,5 +1,8 @@
  # declare installation files
 -install(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data)

diff --git a/debian/patches/series b/debian/patches/series
index 097ba80d73707e235ad399821a82dc130cf71342..1137b44e2d5a26b47685eda91c46181e9c234877 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,10 +1,10 @@
 01_dcmtk_3.6.0-1.patch
 03_datadic_install.patch
 07_dont_export_all_executables.patch
-bigendian.patch
-bug1000220.patch
-test_failures.patch
-3ae202ee9d8f27054ad0c463a6799d8b10b4864b.patch
-0cf6b12d8ea0b727f0fe2ab076b6f180100fbd30.patch
-ab61e8577ff0974efcfae2907c48baf6023c1160.patch
-1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch
+#bigendian.patch
+#bug1000220.patch
+#test_failures.patch
+#3ae202ee9d8f27054ad0c463a6799d8b10b4864b.patch
+#0cf6b12d8ea0b727f0fe2ab076b6f180100fbd30.patch
+#ab61e8577ff0974efcfae2907c48baf6023c1160.patch
+#1c8cca4bf6f7c92fc16f9e66faf49409c891a2b0.patch