Merge version 29.0.6-23+rpi1 and 29.0.6-25 to produce 29.0.6-25+rpi1

diff --cc debian/changelog
index 3fb30d76f393fe8e721113d15a01fb2d7ee00304,10893cb15c2b9861c8939213266e1172c1a523ad..3f4b55c4d8cf25e9a8f01e82eb51ccaac0a45caf
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,25 +1,32 @@@
- android-platform-tools (29.0.6-23+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-25+rpi1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 29.0.6-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 22 Mar 2022 22:50:07 +0000]
 +  * Build with clang-11 to avoid armv7 contamination.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sun, 22 Jan 2023 23:15:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 30 Jan 2023 11:55:54 +0000
++
+ android-platform-tools (29.0.6-25) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control: Fix lld on B-D.
+   * debian/control: Separate pandoc and ronn on B-D.
+   * debian/control: Fix ftbfs on powerpc due to clang.
+   * debian/libbacktrace.mk: Add RegsRiscv64.cpp into build.
+   * debian/lintian-overrides: Add
+     package-has-unnecessary-activation-of-ldconfig-trigger.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Thu, 26 Jan 2023 21:43:52 -0800
+ 
+ android-platform-tools (29.0.6-24) unstable; urgency=medium
+ 
+   * Team upload.
+   * Remove external/libunwind dependency which is actually not used.
+   * Enable riscv64 adb/fastboot.
+   * debian/patches: Update riscv64 patch to fix FTBFS issue.
+   * Use lld when possible except riscv64.
+   * Use ronn to make manpages when pandoc is not available.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Wed, 25 Jan 2023 23:29:05 -0800
  
  android-platform-tools (29.0.6-23) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge