From: Raspbian automatic forward porter Date: Fri, 14 Aug 2020 02:57:31 +0000 (+0100) Subject: Merge version 1.7.0+ds-3+rpi1 and 1.7.0+ds-5 to produce 1.7.0+ds-5+rpi1 X-Git-Tag: archive/raspbian/1.7.0+ds-5+rpi1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=82f86ed9bdf7fafc419ca36267728a2bc1f2b6f2;p=gpsbabel.git Merge version 1.7.0+ds-3+rpi1 and 1.7.0+ds-5 to produce 1.7.0+ds-5+rpi1 --- 9fc8cdafa81bfd43badc250f273043bc7f1a6519 diff --cc debian/changelog index 64abcb9,203de05..db1cb38 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,14 +1,24 @@@ - gpsbabel (1.7.0+ds-3+rpi1) bullseye-staging; urgency=medium ++gpsbabel (1.7.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. + - -- Raspbian forward porter Fri, 17 Jul 2020 10:03:52 +0000 ++ -- Raspbian forward porter Fri, 14 Aug 2020 02:57:31 +0000 ++ + gpsbabel (1.7.0+ds-5) unstable; urgency=medium + + * Add patch for i386 test failure + + -- Jochen Sprickerhof Fri, 07 Aug 2020 15:38:18 +0200 + + gpsbabel (1.7.0+ds-4) unstable; urgency=medium + + * Add patch for endianness issues + + -- Jochen Sprickerhof Fri, 07 Aug 2020 11:31:04 +0200 gpsbabel (1.7.0+ds-3) unstable; urgency=medium diff --cc debian/patches/series index d87796b,2af2336..6d574b3 --- a/debian/patches/series +++ b/debian/patches/series @@@ -7,4 -7,5 +7,6 @@@ htmldoc-locatio cross.patch gmapbase.html-location 0009-Drop-mac-libusb-libusb.h-dependency.patch + 618.patch + 620.patch +auto-1.6.0+ds-3+rpi1-1edcf7f4aaa58679f27b343c3ef2291ab331699f-1564383990