Merge version 5.8.5-1+rpi1 and 6.0.1-1 to produce 6.0.1-1+rpi1

diff --cc debian/changelog
index 1b25feb5ac296de2e6c70af429e4d80db7d069f7,86e815d0891c702a35ecd20ebf6d834a1014e086..3c9c3e7c50c4417b77f998ea0bd357850af67ab0
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,34 @@@
- kamailio (5.8.5-1+rpi1) trixie-staging; urgency=medium
++kamailio (6.0.1-1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 5.5.3-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 15 Feb 2022 05:45:40 +0000]
 +  * Remove supirious dash before CC_OPT
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 06 Feb 2025 03:52:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 22 Mar 2025 04:37:41 +0000
++
+ kamailio (6.0.1-1) unstable; urgency=medium
+ 
+   * debian: add gbp.conf
+   * upstream/signing-key.asc and watch changes
+   * New upstream version 6.0.1 (Closes: #1096894)
+ 
+  -- Victor Seva <vseva@debian.org>  Tue, 11 Mar 2025 14:38:30 +0100
+ 
+ kamailio (6.0.0-1) unstable; urgency=medium
+ 
+   * debian/watch: fix basedir detection
+   * New upstream version 6.0.0
+   * remove geoip modules
+   * add kafka modules
+   * Remove examples. The most part are obsolete
+   * debian/gbp.conf: update filter
+   * debian/gbp.conf: switch to DEP-14 layout
+   * remove upstream patches from 5.8 series
+   * refresh patches
+   * fix extended-description-line-too-long
+   * refresh debian/backports scripts
+   * lintian-overrides for false positives
+ 
+  -- Victor Seva <vseva@debian.org>  Tue, 11 Feb 2025 14:55:15 +0100
  
  kamailio (5.8.5-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 8aba883a17f3ec10f1edc6ea1518c6fad34ed97b,22f712d9a314c660c049b5db4f288c5d907de338..71759aec02afa85e5c2abec0ef3f59552cb3e2c2
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,7 -3,3 +3,4 @@@ no_lib64_on_64_bits.patc
  no_INSTALL_file.patch
  fix_export.patch
  stop-setting-march-on-arm.patch
- # upstream fixes from 5.8 branch
- upstream/0001-db_sqlite-fix-incompatible-pointer-types-warning.patch
- upstream/0002-db_unixodbc-fix-incompatible-pointer-types-warning.patch
 +remove-supirious-dash.patch

diff --cc src/Makefile.defs
Simple merge