diff -Nru direwolf-1.5+dfsg/debian/changelog direwolf-1.5+dfsg/debian/changelog --- direwolf-1.5+dfsg/debian/changelog 2019-07-09 08:51:48.000000000 +0000 +++ direwolf-1.5+dfsg/debian/changelog 2019-10-16 22:45:20.000000000 +0000 @@ -1,3 +1,10 @@ +direwolf (1.5+dfsg-2+rpi1) bullseye-staging; urgency=medium + + * Apply patch from https://salsa.debian.org/debian-hamradio-team/direwolf/merge_requests/2/diffs?commit_id=20f13cfa3bc6d7432a7007133fc92b166331a580 + to really fix build with new gpsd. + + -- Peter Michael Green Wed, 16 Oct 2019 22:45:20 +0000 + direwolf (1.5+dfsg-2) unstable; urgency=medium [ Christian Ehrhardt ] diff -Nru direwolf-1.5+dfsg/debian/patches/Issue-196-Compatibility-with-GPSD-API-7.patch direwolf-1.5+dfsg/debian/patches/Issue-196-Compatibility-with-GPSD-API-7.patch --- direwolf-1.5+dfsg/debian/patches/Issue-196-Compatibility-with-GPSD-API-7.patch 2019-07-09 08:44:31.000000000 +0000 +++ direwolf-1.5+dfsg/debian/patches/Issue-196-Compatibility-with-GPSD-API-7.patch 2019-10-16 22:44:56.000000000 +0000 @@ -11,8 +11,6 @@ dwgpsd.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) -diff --git a/dwgpsd.c b/dwgpsd.c -index 5709497..ff37c68 100644 --- a/dwgpsd.c +++ b/dwgpsd.c @@ -57,7 +57,10 @@ @@ -21,13 +19,13 @@ // GPSD_API_MAJOR_VERSION 6 provided by libgps22 when the attached patch is applied. -#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 6 + -+// Also compatible with API 7 with conditional compilation later. ++// Try to compile with later APIs - this avoids uploads for gpsd code changes + -+#if GPSD_API_MAJOR_VERSION < 5 || GPSD_API_MAJOR_VERSION > 7 ++#if GPSD_API_MAJOR_VERSION < 5 #error libgps API version might be incompatible. #endif -@@ -257,7 +260,19 @@ static void * read_gpsd_thread (void *arg) +@@ -257,7 +260,19 @@ static void * read_gpsd_thread (void *ar /* Fall thru to read which should get error and bail out. */ } @@ -47,6 +45,3 @@ text_color_set(DW_COLOR_ERROR); dw_printf ("------------------------------------------\n"); --- -2.17.1 -