From: Raspbian automatic forward porter Date: Fri, 8 Apr 2022 09:12:14 +0000 (+0100) Subject: Merge version 0.0.25b-1.1+rpi1 and 0.0.25b-2 to produce 0.0.25b-2+rpi1 X-Git-Tag: raspbian/0.0.25b-2+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fee93cab13c6b0fff2925e4f4f35505dca80e350;p=0ad.git Merge version 0.0.25b-1.1+rpi1 and 0.0.25b-2 to produce 0.0.25b-2+rpi1 --- c95127703af7679f041c474b84d8c6c59ba29b34 diff --cc debian/changelog index 9aa2157,9feaf15..ab23935 --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,13 +1,21 @@@ - 0ad (0.0.25b-1.1+rpi1) bookworm-staging; urgency=medium ++0ad (0.0.25b-2+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 0.0.25b-1+rpi1 by Peter Michael Green at Tue, 07 Sep 2021 08:50:57 +0000] + * Link with libatomic. + * Fix clean target. + - -- Raspbian forward porter Tue, 28 Dec 2021 16:13:36 +0000 ++ -- Raspbian forward porter Fri, 08 Apr 2022 09:12:14 +0000 ++ + 0ad (0.0.25b-2) unstable; urgency=medium + + * Team upload + * Add patches from Ubuntu (Closes: #1008075) + - d/p/fix-build-mozjs-with-python-3.10.patch: + Add patch from upstream via Ubuntu to fix FTBFS with Python 3.10 + - d/p/fix-build-atlas-gcc11-glibc-2.35.patch: + Add patch from upstream via Ubuntu to fix future FTBFS with glibc 2.35 + + -- Simon McVittie Mon, 28 Mar 2022 12:29:22 +0100 0ad (0.0.25b-1.1) unstable; urgency=medium diff --cc debian/patches/series index 07f08d9,03f3425..04e1a0f --- a/debian/patches/series +++ b/debian/patches/series @@@ -2,4 -2,5 +2,6 @@@ TestStunClien allow-build-with-root.patch fix-bindir.patch Fix-build-mozjs-on-armhf.patch + fix-build-mozjs-with-python-3.10.patch + fix-build-atlas-gcc11-glibc-2.35.patch +link-libatomic.patch