diff -Nru console-braille-1.9/debian/changelog console-braille-1.10/debian/changelog --- console-braille-1.9/debian/changelog 2020-11-01 00:36:30.000000000 +0000 +++ console-braille-1.10/debian/changelog 2021-10-25 22:26:39.000000000 +0000 @@ -1,3 +1,15 @@ +console-braille (1.10) unstable; urgency=medium + + [ Samuel Thibault ] + * control: Set Rules-Requires-Root to no. + * Makefile, rules: Fix cross-build. + + [ Debian Janitor ] + * Bump debhelper from old 12 to 13. + * Update standards version to 4.5.1, no changes needed. + + -- Samuel Thibault Tue, 26 Oct 2021 00:26:39 +0200 + console-braille (1.9) unstable; urgency=medium [ Samuel Thibault ] diff -Nru console-braille-1.9/debian/control console-braille-1.10/debian/control --- console-braille-1.9/debian/control 2020-06-15 07:38:08.000000000 +0000 +++ console-braille-1.10/debian/control 2021-09-26 08:39:25.000000000 +0000 @@ -3,8 +3,9 @@ Priority: optional Maintainer: Debian Accessibility Team Uploaders: Samuel Thibault -Build-Depends: debhelper-compat (= 12), dh-exec -Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 13), dh-exec +Rules-Requires-Root: no +Standards-Version: 4.5.1 Vcs-Browser: https://salsa.debian.org/a11y-team/console-braille Vcs-Git: https://salsa.debian.org/a11y-team/console-braille.git Homepage: http://brl.thefreecat.org/ diff -Nru console-braille-1.9/debian/rules console-braille-1.10/debian/rules --- console-braille-1.9/debian/rules 2015-12-22 23:38:49.000000000 +0000 +++ console-braille-1.10/debian/rules 2021-09-26 14:29:52.000000000 +0000 @@ -5,6 +5,9 @@ %: dh $@ +override_dh_auto_build: + dh_auto_build -- BUILD_CC=gcc + override_dh_install: dh_install for i in amiga atari i386 mac sun; \ diff -Nru console-braille-1.9/debian/salsa-ci.yml console-braille-1.10/debian/salsa-ci.yml --- console-braille-1.9/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ console-braille-1.10/debian/salsa-ci.yml 2021-09-26 14:40:26.000000000 +0000 @@ -0,0 +1,9 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml + +test-crossbuild-arm64: + allow_failure: false + +# vim: ts=2 sw=2 et sts=2 ft=yaml diff -Nru console-braille-1.9/Makefile console-braille-1.10/Makefile --- console-braille-1.9/Makefile 2018-02-18 01:22:13.000000000 +0000 +++ console-braille-1.10/Makefile 2021-09-26 14:31:55.000000000 +0000 @@ -4,6 +4,8 @@ TESTPROGS:=$(BRLS:.c=.test) TESTS:=$(BRLS:.c=.txt) +BUILD_CC ?= $(CC) + UNAME=$(shell uname) all: $(TARGETS) brl.uni gen-psf-block @@ -14,15 +16,24 @@ all: setbrlkeys endif -brl-%: brl-%.o psf.o - $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) + +brl-%: brl-%.build.o psf.build.o + $(BUILD_CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) gen-psf-block: gen-psf-block.o psf.o -%.test.o: %.c do.h - $(CC) $(CFLAGS) $(CPPFLAGS) -DTEST -c -o $@ $< +%.build: %.c + $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(LDFLAGS) $^ $(LDLIBS) + + +%.build.o: %.c + $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< -.INTERMEDIATE: $(PROGS) $(TESTPROGS) uni +%.test: %.c do.h + $(BUILD_CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DTEST -o $@ $< + + +.INTERMEDIATE: $(PROGS) $(TESTPROGS) uni.build $(TARGETS): %.psf: % ./$< > $@ @@ -30,8 +41,9 @@ $(TESTS): %.txt: %.test ./$< > $@ -brl.uni: uni +brl.uni: uni.build ./$< 0 > $@ + clean: - rm -f $(PROGS) $(TESTPROGS) psf.o $(BRLS:.c=.o) gen-psf-block.o $(TARGETS) $(TESTS) brl.uni uni setbrlkeys gen-psf-block + rm -f $(PROGS) $(TESTPROGS) psf.o $(BRLS:.c=.o) gen-psf-block.o $(TARGETS) $(TESTS) brl.uni uni.build setbrlkeys gen-psf-block