From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 1 May 2025 02:35:22 +0000 (+0100)
Subject: Merge version 3.6.9-4+rpi1 and 3.6.9-5 to produce 3.6.9-5+rpi1
X-Git-Tag: archive/raspbian/3.6.9-5+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=468f3a6974bb0bd039e78db52fcd5380b7a1c0b8;p=dcmtk.git

Merge version 3.6.9-4+rpi1 and 3.6.9-5 to produce 3.6.9-5+rpi1
---

511cf6e6e9304679289ac1f81e405c41911f1cb0
diff --cc debian/changelog
index 03bc6f2b,68b4d6f7..2444a27c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- dcmtk (3.6.9-4+rpi1) trixie-staging; urgency=medium
++dcmtk (3.6.9-5+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 3.6.7-13+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 19 Jun 2024 20:44:47 +0000]
 +  * Disable stack clash protection, it causes assembler errors on raspbian.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Mar 2025 04:12:06 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 01 May 2025 02:35:22 +0000
++
+ dcmtk (3.6.9-5) unstable; urgency=medium
+ 
+   * d/control: relax dependency on dcmtk-data. Closes: #1098944
+   * 0012-CVE-2025-2357.patch: new: fix CVE-2025-2357. (Closes: #1100724)
+   * documentation: Spring cleanups. Closes: #1095639
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Fri, 21 Mar 2025 12:45:44 +0100
  
  dcmtk (3.6.9-4) unstable; urgency=medium