From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 16 Jan 2023 07:10:49 +0000 (+0000)
Subject: Merge version 0.0.26-2+rpi1 and 0.0.26-3 to produce 0.0.26-3+rpi1
X-Git-Tag: archive/raspbian/0.0.26-3+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=50483ce4ef98482246e40ddd3ea265ea39578f6d;p=0ad.git

Merge version 0.0.26-2+rpi1 and 0.0.26-3 to produce 0.0.26-3+rpi1
---

046dd6e4e897490940931a5e44f010b2d2d450ed
diff --cc debian/changelog
index d3820f0,2b878a3..d76965a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,18 @@@
- 0ad (0.0.26-2+rpi1) bookworm-staging; urgency=medium
++0ad (0.0.26-3+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, 01 Nov 2022 20:09:55 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 16 Jan 2023 07:10:49 +0000
++
+ 0ad (0.0.26-3) unstable; urgency=medium
+ 
+   * Fix FTBFS with Python 3.11. (Closes: #1028179)
+     - Add build-dep on git.
+   * Update Standards version to 4.6.2, no changes needed.
+ 
+  -- Vincent Cheng <vcheng@debian.org>  Sun, 08 Jan 2023 00:21:57 -0800
  
  0ad (0.0.26-2) unstable; urgency=medium
  
diff --cc debian/patches/series
index 99a03a3,48cfc0c..3bb8a5f
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -3,4 -3,6 +3,7 @@@ allow-build-with-root.patc
  fix-bindir.patch
  Fix-build-mozjs-on-armhf.patch
  Disable-test_regression_rP26522.patch
+ fix_python_3.11_ftbfs.patch
+ # Do NOT include mozjs_virtualenv.patch here, GNU patch cannot handle binary patches
+ # See fix_python_3.11_ftbfs.patch for more context
 +link-libatomic.patch