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

diff --cc debian/changelog
index 9aa2157400bd5e10c4bf3ce64f4fb05737fe27b6,9feaf15ad1e86fd0074abec50279c996d08815c5..ab239354accba6ba8f35289701bc8b0c4b5c4261
--- 1/debian/changelog
--- 2/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 <plugwash@raspbian.org> at Tue, 07 Sep 2021 08:50:57 +0000]
 +  * Link with libatomic.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 28 Dec 2021 16:13:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  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 <smcv@debian.org>  Mon, 28 Mar 2022 12:29:22 +0100
  
  0ad (0.0.25b-1.1) unstable; urgency=medium
  

diff --cc debian/patches/series
index 07f08d99a966d65a5db412dc109282392b9164f5,03f34253237666c4cee44998bcfe46f79b5e7e3f..04e1a0fd906e207fd11a026b468ef4612880b366
--- 1/debian/patches/series
--- 2/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