From: Raspbian automatic forward porter Date: Sat, 17 May 2025 03:37:12 +0000 (+0100) Subject: Merge version 4:24.12.3-3+rpi1 and 4:25.04.0-1 to produce 4:25.04.0-1+rpi1 X-Git-Tag: archive/raspbian/4%25.04.0-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c91fef789f92e3fcbc2fc32573c308dd511d2461;p=marble.git Merge version 4:24.12.3-3+rpi1 and 4:25.04.0-1 to produce 4:25.04.0-1+rpi1 --- c91fef789f92e3fcbc2fc32573c308dd511d2461 diff --cc debian/changelog index defc4b9,79a4398..5d60e06 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,10 +1,18 @@@ - marble (4:24.12.3-3+rpi1) trixie-staging; urgency=medium ++marble (4:25.04.0-1+rpi1) trixie-staging; urgency=medium + ++ [changes brought forward from 4:24.12.3-3+rpi1 by Peter Michael Green at Sun, 04 May 2025 06:29:14 +0000] + * Remove armhf from qtwebengine architecture lists. + * Update symbols file for raspbian. + - -- Peter Michael Green Sun, 04 May 2025 06:29:14 +0000 ++ -- Raspbian forward porter Sat, 17 May 2025 03:37:12 +0000 ++ + marble (4:25.04.0-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (25.04.0). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Thu, 17 Apr 2025 22:02:43 +0200 marble (4:24.12.3-3) unstable; urgency=medium diff --cc debian/control index 8335c1c,63f76fc..1278786 --- a/debian/control +++ b/debian/control @@@ -88,10 -88,10 +88,10 @@@ Multi-Arch: sam Section: libdevel Depends: libastro-dev (= ${binary:Version}), libmarblewidget-qt6-28 (= ${binary:Version}), - qt6-base-dev (>= 6.6~), qt6-5compat-dev (>= 6.6~), + qt6-base-dev (>= 6.6~), qt6-svg-dev (>= 6.6~), - qt6-webengine-dev (>= 6.6~) [amd64 arm64 armhf i386], + qt6-webengine-dev (>= 6.6~) [amd64 arm64 i386], ${misc:Depends}, ${sameVersionDep:qt6-base-dev:libmarblewidget-qt6-28}, ${shlibs:Depends},