Merge version 0.0.25b-1+rpi1 and 0.0.25b-1.1 to produce 0.0.25b-1.1+rpi1

diff --cc debian/changelog
index 34bb2c810fde89c95f65aee15494a686de1ec0bf,9f37a4d595ca4fded72b44159ad963e76a3ed656..9aa2157400bd5e10c4bf3ce64f4fb05737fe27b6
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> at Tue, 07 Sep 2021 08:50:57 +0000]
 +  * Link with libatomic.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 07 Sep 2021 08:50:57 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <zhsj@debian.org>  Thu, 23 Dec 2021 01:34:12 +0800
  
  0ad (0.0.25b-1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 4abe65fc7ab0bc584f130c9592e8df59b384a0f8,ad39f067b2bb6987b4538df3dde7ebae8143b93d..07f08d99a966d65a5db412dc109282392b9164f5
--- 1/debian/patches/series
--- 2/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