Manual merge of version 29.0.6-6+rpi1 and 29.0.6-18 to produce 29.0.6-18+rpi1

diff --cc debian/changelog
index cf9eba33580ae01794ebdf19514098a57fbe3c39,e29062a1ea099a09595c4a948111123428632779..f8168a3b013a8011675ab28ba948c156cd683e2c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,137 +1,144 @@@
- android-platform-tools (29.0.6-6+rpi1) bookworm-staging; urgency=medium
++android-platform-tools (29.0.6-18+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.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 22 Mar 2022 22:50:07 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 14 Jul 2022 14:12:26 +0000
++
+ android-platform-tools (29.0.6-18) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control: Update Depends version.
+   * debian/control: Add Section to each binary package.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sat, 28 May 2022 20:13:51 +0900
+ 
+ android-platform-tools (29.0.6-17) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/tests/control: Add Depends for etc1tool test.
+   * debian/control: Update B-D list to install packages only necessary.
+   * debian/rules: Build libext4_utils.mk only for fastboot needed
+     architectures.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sat, 28 May 2022 02:12:26 +0900
+ 
+ android-platform-tools (29.0.6-16) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/rules:
+     - Skip dh_auto_test for buildd: all
+ 
+  -- Roger Shimizu <rosh@debian.org>  Thu, 26 May 2022 18:10:50 +0900
+ 
+ android-platform-tools (29.0.6-15) unstable; urgency=medium
+ 
+   * Team upload.
+   * Make use of android-libboringssl-dev package
+   * Build etc1tool on any architecture
+   * debian/rules:
+     - Port some tests from autopkgtest to run on dh_auto_test.
+   * d/*.mk:
+     - Update symblic linking command to easier rebuild locally.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Thu, 26 May 2022 01:44:34 +0900
+ 
+ android-platform-tools (29.0.6-14) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix gcc build for libsparse.mk
+   * Add debian/watch
+   * debian/*.mk:
+     - Link atomic library only necessary for armel and mipsel.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sun, 08 May 2022 23:40:34 +0900
+ 
+ android-platform-tools (29.0.6-13) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control:
+     - Update B-D: libselinux1-dev to all arch, since building
+       libziparchive.mk depends on this package.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sun, 08 May 2022 00:41:07 +0900
+ 
+ android-platform-tools (29.0.6-12) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/control:
+     - Add libgtest-dev to Depends of android-libziparchive-dev.
+     - Fix multiarch issues.
+   * Add DexFiles.cpp to libbacktrace.mk
+   * Make libziparchive.so build on all arch
+ 
+  -- Roger Shimizu <rosh@debian.org>  Sat, 07 May 2022 23:25:20 +0900
+ 
+ android-platform-tools (29.0.6-11) unstable; urgency=medium
+ 
+   * Team upload.
+   * Update d/*.lintian-overrides
+   * debian/control:
+     - Revise B-D and Depends for each package.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Wed, 04 May 2022 19:33:12 +0900
+ 
+ android-platform-tools (29.0.6-10) unstable; urgency=medium
+ 
+   * Team upload.
+   * Fix multiarch issues
+   * Make liblog and libnativehelper dynamic linked
+ 
+  -- Roger Shimizu <rosh@debian.org>  Tue, 03 May 2022 01:41:05 +0900
+ 
+ android-platform-tools (29.0.6-9) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/rules:
+     - Update version for android-sdk-libsparse-utils.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Tue, 19 Apr 2022 02:56:18 +0900
+ 
+ android-platform-tools (29.0.6-8) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/system/core/*img*.mk: Fix ftbfs issue on armel.
+   * debian/control: Fix ftbfs issue on mips*el.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Mon, 18 Apr 2022 22:49:01 +0900
+ 
+ android-platform-tools (29.0.6-7) unstable; urgency=medium
+ 
+   * Team upload.
+   * debian/*.mk and debian/rules:
+     - Remove libart since it is not dependency for adb and fastboot.
+     - Following libraries are no longer static linked:
+       + libbacktrace.so
+       + libbase.so
+       + libcutils.so
+       + libsparse.so
+       + libutils.so
+       + libziparchive.so
+   * debian/control:
+     - Add new packages to replace old ones in
+       android-platform-system-core:
+       + android-libutils
+       + android-libutils-dev
+       + android-libziparchive
+       + android-libziparchive-dev
+       + android-platform-system-core-headers
+       + android-libbacktrace
+       + android-libbacktrace-dev
+       + android-libbase
+       + android-libbase-dev
+       + mkbootimg
+     - Remove package: dmtracedump
+   * debian/tests:
+     - Remove test for dmtracedump
+   * debian/rules:
+     - Mark the same version for android-lib* packages as adb and
+       fastboot.
+ 
+  -- Roger Shimizu <rosh@debian.org>  Mon, 18 Apr 2022 01:04:48 +0900
  
  android-platform-tools (29.0.6-6) unstable; urgency=medium
  

diff --cc debian/control
index c7d93ff3d568d281b6e6f0a4190265d87e6894a5,074a8f337ede112f7b591d5a379480c1e7d5be21..0bc37c8966bf54a8d2c626bf9340424518b931c7
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -4,24 -4,18 +4,18 @@@ Priority: optiona
  Maintainer: Android Tools Maintainers <android-tools-devel@lists.alioth.debian.org>
  Uploaders: Chirayu Desai <chirayudesai1@gmail.com>
  Build-Depends:
+  android-libboringssl-dev [amd64 i386 armel armhf arm64],
   bash-completion,
 - clang [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
 + clang-11 [amd64 i386 armel armhf arm64 mipsel mips64el ppc64el s390x powerpc ppc64 sparc64 riscv64],
   debhelper-compat (= 13),
-  help2man,
-  libicu-dev [amd64 i386 armel armhf arm64],
-  liblz4-dev [amd64 i386 armel armhf arm64],
-  libpcre3-dev,
+  dh-exec,
+  libgtest-dev,
   libpng-dev,
-  libselinux1-dev,
-  libsquashfuse-dev,
-  python3 [amd64 i386 arm64],
-  zlib1g-dev [amd64 i386 armel armhf arm64],
- Build-Depends-Arch:
-  libgtest-dev [amd64 i386 armel armhf arm64],
-  liblzma-dev,
-  libsafe-iop-dev [amd64 i386 armel armhf arm64 mipsel mips64el],
+  libsquashfuse-dev [amd64 i386 armel armhf arm64],
   libusb-1.0-0-dev [amd64 i386 armel armhf arm64],
+  p7zip-full [amd64 i386 armel armhf arm64 mipsel mips64el],
   pandoc,
+  zlib1g-dev [amd64 i386 armel armhf arm64],
  Standards-Version: 4.5.0
  Rules-Requires-Root: no
  Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-tools.git

diff --cc debian/rules
Simple merge