diff -Nru a56-1.3+dfsg/debian/changelog a56-1.3+dfsg/debian/changelog --- a56-1.3+dfsg/debian/changelog 2014-03-23 18:08:27.000000000 +0000 +++ a56-1.3+dfsg/debian/changelog 2018-02-20 17:00:00.000000000 +0000 @@ -1,3 +1,15 @@ +a56 (1.3+dfsg-9) unstable; urgency=low + + * debian/control: use dh11 + * debian/control: bump standard to 4.1.3 (no changes) + * debian/control: use Priority: optional + * debian/control: add salsa URLs + * debian/patches: finally remove unused patches + * debian/rules: add hardening flags + * debian/rules: add --no-parallel + + -- Thorsten Alteholz Tue, 20 Feb 2018 18:00:00 +0100 + a56 (1.3+dfsg-8) unstable; urgency=low * Fix the FTBFS with clang:, (Closes: #739929) diff -Nru a56-1.3+dfsg/debian/compat a56-1.3+dfsg/debian/compat --- a56-1.3+dfsg/debian/compat 2012-11-26 09:21:14.000000000 +0000 +++ a56-1.3+dfsg/debian/compat 2018-02-20 17:00:00.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru a56-1.3+dfsg/debian/control a56-1.3+dfsg/debian/control --- a56-1.3+dfsg/debian/control 2014-03-23 18:09:05.000000000 +0000 +++ a56-1.3+dfsg/debian/control 2018-02-20 17:00:00.000000000 +0000 @@ -1,10 +1,13 @@ Source: a56 Section: devel -Priority: extra +Priority: optional Maintainer: Thorsten Alteholz -Build-Depends: debhelper (>= 9), bison -Standards-Version: 3.9.5 +Build-Depends: debhelper (>= 11) + , bison +Standards-Version: 4.1.3 Homepage: http://www.zdomain.com/a56.html +Vcs-Browser: https://salsa.debian.org/alteholz/a56.git +Vcs-Git: https://salsa.debian.org/alteholz/a56.git Package: a56 Architecture: any diff -Nru a56-1.3+dfsg/debian/patches/to-be-removed/01_keybld_not_in_path.diff a56-1.3+dfsg/debian/patches/to-be-removed/01_keybld_not_in_path.diff --- a56-1.3+dfsg/debian/patches/to-be-removed/01_keybld_not_in_path.diff 2012-11-26 07:39:54.000000000 +0000 +++ a56-1.3+dfsg/debian/patches/to-be-removed/01_keybld_not_in_path.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- build-tree/Makefile~ 1998-03-18 17:22:46.000000000 +0100 -+++ build-tree/Makefile 2008-10-20 17:13:20.000000000 +0200 -@@ -84,7 +84,7 @@ - lex.o: lex.c gram.h - - kparse.c: a56.key keybld -- keybld < a56.key > kparse.c -+ ./keybld < a56.key > kparse.c - - gram.c gram.h: a56.y - @echo "[expect 2 shift/reduce conflicts here]" diff -Nru a56-1.3+dfsg/debian/patches/to-be-removed/02_use_bison.diff a56-1.3+dfsg/debian/patches/to-be-removed/02_use_bison.diff --- a56-1.3+dfsg/debian/patches/to-be-removed/02_use_bison.diff 2012-11-26 07:39:54.000000000 +0000 +++ a56-1.3+dfsg/debian/patches/to-be-removed/02_use_bison.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ ---- build-tree/Makefile~ 2008-10-20 17:29:33.000000000 +0200 -+++ build-tree/Makefile 2008-10-21 17:34:22.000000000 +0200 -@@ -13,7 +13,7 @@ - # generic unix - CC = cc - HOSTCC = cc --YACC = yacc -+YACC = bison -y - CCDEFS = -DLDEBUG - MV = mv - YTABC = y.tab.c diff -Nru a56-1.3+dfsg/debian/patches/to-be-removed/03_a56_prefixes.diff a56-1.3+dfsg/debian/patches/to-be-removed/03_a56_prefixes.diff --- a56-1.3+dfsg/debian/patches/to-be-removed/03_a56_prefixes.diff 2012-11-26 07:39:54.000000000 +0000 +++ a56-1.3+dfsg/debian/patches/to-be-removed/03_a56_prefixes.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ ---- build-tree/Makefile~ 2008-10-26 13:45:49.000000000 +0100 -+++ build-tree/Makefile 2008-10-26 13:47:37.000000000 +0100 -@@ -64,15 +64,15 @@ - - CFLAGS = $(DEBUG) $(DEFINES) - --all: keybld a56 toomf -+all: a56-keybld a56 a56-toomf - - a56: $(OBJS) - $(CC) $(CFLAGS) -o a56 $(OBJS) -lm - @$(POSTPROCESS) a56 - --keybld: keybld.o ksubs.o -- $(HOSTCC) $(CFLAGS) -o keybld keybld.o ksubs.o -- @$(POSTPROCESS) keybld -+a56-keybld: keybld.o ksubs.o -+ $(HOSTCC) $(CFLAGS) -o $@ keybld.o ksubs.o -+ @$(POSTPROCESS) $@ - - keybld.o: keybld.c - $(HOSTCC) $(CFLAGS) -c keybld.c -@@ -83,8 +83,8 @@ - - lex.o: lex.c gram.h - --kparse.c: a56.key keybld -- ./keybld < a56.key > kparse.c -+kparse.c: a56.key a56-keybld -+ ./a56-keybld < a56.key > kparse.c - - gram.c gram.h: a56.y - @echo "[expect 2 shift/reduce conflicts here]" -@@ -98,9 +98,9 @@ - y.output: a56.y - $(YACC) -v a56.y - --toomf: toomf.o -- $(CC) -o toomf $(CFLAGS) toomf.o -- @$(POSTPROCESS) toomf -+a56-toomf: toomf.o -+ $(CC) -o $@ $(CFLAGS) toomf.o -+ @$(POSTPROCESS) $@ - - torom: torom.o subs.o - $(CC) -o torom $(CFLAGS) torom.o subs.o -@@ -110,7 +110,7 @@ - - main.o gram.o lex.o: a56.h - --clean: ; rm -f a56 toomf y.output *.o *.out tmp *.bak a56.tar.gz keybld -+clean: ; rm -f a56 a56-toomf y.output *.o *.out tmp *.bak a56.tar.gz a56-keybld - - spotless: clean - rm -f gram.c lexyy.c gram.h toktab.c kparse.c diff -Nru a56-1.3+dfsg/debian/patches/to-be-removed/04_add_missing_prototypes.diff a56-1.3+dfsg/debian/patches/to-be-removed/04_add_missing_prototypes.diff --- a56-1.3+dfsg/debian/patches/to-be-removed/04_add_missing_prototypes.diff 2012-11-26 07:39:54.000000000 +0000 +++ a56-1.3+dfsg/debian/patches/to-be-removed/04_add_missing_prototypes.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -diff -ur build-tree.old/a56.h build-tree/a56.h ---- build-tree.old/a56.h 1995-01-28 18:51:07.000000000 +0100 -+++ build-tree/a56.h 2008-10-27 21:38:46.000000000 +0100 -@@ -92,3 +92,6 @@ - - #define ASSERT(expr, str) \ - if(expr) fprintf(stderr, "ASSERT: %s: line %d: %s\n", __FILE__, __LINE__, str); -+ -+char *alloc (int size); -+char *fixstring (char *s); -diff -ur build-tree.old/main.c build-tree/main.c ---- build-tree.old/main.c 1995-06-12 14:12:49.000000000 +0200 -+++ build-tree/main.c 2008-10-27 21:36:54.000000000 +0100 -@@ -39,7 +39,6 @@ - FILE *obj = NULL; - extern BOOL list_on; - BOOL list_on_next = TRUE; --char *alloc(); - - main(argc,argv) - int argc; -diff -ur build-tree.old/subs.c build-tree/subs.c ---- build-tree.old/subs.c 1994-09-07 23:59:43.000000000 +0200 -+++ build-tree/subs.c 2008-10-27 21:38:34.000000000 +0100 -@@ -30,8 +30,6 @@ - - #define MAX 1024 - --char *alloc(); -- - FILE *open_read(file) - char *file; - { diff -Nru a56-1.3+dfsg/debian/patches/to-be-removed/README a56-1.3+dfsg/debian/patches/to-be-removed/README --- a56-1.3+dfsg/debian/patches/to-be-removed/README 2012-11-26 12:10:31.000000000 +0000 +++ a56-1.3+dfsg/debian/patches/to-be-removed/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -02_use_bison.diff: this is already the default behaviour in Debian, so this - patch is not needed anymore -03_a56_prefixes.diff: this patch will be done by renaming stuff in debian/rules diff -Nru a56-1.3+dfsg/debian/rules a56-1.3+dfsg/debian/rules --- a56-1.3+dfsg/debian/rules 2013-07-27 16:00:07.000000000 +0000 +++ a56-1.3+dfsg/debian/rules 2018-02-20 17:00:00.000000000 +0000 @@ -5,8 +5,10 @@ # This has to be exported to make some magic below work. export DH_OPTIONS +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + %: - dh $@ + dh $@ --no-parallel override_dh_clean: dh_clean