From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 26 Oct 2020 16:04:26 +0000 (+0000)
Subject: Merge version 1.0.0-11+rpi1 and 1.0.0-13 to produce 1.0.0-13+rpi1
X-Git-Tag: archive/raspbian/1.0.0-13+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9d3234f2783adaca212e1ef65c0069c378b38e58;p=hedgewars.git

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

c8860d83a598af41fd7eabc83e5f564bf6318eb9
diff --cc debian/changelog
index 464c39d,e459863..7fbfc39
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- hedgewars (1.0.0-11+rpi1) bullseye-staging; urgency=medium
++hedgewars (1.0.0-13+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>  Tue, 18 Aug 2020 16:21:52 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 26 Oct 2020 16:04:26 +0000
++
+ hedgewars (1.0.0-13) unstable; urgency=medium
+ 
+   * Use clang 10 to build where fpc is not available, because clang-11 doesn't
+     build correctly
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Mon, 19 Oct 2020 19:27:39 +0200
+ 
+ hedgewars (1.0.0-12) unstable; urgency=medium
+ 
+   * debian/patches/0eb95ff5c1c29887f14ecb2bb5f9c3cdd8b3ff29.patch:
+     - cherry-pick upstream build fix for qt 5.15 (Closes: #972179)
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 16 Oct 2020 10:52:11 +0200
  
  hedgewars (1.0.0-11) unstable; urgency=medium