Merge version 3.6.7-13+rpi1 and 3.6.8-6 to produce 3.6.8-6+rpi1

diff --cc debian/changelog
index 4e1dfb86174a888810e0e641357df235c2a7495c,8ae75026a7afb73e64f5c79d8acf3904f94677d8..53c2ef31df8135afb349701dbdf9aca4a61e558d
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,47 +1,54 @@@
- dcmtk (3.6.7-13+rpi1) trixie-staging; urgency=medium
++dcmtk (3.6.8-6+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Wed, 19 Jun 2024 20:44:47 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 02 Oct 2024 21:54:39 +0000
++
+ dcmtk (3.6.8-6) unstable; urgency=medium
+ 
+   * d/t/run-unit-test: Fix unit-test for new release. Closes: #1075917
+   * d/patches: Fixed possible overflows when allocating memory. Closes: #1074483
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Mon, 08 Jul 2024 13:31:04 +0200
+ 
+ dcmtk (3.6.8-5) unstable; urgency=medium
+ 
+   * Upload 3.6.8 to unstable
+   * d/control: Bump Std-Vers to 4.7.0 no changes needed
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Fri, 05 Jul 2024 11:24:00 +0200
+ 
+ dcmtk (3.6.8-4) experimental; urgency=medium
+ 
+   * d/rules: Add dcmtk-data package
+   * d/control: Add missing dependency on libjs-jquery. Closes: #989108
+   * d/control: Reduce number of dependencies for -dev package
+   * New upstream version 3.6.8
+ 
+  -- Mathieu Malaterre <malat@debian.org>  Mon, 24 Jun 2024 20:43:54 +0200
+ 
+ dcmtk (3.6.7-15) unstable; urgency=medium
+ 
+   * Team upload.
+   [ Adrian Bunk ]
+   * Update two of the previously applied patches to avoid breaking the ABI.
+     Closes: #1070207.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Mon, 24 Jun 2024 12:30:00 +0200
+ 
+ dcmtk (3.6.7-14) unstable; urgency=medium
+ 
+   * Team upload.
+   [ Emanuele Rocca ]
+   * Do not drop graphviz from build-depends-indep for armhf and armel.
+   [ Adrian Bunk ]
+   * CVE-2024-28130: Segmentation faults due to incorrect typecast
+     (Closes: #1070207)
+   * CVE-2024-34508: Segmentation fault via invalid DIMSE message
+   * CVE-2024-34509: Segmentation fault via invalid DIMSE message
+ 
+  -- Santiago Vila <sanvila@debian.org>  Wed, 05 Jun 2024 14:30:00 +0200
  
  dcmtk (3.6.7-13) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge