From: Raspbian automatic forward porter Date: Tue, 1 Oct 2024 08:54:02 +0000 (+0100) Subject: Merge version 0.9.5-3+rpi1 and 0.9.5-3.1 to produce 0.9.5-3.1+rpi1 X-Git-Tag: raspbian/0.9.5-3.1+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=db3eca5fc6d82bfee3dd33bd2697142e175c4d0b;p=openorienteering-mapper.git Merge version 0.9.5-3+rpi1 and 0.9.5-3.1 to produce 0.9.5-3.1+rpi1 --- dd22db5c4380b31fbe47398c7a6c8f55f142ee06 diff --cc debian/changelog index 7758300,f1292ad..77c0fa3 --- a/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 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 at Thu, 15 Mar 2018 01:08:30 +0000] + * Disable testsuite. + - -- Raspbian forward porter Tue, 11 Jan 2022 02:36:31 +0000 ++ -- Raspbian forward porter 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 Sun, 09 Jul 2023 23:48:02 +0300 openorienteering-mapper (0.9.5-3) unstable; urgency=medium diff --cc debian/patches/series index ce7718b,8071759..fdefae8 --- a/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