From: Raspbian automatic forward porter Date: Thu, 1 Aug 2019 20:39:23 +0000 (+0100) Subject: Merge version 1.6.0+ds-3+rpi1 and 1.6.0+ds-5 to produce 1.6.0+ds-5+rpi1 X-Git-Tag: archive/raspbian/1.6.0+ds-5+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7b6483a203831890d51c97e12d86a08ce0a04069;p=gpsbabel.git Merge version 1.6.0+ds-3+rpi1 and 1.6.0+ds-5 to produce 1.6.0+ds-5+rpi1 --- 7b6483a203831890d51c97e12d86a08ce0a04069 diff --cc debian/changelog index 02cb167,c2aa147..d3de20d --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,14 +1,24 @@@ - gpsbabel (1.6.0+ds-3+rpi1) bullseye-staging; urgency=medium ++gpsbabel (1.6.0+ds-5+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from 1.5.4-2+rpi1 by Peter Michael Green at Thu, 26 Oct 2017 12:10:21 +0000] + * Remove armhf from architecture list for qtwebengine build-dep, + we don't have (and may never have) it in Raspbian. + * Remove armhf from architecture list for gpsbabel-gui, it + needs the aforementioned build-dep. + - -- Peter Micheal Green Sat, 27 Jul 2019 20:40:26 +0000 ++ -- Raspbian forward porter Thu, 01 Aug 2019 20:39:23 +0000 ++ + gpsbabel (1.6.0+ds-5) unstable; urgency=medium + + * Only override build-arch in d/rules, fixes building on all + + -- Jochen Sprickerhof Fri, 26 Jul 2019 15:54:26 +0200 + + gpsbabel (1.6.0+ds-4) unstable; urgency=medium + + * Fix gpsbabel-gui package (Closes: #932875) + + -- Jochen Sprickerhof Fri, 26 Jul 2019 11:12:00 +0200 gpsbabel (1.6.0+ds-3) unstable; urgency=medium diff --cc debian/patches/series index f32a26f,f3752ea..e9e4fab --- a/debian/patches/series +++ b/debian/patches/series @@@ -6,4 -6,4 +6,5 @@@ htmldoc-locatio 0007-Use-system-shapelib.patch 0008-Use-usb.h-from-system-include-dir.patch 0011-Fix-exec-in-gpsbabel.desktop.patch + 0009-Don-t-pass-MAKEFLAGS-to-MAKE.patch +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990