Merge version 5.5.3-2+rpi1 and 5.5.4-1 to produce 5.5.4-1+rpi1

diff --cc debian/changelog
index fe1506303fc8a0bd744a9f29366b7d9940173c31,6761f88003b7fafa5faee58b4edc7e8836f3c26f..c3b6f5387463d540c5f0c35d7d831efc7783fd48
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,17 @@@
- kamailio (5.5.3-2+rpi1) bookworm-staging; urgency=medium
++kamailio (5.5.4-1+rpi1) bookworm-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
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 15 Feb 2022 05:45:40 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 06 Mar 2022 11:30:42 +0000
++
+ kamailio (5.5.4-1) unstable; urgency=medium
+ 
+   * New upstream version 5.5.4
+   * remove already applied patches
+   * remove python3-dev dependency from binaries (Closes: #1005774)
+ 
+  -- Victor Seva <vseva@debian.org>  Thu, 17 Feb 2022 23:41:52 +0100
  
  kamailio (5.5.3-2) unstable; urgency=medium
  

diff --cc debian/patches/series
index 5290f2730373f5d23e6f4891b14aa75921ac5c2c,5167a3c3ce01d6979448628b993f6547a44353fd..0b1d06c53540d517d2e7f14f3a02293189dfa270
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -3,6 -3,4 +3,5 @@@ no_lib64_on_64_bits.patc
  no_INSTALL_file.patch
  fix_export.patch
  no_tls_openssl_mutex_shared_util.patch
- 0001-src-Makefile-Also-stop-compiling-kamcmd-from-here.patch
  0001-Stop-setting-march-on-arm.patch
 +remove-supirious-dash.patch

diff --cc src/Makefile.defs
Simple merge