diff -Nru ixo-usb-jtag-0.0.1/debian/changelog ixo-usb-jtag-0.0.1/debian/changelog --- ixo-usb-jtag-0.0.1/debian/changelog 2018-01-16 01:27:16.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/changelog 2020-06-27 23:28:50.000000000 +0000 @@ -1,3 +1,14 @@ +ixo-usb-jtag (0.0.1-2) unstable; urgency=medium + + * Migrate from sdcclib to sdar, fixing FTBFS with sdcc 3.9. + (Closes: #963389) + * Bump copyright years. + * Bump debhelper compat level to 12. + * Declare Rules-Requires-Root: no. + * Bump Standards-Version to 4.5.0, no changes needed. + + -- Stefano Rivera Sat, 27 Jun 2020 16:28:50 -0700 + ixo-usb-jtag (0.0.1-1) unstable; urgency=medium * New upstream release. diff -Nru ixo-usb-jtag-0.0.1/debian/compat ixo-usb-jtag-0.0.1/debian/compat --- ixo-usb-jtag-0.0.1/debian/compat 2018-01-16 01:27:16.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru ixo-usb-jtag-0.0.1/debian/control ixo-usb-jtag-0.0.1/debian/control --- ixo-usb-jtag-0.0.1/debian/control 2018-01-16 01:27:16.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/control 2020-06-27 23:28:50.000000000 +0000 @@ -2,11 +2,12 @@ Maintainer: Stefano Rivera Section: embedded Priority: optional -Build-Depends: debhelper (>= 9), sdcc -Standards-Version: 4.1.3 +Build-Depends: debhelper-compat (= 12), sdcc +Standards-Version: 4.5.0 Homepage: https://github.com/mithro/ixo-usb-jtag -Vcs-Git: https://salsa.debian.org/debian/ixo-usb-jtag +Vcs-Git: https://salsa.debian.org/debian/ixo-usb-jtag.git Vcs-Browser: https://salsa.debian.org/debian/ixo-usb-jtag +Rules-Requires-Root: no Package: ixo-usb-jtag Architecture: all diff -Nru ixo-usb-jtag-0.0.1/debian/copyright ixo-usb-jtag-0.0.1/debian/copyright --- ixo-usb-jtag-0.0.1/debian/copyright 2018-01-16 01:27:16.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/copyright 2020-06-27 23:28:50.000000000 +0000 @@ -10,7 +10,7 @@ License: GPL-2+ Files: debian/* -Copyright: 2016-2017, Stefano Rivera +Copyright: 2016-2020, Stefano Rivera License: GPL-2+ License: GPL-2+ diff -Nru ixo-usb-jtag-0.0.1/debian/patches/sdcc-3.9 ixo-usb-jtag-0.0.1/debian/patches/sdcc-3.9 --- ixo-usb-jtag-0.0.1/debian/patches/sdcc-3.9 1970-01-01 00:00:00.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/patches/sdcc-3.9 2020-06-27 23:28:50.000000000 +0000 @@ -0,0 +1,44 @@ +From: Stefano Rivera +Date: Sat, 27 Jun 2020 15:52:32 -0700 +Subject: Make compatible with sdcc 3.9.0 + +sdcclib was replaced by sdar + +Forwarded: https://github.com/mithro/ixo-usb-jtag/pull/14 +Bug-Debian: https://bugs.debian.org/963389 +--- + Makefile | 2 +- + fx2/Makefile | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index d45f658..0cdd672 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ SDCC_PREFIX ?= + + CC = $(SDCC_PREFIX)sdcc + AS = $(SDCC_PREFIX)sdas8051 +-AR = $(SDCC_PREFIX)sdcclib ++AR = $(SDCC_PREFIX)sdar + PACKIHX=$(SDCC_PREFIX)packihx + + CFLAGS+=-mmcs51 --no-xinit-opt -I${LIBDIR} +diff --git a/fx2/Makefile b/fx2/Makefile +index 738ea7a..040fbd9 100644 +--- a/fx2/Makefile ++++ b/fx2/Makefile +@@ -19,11 +19,11 @@ CC=sdcc + CFLAGS+=-mmcs51 --no-xinit-opt -I. + CPPFLAGS+= + OBJS=delay.rel fx2utils.rel i2c.rel isr.rel timer.rel usb_common.rel +-AR=sdcclib ++AR=sdar + + (%.rel) : %.c + $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $*.rel +- $(AR) -a $@ $*.rel ++ $(AR) -rc $@ $*.rel + rm $*.rel + + libfx2.lib: libfx2.lib($(OBJS)) diff -Nru ixo-usb-jtag-0.0.1/debian/patches/series ixo-usb-jtag-0.0.1/debian/patches/series --- ixo-usb-jtag-0.0.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ ixo-usb-jtag-0.0.1/debian/patches/series 2020-06-27 23:28:50.000000000 +0000 @@ -0,0 +1 @@ +sdcc-3.9