From: Raspbian automatic forward porter Date: Sun, 29 Sep 2024 10:18:16 +0000 (+0100) Subject: Merge version 0.19.0+ds-5+rpi1 and 0.20.0+ds-1 to produce 0.20.0+ds-1+rpi1 X-Git-Tag: archive/raspbian/0.20.0+ds-1+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6ab3027be71727c8c9611f07a5f3c71eeaae6967;p=merkaartor.git Merge version 0.19.0+ds-5+rpi1 and 0.20.0+ds-1 to produce 0.20.0+ds-1+rpi1 --- 6ab3027be71727c8c9611f07a5f3c71eeaae6967 diff --cc debian/changelog index 128b15f,0cabfe7..f2c2cb6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,9 -1,14 +1,21 @@@ - merkaartor (0.19.0+ds-5+rpi1) trixie-staging; urgency=medium ++merkaartor (0.20.0+ds-1+rpi1) trixie-staging; urgency=medium + + [changes brought forward from 0.19.0+ds-2+rpi1 by root at Tue, 14 Sep 2021 15:50:33 +0000] + * Remove armhf from qtwebengine architecture lists. + - -- Peter Michael Green Tue, 25 Jun 2024 16:02:40 +0000 ++ -- Raspbian forward porter Sun, 29 Sep 2024 10:18:16 +0000 ++ + merkaartor (0.20.0+ds-1) unstable; urgency=medium + + * Team upload. + * New upstream release. + * Bump Standards-Version to 4.7.0, no changes. + * Drop patches applied upstream. + * Update copyright file. + * Add protobuf build dependencies. + * Add libqt5networkauth5-dev build dependency for OAuth2 support. + + -- Bas Couwenberg Sun, 08 Sep 2024 06:20:04 +0200 merkaartor (0.19.0+ds-5) unstable; urgency=medium diff --cc debian/control index 1b40798,8940d71..be46138 --- a/debian/control +++ b/debian/control @@@ -18,9 -20,10 +20,10 @@@ Build-Depends: cmake libxml2-dev, libxslt1-dev, pkgconf, + protobuf-compiler, qtbase5-dev, qttools5-dev, - qtwebengine5-dev [amd64 arm64 armhf i386 mips64el], + qtwebengine5-dev [amd64 arm64 i386 mips64el], sharutils, xauth, xvfb,