From: Raspbian automatic forward porter <root@raspbian.org>
Date: Tue, 1 Nov 2022 20:09:55 +0000 (+0000)
Subject: Merge version 0.0.26-1+rpi1 and 0.0.26-2 to produce 0.0.26-2+rpi1
X-Git-Tag: archive/raspbian/0.0.26-2+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f78e67d1e8857908c7871316a88efb6bae2a951b;p=0ad.git

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

da369ef68203ff8cd4ca1f832727b04ed25755c2
diff --cc debian/changelog
index 01a2beb,701c06b..d3820f0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,17 @@@
- 0ad (0.0.26-1+rpi1) bookworm-staging; urgency=medium
++0ad (0.0.26-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>  Mon, 10 Oct 2022 17:48:07 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Nov 2022 20:09:55 +0000
++
+ 0ad (0.0.26-2) unstable; urgency=medium
+ 
+   * Team upload.
+   * Transition to wxWidgets 3.2 (Closes: #1019839)
+ 
+  -- Scott Talbert <swt@techie.net>  Wed, 26 Oct 2022 16:13:38 -0400
  
  0ad (0.0.26-1) unstable; urgency=medium