Merge version 3.5.2-stable-2+rpi1 and 3.6+ds-2 to produce 3.6+ds-2+rpi1

diff --cc debian/changelog
index 14e89dca6e7d774b1e589eef1c56bf294649d399,23dd96ab1469cf7ab41dfcd54ac03f4677c45bd8..0a37db21dfd173fda0a2e3f2cab9d6450d9e8b0f
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,30 +1,37 @@@
- godot (3.5.2-stable-2+rpi1) trixie-staging; urgency=medium
++godot (3.6+ds-2+rpi1) trixie-staging; urgency=medium
 +
++  [changes brought forward from 3.5.2-stable-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 02 Nov 2023 20:11:26 +0000]
 +  * Link with libatomic on armhf too.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 02 Nov 2023 20:11:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 04 Jul 2025 22:49:44 +0000
++
+ godot (3.6+ds-2) unstable; urgency=medium
+ 
+   [ Travis Wrightsman ]
+   * Allow autopkgtest to fail on some architectures
+   * Remove after_script workarounds after upstream fix
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Mon, 30 Dec 2024 21:13:41 -0800
+ 
+ godot (3.6+ds-1) unstable; urgency=medium
+ 
+   [ Travis Wrightsman ]
+   * New upstream version 3.6+ds (Related: #1070845)
+   * Add autopkgtests
+   * Migrate metainfo and icon to modern freedesktop paths
+   * Install godot3 man page
+   * Unvendor as many dependencies as currently possible
+   * Replace custom_build suffix with Debian version
+   * Namespace everything to major version 3
+   * Namespace StartupWMClass to major version too
+   * Add myself to d/copyright
+   * Update VCS URL salsa.debian.org/games-team/godot3
+ 
+   [ Otto Kekäläinen ]
+   * Enable Salsa CI to improve quality assurance prior to upload
+   * Add myself to copyright and uploader while sponsoring Travis' work
+ 
+  -- Otto Kekäläinen <otto@debian.org>  Mon, 16 Dec 2024 16:13:02 -0800
  
  godot (3.5.2-stable-2) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge