d/patches: Refresh patches

diff --git a/debian/patches/fake_version.patch b/debian/patches/fake_version.patch
index 2aaa135b1e0fd43e373f7a88d7f7f6ba3fc7d2c5..62c5f481bedb75e74a4f7749a52e3f452784ce5e 100644 (file)
--- a/debian/patches/fake_version.patch
+++ b/debian/patches/fake_version.patch
@@ -3,29 +3,3 @@ 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
index f306239bd7ff71b4405e01a9a4d2d478aea7daa0..2545ccee5b89d7c29cd4f96926ffb842c6b04131 100644 (file)
--- a/debian/patches/remove_version.patch
+++ b/debian/patches/remove_version.patch
@@ -7,7 +7,7 @@ Index: dcmtk/CMake/GenerateDCMTKConfigure.cmake
 ===================================================================
 --- dcmtk.orig/CMake/GenerateDCMTKConfigure.cmake
 +++ dcmtk/CMake/GenerateDCMTKConfigure.cmake
-@@ -180,8 +180,8 @@ else()
+@@ -202,8 +202,8 @@ else()
  
    # Modify the installation paths for configuration files, data files and documents
    # by adding a subdirectory with the DCMTK name and version number

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