diff -Nru dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/changelog dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/changelog --- dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/changelog 2021-01-23 17:11:16.000000000 +0000 +++ dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/changelog 2021-01-27 04:16:35.000000000 +0000 @@ -1,3 +1,11 @@ +dump1090-mutability (1.15~20180310.4a16df3+dfsg-8) unstable; urgency=medium + + * Team upload. + * Patch Makefile for FTCBFS (Closes: #981130) + Thank you to Helmut Grohne for the patch. + + -- tony mancill Tue, 26 Jan 2021 20:16:35 -0800 + dump1090-mutability (1.15~20180310.4a16df3+dfsg-7) unstable; urgency=medium * Team upload. diff -Nru dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/04-link-order.patch dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/04-link-order.patch --- dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/04-link-order.patch 2021-01-23 17:11:16.000000000 +0000 +++ dump1090-mutability-1.15~20180310.4a16df3+dfsg/debian/patches/04-link-order.patch 2021-01-27 04:16:35.000000000 +0000 @@ -1,24 +1,25 @@ -Author: Christoph Berg -Description: Fix linking against rtlsdr +Author: Christoph Berg and Helmut Grohne +Description: Fix linking against rtlsdr + pkg-config for cross-compilation Forwarded: not-needed, fixed upstream by other means --- a/Makefile +++ b/Makefile -@@ -17,7 +17,7 @@ endif +@@ -17,7 +17,8 @@ CPPFLAGS+=-DMODES_DUMP1090_VERSION=\"$(DUMP1090_VERSION)\" CFLAGS+=-O2 -g -Wall -Werror -W -Wno-unknown-warning-option -Wno-format-truncation LIBS=-lpthread -lm -LIBS_RTL=`pkg-config --libs librtlsdr libusb-1.0` -+LIBS_RTL=`pkg-config --libs libusb-1.0 librtlsdr` ++PKG_CONFIG?=pkg-config ++LIBS_RTL=`$(PKG_CONFIG) --libs libusb-1.0 librtlsdr` CC=gcc UNAME := $(shell uname) -@@ -48,7 +48,7 @@ all: dump1090 view1090 +@@ -48,7 +49,7 @@ %.o: %.c *.h $(CC) $(CPPFLAGS) $(CFLAGS) $(EXTRACFLAGS) -c $< -o $@ -dump1090.o: CFLAGS += `pkg-config --cflags librtlsdr libusb-1.0` -+dump1090.o: CFLAGS += `pkg-config --cflags libusb-1.0 librtlsdr` ++dump1090.o: CFLAGS += `$(PKG_CONFIG) --cflags libusb-1.0 librtlsdr` dump1090: dump1090.o anet.o interactive.o mode_ac.o mode_s.o net_io.o crc.o demod_2400.o stats.o cpr.o icao_filter.o track.o util.o convert.o $(COMPAT) $(CC) -g -o $@ $^ $(LIBS) $(LIBS_RTL) $(LDFLAGS)