Merge version 2.16.0+ds-6+rpi1 and 2.16.0+ds-7 to produce 2.16.0+ds-7+rpi1

diff --cc debian/changelog
index 2cc15fcb999c3c520363fb165d50e4949a8593d9,ad7c87fa54a829fd5027e514c39a459c591541cd..a0b0bc9295eb56a0741f9cec0edc343282c9af0c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,16 +1,23 @@@
- ncbi-blast+ (2.16.0+ds-6+rpi1) trixie-staging; urgency=medium
++ncbi-blast+ (2.16.0+ds-7+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 2.16.0+ds-6+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 12 Jan 2025 14:25:01 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Sun, 12 Jan 2025 14:25:01 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 21 Aug 2025 18:11:58 +0000
++
+ ncbi-blast+ (2.16.0+ds-7) unstable; urgency=medium
+ 
+   * debian/control: Build-depend on libncbi-vdb-dev where available
+     (amd64, arm64, and x32).
+   * debian/copyright: Overhaul with much help from licenserecon (lrc).
+   * debian/patches/fix_bm_for_gcc15 (new): Cherry-pick a BitMagic fix
+     needed for modern compilers, adjusting the path appropriately.'
+     (Closes: #1097434.)
+   * debian/rules: Build against (packaged!) VDB where available, using
+     logic cribbed from ncbi-igblast.  (Closes: #1100037.)
+   * Standards-Version: 4.7.2 (routine-update)
+ 
+  -- Aaron M. Ucko <ucko@debian.org>  Sat, 03 May 2025 23:42:51 -0400
  
  ncbi-blast+ (2.16.0+ds-6) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge