From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 6 Nov 2020 18:00:52 +0000 (+0000)
Subject: Merge version 1.0.0-13+rpi1 and 1.0.0-14 to produce 1.0.0-14+rpi1
X-Git-Tag: archive/raspbian/1.0.0-14+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5d744b041243dd7d6efd356f2643588eeeec834a;p=hedgewars.git

Merge version 1.0.0-13+rpi1 and 1.0.0-14 to produce 1.0.0-14+rpi1
---

5d744b041243dd7d6efd356f2643588eeeec834a
diff --cc debian/changelog
index 7fbfc39,1802378..5f73215
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,17 @@@
- hedgewars (1.0.0-13+rpi1) bullseye-staging; urgency=medium
++hedgewars (1.0.0-14+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>  Mon, 26 Oct 2020 16:04:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 06 Nov 2020 18:00:52 +0000
++
+ hedgewars (1.0.0-14) unstable; urgency=medium
+ 
+   * debian/patches/f09db263bc2a.patch:
+   * debian/patches/036263d63b05.patch:
+     - cherry-pick upstream fix for clang-11
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 20 Oct 2020 21:49:28 +0200
  
  hedgewars (1.0.0-13) unstable; urgency=medium