diff -Nru puma-5.6.4/debian/changelog puma-5.6.4/debian/changelog
--- puma-5.6.4/debian/changelog	2022-04-04 07:54:10.000000000 +0000
+++ puma-5.6.4/debian/changelog	2022-07-22 01:55:37.000000000 +0000
@@ -1,3 +1,12 @@
+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>  Fri, 22 Jul 2022 01:55:37 +0000
+
 puma (5.6.4-1) unstable; urgency=medium
 
   * New upstream version 5.6.4
diff -Nru puma-5.6.4/debian/ruby-tests.rake puma-5.6.4/debian/ruby-tests.rake
--- puma-5.6.4/debian/ruby-tests.rake	2022-04-04 07:54:10.000000000 +0000
+++ puma-5.6.4/debian/ruby-tests.rake	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-require 'gem2deb/rake/testtask'
-
-Gem2Deb::Rake::TestTask.new do |t|
-  t.libs = ['test']
-  if ENV['AUTOPKGTEST_TEST_PUMA_SERVER_SSL']
-    ENV['OPENSSL_CONF'] = '' # https://github.com/puma/puma/issues/2147
-    t.test_files = FileList['test/test_*_ssl.rb']
-  else
-    t.test_files = FileList['test/**/*_test.rb'] + FileList['test/**/test_*.rb'] - FileList[
-      'test/test_*ssl.rb',
-      'test/test_integration_systemd.rb',
-      'test/test_integration_cluster.rb',
-      'test/test_integration_pumactl.rb',
-      'test/test_worker_gem_independence.rb',
-      'test/test_preserve_bundler_env.rb',
-      'test/test_request_invalid.rb'
-    ]
-  end
-  t.verbose = true
-end
diff -Nru puma-5.6.4/debian/rules puma-5.6.4/debian/rules
--- puma-5.6.4/debian/rules	2022-04-04 07:54:10.000000000 +0000
+++ puma-5.6.4/debian/rules	2022-07-22 01:55:37.000000000 +0000
@@ -3,10 +3,14 @@
 export GEM2DEB_TEST_RUNNER = --check-dependencies
 export DH_RUBY = --gem-install
 export DH_RUBY_GEM_INSTALL_EXCLUDE = benchmarks/* docs/* win_gem_test/* tools/* bin/puma-wild
-export LANG = C.UTF-8
+export LC_ALL = C.UTF-8
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
 
 override_dh_installchangelogs:
 	dh_installchangelogs History.md
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -f tmp/restart.txt