Merge version 0.0.25b-2+rpi1 and 0.0.26-1 to produce 0.0.26-1+rpi1 archive/raspbian/0.0.26-1+rpi1 raspbian/0.0.26-1+rpi1
authorRaspbian automatic forward porter <root@raspbian.org>
Mon, 10 Oct 2022 17:48:07 +0000 (18:48 +0100)
committerRaspbian automatic forward porter <root@raspbian.org>
Mon, 10 Oct 2022 17:48:07 +0000 (18:48 +0100)
1  2 
build/premake/premake5.lua
debian/changelog
debian/patches/series
debian/rules

Simple merge
index ab239354accba6ba8f35289701bc8b0c4b5c4261,93cd6b4ad7ad5025fcfc50f60e2eaec0e6f210e2..01a2beb995854c6ae1838afd6f179712d0e23d8a
@@@ -1,10 -1,19 +1,27 @@@
- 0ad (0.0.25b-2+rpi1) bookworm-staging; urgency=medium
++0ad (0.0.26-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.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 08 Apr 2022 09:12:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 10 Oct 2022 17:48:07 +0000
++
+ 0ad (0.0.26-1) unstable; urgency=medium
+   * New upstream release.
+   * Fix "New upstream release - version 0.0.26" (Closes: #1020649)
+   * d/p/fix-build-mozjs-with-python-3.10.patch: removed because added upstream
+   * d/p/fix-build-atlas-gcc11-glibc-2.35.patch: removed because added upstream
+   * d/control: add libfreetype-dev in Build-Depends: to fix build error
+   * d/p/Disable-test_regression_rP26522.patch: remove test
+   * d/copyright: update file list and fix lintian warnings
+   * d/watch: upgrade version and fix lintian warning
+   * d/control: update Standards-Version: 4.6.1. No change needed
+   * d/rules: remove use of --dbgsym-migration=
+   * d/contol: upgrade debhelper-compat from 12 to 13
+   * d/s/lintian-overrides: rename tag insane-line-length-in-source-file
+  -- Ludovic Rousseau <rousseau@debian.org>  Sun, 02 Oct 2022 18:14:33 +0200
  
  0ad (0.0.25b-2) unstable; urgency=medium
  
index 04e1a0fd906e207fd11a026b468ef4612880b366,f91feef0357c42b52db235902eb80419840e27aa..99a03a304611f118ae85801a014681140e73e66f
@@@ -2,6 -2,4 +2,5 @@@ 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
+ Disable-test_regression_rP26522.patch
 +link-libatomic.patch
diff --cc debian/rules
Simple merge