Merge version 5.12.0-14+rpi1 and 5.12.0-15 to produce 5.12.0-15+rpi1

diff --cc debian/changelog
index bbf2eab404c41d9e3d67cf1c38ee44abdd6fbc09,437cdd843bc3480a5d64c4f23e9760e7cdee7298..a73a66613599ffc3259cbce9f89f197827acb2d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,26 +1,33 @@@
- collectd (5.12.0-14+rpi1) bookworm-staging; urgency=medium
++collectd (5.12.0-15+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 5.11.0-7+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Sep 2020 14:58:41 +0000]
 +  * Use libatomic on armhf too.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 02 Mar 2023 11:27:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 16 Dec 2023 04:20:51 +0000
++
+ collectd (5.12.0-15) unstable; urgency=medium
+ 
+   [ Bernd Zeimetz ]
+   * [b856351] Fix lintian error:
+     E: collectd-core: depends-on-obsolete-package Depends: lsb-base
+ 
+   [ Samuel Thibault ]
+   * [c052c93] d/control,rules: Fix arch filtering
+ 
+   [ Luca Boccassi ]
+   * [da43466] Disable dpdk plugin on i386
+     libdpdk-dev will no longer build for i386, disable it (Closes: #1057146)
+ 
+   [ Bernd Zeimetz ]
+   * [451bab7] Update JAVA_LIBDIR for current openjdks
+   * [48c6d15] Use include from javahelper to retrieve java directories.
+   * [b8fd49c] Don't build java plugin on i368.
+     Linking libjvm fails due to missing symbols in libjvm. (Closes: #1057712)
+   * [e1162da] Fix copy&paste error, we check the arch, not os
+   * [08c5029] Add libjansson-dev as build-dependency
+     (was magically pulled in by libdpdk-dev before).
+ 
+  -- Bernd Zeimetz <bzed@debian.org>  Thu, 07 Dec 2023 15:35:28 +0100
  
  collectd (5.12.0-14) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge