diff -Nru hedgewars-1.0.0/debian/changelog hedgewars-1.0.0/debian/changelog
--- hedgewars-1.0.0/debian/changelog	2022-08-05 15:21:55.000000000 +0000
+++ hedgewars-1.0.0/debian/changelog	2022-08-11 03:35:13.000000000 +0000
@@ -1,3 +1,13 @@
+hedgewars (1.0.0-19+rpi1) bookworm-staging; urgency=medium
+
+  [changes brought forward from 1.0.0-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 24 Nov 2019 13:14:55 +0000]
+  * Force use of C.UTF-8 locale, the build fails under some locales (e.g. POSIX).
+
+  [changes introduced in 1.0.0-16+rpi1 by Peter Michael Green]
+  * Forve build with clang 11, newer versions cause armv7 contamination.
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 11 Aug 2022 03:35:13 +0000
+
 hedgewars (1.0.0-19) unstable; urgency=medium
 
   * Add new patch to fix a cmake 3.24.0 build failure
diff -Nru hedgewars-1.0.0/debian/control hedgewars-1.0.0/debian/control
--- hedgewars-1.0.0/debian/control	2022-08-05 13:04:08.000000000 +0000
+++ hedgewars-1.0.0/debian/control	2022-08-11 03:35:13.000000000 +0000
@@ -6,7 +6,7 @@
            Gianfranco Costamagna <locutusofborg@debian.org>
 Standards-Version: 4.6.1
 Build-Depends: cmake,
-               clang [armel armhf i386 mipsel ppc64el],
+               clang-11 [armel armhf i386 mipsel ppc64el],
                debhelper-compat (= 13),
                fp-compiler [!armel !armhf !i386 !mipsel !ppc64el],
                fp-units-misc [!armel !armhf !i386 !mipsel !ppc64el],
diff -Nru hedgewars-1.0.0/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch hedgewars-1.0.0/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch
--- hedgewars-1.0.0/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch	1970-01-01 00:00:00.000000000 +0000
+++ hedgewars-1.0.0/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch	2022-08-11 03:35:13.000000000 +0000
@@ -0,0 +1,19 @@
+From: Peter Michael Green <plugwash@raspbian.org>
+Date: Sun, 26 Jun 2022 21:56:04 +0000
+X-Dgit-Generated: 1.0.0-16+rpi1 9d314ffa1cf878c01cd334d1258e52b89ad53d6e
+Subject: Build with clang 11 to avoid armv7 contamination.
+
+
+---
+
+--- hedgewars-1.0.0.orig/cmake_modules/FindClang.cmake
++++ hedgewars-1.0.0/cmake_modules/FindClang.cmake
+@@ -11,7 +11,7 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
+ find_program(CLANG_EXECUTABLE
+-        NAMES clang-mp-3.3 clang-mp-3.2 clang-mp-3.1 clang-mp-3.0 clang
++        NAMES clang-11
+         PATHS /opt/local/bin /usr/local/bin /usr/bin)
+ 
+ if (CLANG_EXECUTABLE)
diff -Nru hedgewars-1.0.0/debian/patches/series hedgewars-1.0.0/debian/patches/series
--- hedgewars-1.0.0/debian/patches/series	2022-08-05 15:21:18.000000000 +0000
+++ hedgewars-1.0.0/debian/patches/series	2022-08-11 03:35:13.000000000 +0000
@@ -9,3 +9,4 @@
 #aa011799cb63.patch
 #ffmpeg-5.0-compat.patch
 new-cmake-3.24-build-fix.patch
+build-with-clang-11-to-avoid-armv7-conta.patch
diff -Nru hedgewars-1.0.0/debian/rules hedgewars-1.0.0/debian/rules
--- hedgewars-1.0.0/debian/rules	2022-08-05 15:21:55.000000000 +0000
+++ hedgewars-1.0.0/debian/rules	2022-08-11 03:35:13.000000000 +0000
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export LC_ALL=C.UTF-8
+
 %:
 	dh $@