Merge version 0.9.5-3+rpi1 and 0.9.5-3.1 to produce 0.9.5-3.1+rpi1

diff --cc debian/changelog
index 77583006d01fad1b87736c7e437f86f98c45d877,f1292ada3c2779bbdcb08b9d9355de8a91d05d53..77c0fa3dd4f3f5cbd87f9184a1731249d78b523e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,10 +1,20 @@@
- openorienteering-mapper (0.9.5-3+rpi1) bookworm-staging; urgency=medium
++openorienteering-mapper (0.9.5-3.1+rpi1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 0.7.0-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 26 Oct 2017 13:33:40 +0000]
 +  * Use "debian" as "provider" for "licensing information".
 +
 +  [changes brought forward from 0.7.0-1+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 15 Mar 2018 01:08:30 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Tue, 11 Jan 2022 02:36:31 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 01 Oct 2024 08:54:02 +0000
++
+ openorienteering-mapper (0.9.5-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Add a patch to make the QPainterTest pass with Qt 5.15.9
+     (closes: #1038402).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Sun, 09 Jul 2023 23:48:02 +0300
  
  openorienteering-mapper (0.9.5-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index ce7718b29efeccb82631d1ff7381f2e782e77839,8071759153877d954d2d9ee82f10c610d2d57911..fdefae8fe48c5554943af379743c2f31c6e0da27
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,4 +1,5 @@@
  fix-help-data-dir.patch
  proj8.patch
  proj8.2.0.patch
+ qt-5.15.9.patch
 +force-debian-license-info.patch