Merge version 3.6.8-6+rpi1 and 3.6.9-4 to produce 3.6.9-4+rpi1

diff --cc debian/changelog
index 53c2ef31df8135afb349701dbdf9aca4a61e558d,a596ccba5a7fe35073922a305326509b5a065634..03bc6f2bc44833e29857c646b0d926c99f5eb638
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,49 +1,56 @@@
- dcmtk (3.6.8-6+rpi1) trixie-staging; urgency=medium
++dcmtk (3.6.9-4+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>  Wed, 02 Oct 2024 21:54:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 07 Mar 2025 04:12:06 +0000
++
+ dcmtk (3.6.9-4) unstable; urgency=medium
+ 
+   * Team upload.
+   * Reinstate 0007-CVE-2024-47796.patch and 0008-CVE-2024-52333.patch.
+     These were not part of dcmtk 3.6.9 upstream and still apply.
+     Thanks to Salvatore Bonaccorso
+   * 0009-CVE-2025-25475.patch: new: fix CVE-2025-25475. (Closes: #1098373)
+   * 0010-CVE-2025-25474.patch: new: fix CVE-2025-25474. (Closes: #1098374)
+   * 0011-CVE-2025-25472.patch: new: fix CVE-2025-25472.
+ 
+  -- Étienne Mollier <emollier@debian.org>  Wed, 19 Feb 2025 22:30:57 +0100
+ 
+ dcmtk (3.6.9-3) unstable; urgency=medium
+ 
+   * d/patches: Remove old unused patches
+   * d/doc: Make sure to reference 3.6.9 path
+   * d/watch: Properly watch upstream on github
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Tue, 18 Feb 2025 12:05:41 +0100
+ 
+ dcmtk (3.6.9-2) experimental; urgency=medium
+ 
+   * d/t/run-unit-test: Adapt to new installation
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Tue, 11 Feb 2025 08:12:50 +0100
+ 
+ dcmtk (3.6.9-1) experimental; urgency=medium
+ 
+   * New upstream version 3.6.9
+   * d/install: Migrate to new SOVERSION
+   * d/patches: Refresh patches
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Thu, 30 Jan 2025 13:16:59 +0100
+ 
+ dcmtk (3.6.8-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * 0001-Fixed-unchecked-typecasts-of-DcmItem-search-results.patch.
+     Patch refreshed.
+   * 0004-Fixed-two-segmentation-faults.patch: unfuzz.
+   * 0007-CVE-2024-47796.patch: new.
+     This patch addresses CVE-2024-47796. (Closes: #1093043)
+   * 0008-CVE-2024-52333.patch: new.
+     This patch addresses CVE-2024-52333. (Closes: #1093047)
+ 
+  -- Étienne Mollier <emollier@debian.org>  Sat, 18 Jan 2025 16:30:29 +0100
  
  dcmtk (3.6.8-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge