Manual merge of version 1.0.2-4+rpi1 and 1.0.2-6 to produce 1.0.2-6+rpi1

diff --cc debian/changelog
index 32b162f75f3f22e63d9ca97e0444c44b42f74f73,133ec2b42fd0befe757c155c51a72b3f23637e53..ebc4ffd253dfcebe6c2797f2132f942949932670
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,15 +1,25 @@@
- hedgewars (1.0.2-4+rpi1) bookworm-staging; urgency=medium
++hedgewars (1.0.2-6+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, 29 Sep 2022 21:03:42 +0000
++ -- Peter Micheal Green <plugwash@raspbian.org>  Thu, 10 Nov 2022 08:50:03 +0000
++
+ hedgewars (1.0.2-6) unstable; urgency=medium
+ 
+   * Use again clang-15 everywhere, powerpc issue is fixed.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 19 Oct 2022 11:40:18 +0200
+ 
+ hedgewars (1.0.2-5) unstable; urgency=medium
+ 
+   * Use clang-14 on ppc64el due to
+     https://github.com/llvm/llvm-project/issues/57935
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 23 Sep 2022 21:18:53 +0200
  
  hedgewars (1.0.2-4) unstable; urgency=medium
  

diff --cc debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch
index d3128710674de1f8096296ecbd46a89bcba56e87,0000000000000000000000000000000000000000..1cf8e216608e5e612320b2c23a3ef786533b7cbc
mode 100644,000000..100644
--- 1/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch
--- /dev/null
+++ b/debian/patches/build-with-clang-11-to-avoid-armv7-conta.patch
@@@ -1,19 -1,0 +1,17 @@@
- X-Dgit-Generated: 1.0.0-16+rpi1 9d314ffa1cf878c01cd334d1258e52b89ad53d6e
 +From: Peter Michael Green <plugwash@raspbian.org>
 +Date: Sun, 26 Jun 2022 21:56:04 +0000
- 
- ---
- 
- --- hedgewars-1.0.0.orig/cmake_modules/FindClang.cmake
- +++ hedgewars-1.0.0/cmake_modules/FindClang.cmake
 +Subject: Build with clang 11 to avoid armv7 contamination.
 +
- -        NAMES clang-mp-3.3 clang-mp-3.2 clang-mp-3.1 clang-mp-3.0 clang
++diff --git a/cmake_modules/FindClang.cmake b/cmake_modules/FindClang.cmake
++index 73f55a9..de9b04f 100644
++--- a/cmake_modules/FindClang.cmake
+++++ b/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-14 clang-13 clang-12 clang-11 clang-10 clang-9 clang-8 clang-7 clang-6.0 clang
 ++        NAMES clang-11
 +         PATHS /opt/local/bin /usr/local/bin /usr/bin)
 + 
 + if (CLANG_EXECUTABLE)

diff --cc debian/patches/series
Simple merge