Merge version 1.0.0-8+rpi1 and 1.0.0-11 to produce 1.0.0-11+rpi1

diff --cc debian/changelog
index aaf4afbf163e44a1cea80c3a368c6f554ebe3ea9,bd6cdb5e6be3ce0f46423f22ce758d02d44305b1..464c39d3d99002bf66a6450ed2cbe31eaf719a69
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,24 +1,31 @@@
- hedgewars (1.0.0-8+rpi1) bullseye-staging; urgency=medium
++hedgewars (1.0.0-11+rpi1) bullseye-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).
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 09 Jul 2020 14:44:34 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 18 Aug 2020 16:21:52 +0000
++
+ hedgewars (1.0.0-11) unstable; urgency=medium
+ 
+   * Upload workaround from upstream instead
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 10 Aug 2020 12:06:38 +0200
+ 
+ hedgewars (1.0.0-10) unstable; urgency=medium
+ 
+   * Add a patch to make the new haskell-network-bsd an optional cmake module
+   * Fix build with Arch Linux patch with newer fpc (Closes: #968125)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 08 Jul 2020 15:25:11 +0200
+ 
+ hedgewars (1.0.0-9) unstable; urgency=low
+ 
+   * Re-enable server
+     - debian/patches/hedgewars-1.0.0-server-network3.patch:
+       Use patch from Fedora/RedHat made by Jens Petersen to fix build
+       failure with ghc 8.8 and the new network and network-bsd split packages.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 02 Jul 2020 15:17:16 +0200
  
  hedgewars (1.0.0-8) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge