From: Raspbian automatic forward porter <root@raspbian.org>
Date: Thu, 29 Sep 2022 21:03:42 +0000 (+0100)
Subject: Merge version 1.0.2-1+rpi1 and 1.0.2-4 to produce 1.0.2-4+rpi1
X-Git-Tag: archive/raspbian/1.0.2-4+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=40f8feb0a65ef393885026946d7904f7a151d154;p=hedgewars.git

Merge version 1.0.2-1+rpi1 and 1.0.2-4 to produce 1.0.2-4+rpi1
---

d65caff4d0abdd55937ffc020098932ea518af4a
diff --cc debian/changelog
index e854d2c,1eb4973..32b162f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,24 +1,34 @@@
- hedgewars (1.0.2-1+rpi1) bookworm-staging; urgency=medium
++hedgewars (1.0.2-4+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>  Mon, 19 Sep 2022 16:16:59 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Thu, 29 Sep 2022 21:03:42 +0000
++
+ hedgewars (1.0.2-4) unstable; urgency=medium
+ 
+   * Export dwarf-4 CXXFLAG too needed for qt build.
+   * Add another patch to fix a build failure with clang-15
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 22 Sep 2022 14:51:50 +0200
+ 
+ hedgewars (1.0.2-3) unstable; urgency=medium
+ 
+   * Do not override dwz, export dwarf-4
+     binaries for now.
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 21 Sep 2022 14:52:06 +0200
+ 
+ hedgewars (1.0.2-2) unstable; urgency=medium
+ 
+   * debian/patches/9cd8d7748199.patch:
+   * debian/patches/c09063ea0267.patch:
+     - Fix issues with pas2c
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Wed, 21 Sep 2022 11:59:34 +0200
  
  hedgewars (1.0.2-1) unstable; urgency=medium
  
diff --cc debian/patches/series
index 8449bf5,9d67527..530fa36
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,6 +1,7 @@@
  #clang-10
  #aa011799cb63.patch
+ 9cd8d7748199.patch
+ c09063ea0267.patch
+ dwarf.patch
+ clang-15.patch
 +build-with-clang-11-to-avoid-armv7-conta.patch