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

diff --cc debian/changelog
index d3820f031aaa7b0dc6093f6e6a305537775e65fd,2b878a3900642c002752c3115abe9cf0438915cc..d76965abfd9e4ab1ce3a4c1191590ccec96bb20f
--- 1/debian/changelog
--- 2/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 99a03a304611f118ae85801a014681140e73e66f,48cfc0cf7795e96d81e18072c1dcc326f9dafc79..3bb8a5fc820721c780771c8f4c5649791d476cf4
--- 1/debian/patches/series
--- 2/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

diff --cc debian/rules
Simple merge