From: Raspbian automatic forward porter Date: Thu, 11 Aug 2022 03:35:13 +0000 (+0100) Subject: Merge version 1.0.0-16+rpi1 and 1.0.0-19 to produce 1.0.0-19+rpi1 X-Git-Tag: archive/raspbian/1.0.0-19+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3cf91f3726d98020cb2dc00970ca81de101046b3;p=hedgewars.git Merge version 1.0.0-16+rpi1 and 1.0.0-19 to produce 1.0.0-19+rpi1 --- 3cf91f3726d98020cb2dc00970ca81de101046b3 diff --cc debian/changelog index f8fe144,a84d2af..3500e57 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,25 +1,35 @@@ - hedgewars (1.0.0-16+rpi1) bookworm-staging; urgency=medium ++hedgewars (1.0.0-19+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 1.0.0-4+rpi1 by Peter Michael Green 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. + - -- Peter Micheal Green Sun, 26 Jun 2022 21:54:37 +0000 ++ -- Raspbian forward porter Thu, 11 Aug 2022 03:35:13 +0000 ++ + hedgewars (1.0.0-19) unstable; urgency=medium + + * Add new patch to fix a cmake 3.24.0 build failure + + -- Gianfranco Costamagna Fri, 05 Aug 2022 17:21:55 +0200 + + hedgewars (1.0.0-18) unstable; urgency=medium + + * Fixup previous upload + * Drop duplicated entry in copyright file + * Drop trailing newline in changelog file + + -- Gianfranco Costamagna Fri, 05 Aug 2022 15:04:31 +0200 + + hedgewars (1.0.0-17) unstable; urgency=medium + + * Disable ffmpeg for now, code is not ffmpeg 5 compatible (Closes: #1016648) + * Drop dpkg-dev dependency + * Bump compat level to 13 + * Bump std-version to 4.6.1 + + -- Gianfranco Costamagna Fri, 05 Aug 2022 13:30:38 +0200 hedgewars (1.0.0-16) unstable; urgency=medium diff --cc debian/control index 0008eba,a636302..846bcf7 --- a/debian/control +++ b/debian/control @@@ -4,11 -4,10 +4,10 @@@ Priority: optiona Maintainer: Debian Games Team Uploaders: Dmitry E. Oboukhov , Gianfranco Costamagna - Standards-Version: 4.5.0 + Standards-Version: 4.6.1 Build-Depends: cmake, - clang [armel armhf i386 mipsel ppc64el], + clang-11 [armel armhf i386 mipsel ppc64el], - debhelper-compat (= 12), - dpkg-dev (>= 1.16.1~), + debhelper-compat (= 13), fp-compiler [!armel !armhf !i386 !mipsel !ppc64el], fp-units-misc [!armel !armhf !i386 !mipsel !ppc64el], fp-units-gfx [!armel !armhf !i386 !mipsel !ppc64el], diff --cc debian/patches/series index de9505f,bff245f..c35a461 --- a/debian/patches/series +++ b/debian/patches/series @@@ -7,5 -7,5 +7,6 @@@ fpc-3.2.0.patc 036263d63b05.patch f09db263bc2a.patch #aa011799cb63.patch - ffmpeg-5.0-compat.patch + #ffmpeg-5.0-compat.patch + new-cmake-3.24-build-fix.patch +build-with-clang-11-to-avoid-armv7-conta.patch