From: Raspbian automatic forward porter Date: Tue, 28 Dec 2021 16:13:36 +0000 (+0000) Subject: Merge version 0.0.25b-1+rpi1 and 0.0.25b-1.1 to produce 0.0.25b-1.1+rpi1 X-Git-Tag: raspbian/0.0.25b-1.1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f96db137b93341e3a1b3241bd9388673d708a5fc;p=0ad.git Merge version 0.0.25b-1+rpi1 and 0.0.25b-1.1 to produce 0.0.25b-1.1+rpi1 --- e9c0f4cdd2f399168504a1deb9be8ef68342fb5f diff --cc debian/changelog index 34bb2c8,9f37a4d..9aa2157 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,9 +1,17 @@@ - 0ad (0.0.25b-1+rpi1) bookworm-staging; urgency=medium ++0ad (0.0.25b-1.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. + - -- Peter Michael Green Tue, 07 Sep 2021 08:50:57 +0000 ++ -- Raspbian forward porter Tue, 28 Dec 2021 16:13:36 +0000 ++ + 0ad (0.0.25b-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix building mozjs on armhf (Closes: #1001882) + + -- Shengjing Zhu Thu, 23 Dec 2021 01:34:12 +0800 0ad (0.0.25b-1) unstable; urgency=medium diff --cc debian/patches/series index 4abe65f,ad39f06..07f08d9 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,4 -1,4 +1,5 @@@ TestStunClient allow-build-with-root.patch fix-bindir.patch + Fix-build-mozjs-on-armhf.patch +link-libatomic.patch