Manual merge of version 5.5.2-2+rpi1 and 5.6.4-1 to produce 5.6.4-1+rpi1

diff --cc debian/changelog
index 35ce3d3e6e01e666df3a64431bbb351ebec815dc,66ed2296321c203f0102a939fdf8d9bb722f61a7..1c048acb49566194584b1dfd916957067e467967
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,21 @@@
- puma (5.5.2-2+rpi1) bookworm-staging; urgency=medium
++puma (5.6.4-1+rpi1) bookworm-staging; urgency=medium
 +
++  [changes brought forward from 5.5.2-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 09 Dec 2021 21:50:38 +0000]
 +  * Be more agressive about forcing UTF-8 locale.
 +  * Fix clean target
 +  * Disable testsuite
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 09 Dec 2021 21:50:38 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Fri, 22 Jul 2022 01:55:37 +0000
++
+ puma (5.6.4-1) unstable; urgency=medium
+ 
+   * New upstream version 5.6.4
+   * Refresh patches
+   * Disable some tests that fail with 
+      NameError: uninitialized constant Puma::LogWriter
+   * Remove tmp/restart.txt in clean
+ 
+  -- Pirate Praveen <praveen@debian.org>  Mon, 04 Apr 2022 13:24:10 +0530
  
  puma (5.5.2-2) unstable; urgency=medium