From: Raspbian automatic forward porter Date: Sun, 12 Mar 2023 11:17:28 +0000 (+0000) Subject: Merge version 4:22.12.2-1+rpi1 and 4:22.12.3-1 to produce 4:22.12.3-1+rpi1 X-Git-Tag: archive/raspbian/4%22.12.3-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6abbaf928d5f2bfc87872dec2093be34da05b150;p=marble.git Merge version 4:22.12.2-1+rpi1 and 4:22.12.3-1 to produce 4:22.12.3-1+rpi1 --- 6abbaf928d5f2bfc87872dec2093be34da05b150 diff --cc debian/changelog index 0b5b64b,9736255..d2dd56d --- a/debian/changelog +++ b/debian/changelog @@@ -1,16 -1,10 +1,24 @@@ - marble (4:22.12.2-1+rpi1) bookworm-staging; urgency=medium ++marble (4:22.12.3-1+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from 4:22.08.3-3+rpi1 by Peter Michael Green at Thu, 08 Dec 2022 15:44:12 +0000] + * Remove armhf from qtwebengine architecture list. + + [changes introduced in 4:22.12.0-2+rpi1 by Peter Michael Green] + * Update symbols file for raspbian. + + [changes brought forward from 4:22.12.0-2+rpi2 by Peter Michael Green at Sat, 07 Jan 2023 16:40:02 +0000] + * Remove armhf from qtwebengine architecture list in libmarble-dev + dependencies. + - -- Raspbian forward porter Fri, 10 Feb 2023 08:38:21 +0000 ++ -- Raspbian forward porter Sun, 12 Mar 2023 11:17:27 +0000 ++ + marble (4:22.12.3-1) unstable; urgency=medium + + [ Aurélien COUDERC ] + * New upstream release (22.12.3). + * Update build-deps and deps with the info from cmake. + + -- Aurélien COUDERC Wed, 01 Mar 2023 11:58:05 +0100 marble (4:22.12.2-1) unstable; urgency=medium diff --cc debian/control index 596a537,9e923f7..ab89482 --- a/debian/control +++ b/debian/control @@@ -84,10 -84,10 +84,10 @@@ Multi-Arch: sam Section: libdevel Depends: libastro-dev (= ${binary:Version}), libmarblewidget-qt5-28 (= ${binary:Version}), - libqt5svg5-dev (>= 5.7.0~), + libqt5svg5-dev (>= 5.14.0~), libqt5webkit5-dev (>= 5.4), - qtdeclarative5-dev (>= 5.7.0~), + qtdeclarative5-dev (>= 5.14.0~), - qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 armhf i386 mips64el mipsel], + qtwebengine5-dev (>= 5.14.0~) [amd64 arm64 i386 mips64el mipsel], ${misc:Depends}, ${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28}, ${shlibs:Depends},