From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 19 Sep 2022 16:16:59 +0000 (+0100)
Subject: Merge version 1.0.0-20+rpi1 and 1.0.2-1 to produce 1.0.2-1+rpi1
X-Git-Tag: archive/raspbian/1.0.2-1+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0bfe9976f43f4ef0a557acc6523aee573f36c30d;p=hedgewars.git

Merge version 1.0.0-20+rpi1 and 1.0.2-1 to produce 1.0.2-1+rpi1
---

0bfe9976f43f4ef0a557acc6523aee573f36c30d
diff --cc debian/changelog
index 8f1de46,b4ed806..e854d2c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,29 @@@
- hedgewars (1.0.0-20+rpi1) bookworm-staging; urgency=medium
++hedgewars (1.0.2-1+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, 15 Sep 2022 14:13:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 19 Sep 2022 16:16:59 +0000
++
+ hedgewars (1.0.2-1) unstable; urgency=medium
+ 
+   * New upstream version 1.0.2
+   * Drop patches now upstream:
+     - 036263d63b05.patch
+     - 0eb95ff5c1c29887f14ecb2bb5f9c3cdd8b3ff29.patch
+     - f09db263bc2a.patch
+     - fcea0f51d94f.patch
+     - ffmpeg-5.0-compat.patch
+     - fpc-3.2.0.patch
+     - hedgewars-1.0.0-server-network3.patch
+     - new-cmake-3.24-build-fix.patch
+     - optional-network-bsd.patch
+     - sdl2-fixes.patch
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Tue, 13 Sep 2022 01:04:54 +0200
  
  hedgewars (1.0.0-20) unstable; urgency=medium
  
diff --cc debian/patches/series
index 372a352,e35267f..8449bf5
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,13 -1,2 +1,3 @@@
- sdl2-fixes.patch
- hedgewars-1.0.0-server-network3.patch
- optional-network-bsd.patch
- fpc-3.2.0.patch
- 0eb95ff5c1c29887f14ecb2bb5f9c3cdd8b3ff29.patch
  #clang-10
- 036263d63b05.patch
- f09db263bc2a.patch
  #aa011799cb63.patch
- #ffmpeg-5.0-compat.patch
- new-cmake-3.24-build-fix.patch
- fcea0f51d94f.patch
 +build-with-clang-11-to-avoid-armv7-conta.patch