From: Raspbian automatic forward porter Date: Mon, 10 Oct 2022 17:48:07 +0000 (+0100) Subject: Merge version 0.0.25b-2+rpi1 and 0.0.26-1 to produce 0.0.26-1+rpi1 X-Git-Tag: archive/raspbian/0.0.26-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d921b9f5497ae0b583a0fb4c6c03aeec1b60b23a;p=0ad.git Merge version 0.0.25b-2+rpi1 and 0.0.26-1 to produce 0.0.26-1+rpi1 --- d921b9f5497ae0b583a0fb4c6c03aeec1b60b23a diff --cc debian/changelog index ab23935,93cd6b4..01a2beb --- a/debian/changelog +++ b/debian/changelog @@@ -1,10 -1,19 +1,27 @@@ - 0ad (0.0.25b-2+rpi1) bookworm-staging; urgency=medium ++0ad (0.0.26-1+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 Fri, 08 Apr 2022 09:12:14 +0000 ++ -- Raspbian forward porter Mon, 10 Oct 2022 17:48:07 +0000 ++ + 0ad (0.0.26-1) unstable; urgency=medium + + * New upstream release. + * Fix "New upstream release - version 0.0.26" (Closes: #1020649) + * d/p/fix-build-mozjs-with-python-3.10.patch: removed because added upstream + * d/p/fix-build-atlas-gcc11-glibc-2.35.patch: removed because added upstream + * d/control: add libfreetype-dev in Build-Depends: to fix build error + * d/p/Disable-test_regression_rP26522.patch: remove test + * d/copyright: update file list and fix lintian warnings + * d/watch: upgrade version and fix lintian warning + * d/control: update Standards-Version: 4.6.1. No change needed + * d/rules: remove use of --dbgsym-migration= + * d/contol: upgrade debhelper-compat from 12 to 13 + * d/s/lintian-overrides: rename tag insane-line-length-in-source-file + + -- Ludovic Rousseau Sun, 02 Oct 2022 18:14:33 +0200 0ad (0.0.25b-2) unstable; urgency=medium diff --cc debian/patches/series index 04e1a0f,f91feef..99a03a3 --- a/debian/patches/series +++ b/debian/patches/series @@@ -2,6 -2,4 +2,5 @@@ 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 + Disable-test_regression_rP26522.patch +link-libatomic.patch