diff -Nru xkbset-0.5/COPYRIGHT xkbset-0.6/COPYRIGHT --- xkbset-0.5/COPYRIGHT 2002-11-22 02:05:08.000000000 +0000 +++ xkbset-0.6/COPYRIGHT 2020-12-30 20:48:44.000000000 +0000 @@ -1,4 +1,4 @@ -Copyright (c) 2000, 2002 Stephen Montgomery-Smith +Copyright (c) 2000, 2002, 2020 Stephen Montgomery-Smith All rights reserved. Redistribution and use in source and binary forms, with or without diff -Nru xkbset-0.5/create_print xkbset-0.6/create_print --- xkbset-0.5/create_print 2002-11-22 02:03:58.000000000 +0000 +++ xkbset-0.6/create_print 2020-12-30 20:49:00.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# Copyright (c) 2000, 2002 Stephen Montgomery-Smith +# Copyright (c) 2000, 2002, 2020 Stephen Montgomery-Smith # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -46,7 +46,9 @@ if ($type =~ /^MASK\_(.*)$/) { $output .= "printf(\"$title = %s\\n\", (ctrls->$field & $1)?\"On\":\"Off\");\n"; die "mask error\n" if !$last_needs_mask; - $outputline .= "printf(\" %s\",\"$last_needs_mask\" + ((ctrls->$field & $1) != 0));\n"; + $last_needs_mask_head = substr $last_needs_mask, 0, 1; + $last_needs_mask_tail = substr $last_needs_mask, 1; + $outputline .= "printf(\" %s%s\", ctrls->$field & $1?\"\":\"$last_needs_mask_head\", \"$last_needs_mask_tail\");\n"; $last_needs_mask = ''; } elsif ($last_needs_mask) { diff -Nru xkbset-0.5/debian/changelog xkbset-0.6/debian/changelog --- xkbset-0.5/debian/changelog 2020-05-08 22:49:03.000000000 +0000 +++ xkbset-0.6/debian/changelog 2021-01-01 16:21:27.000000000 +0000 @@ -1,3 +1,16 @@ +xkbset (0.6-1) unstable; urgency=low + + [ Samuel Thibault ] + * New upstream release. + + [ Debian Janitor ] + * Trim trailing whitespace. + * Bump debhelper from old 10 to 12. + * Set debhelper-compat version in Build-Depends. + * Update standards version to 4.5.0, no changes needed. + + -- Samuel Thibault Fri, 01 Jan 2021 17:21:27 +0100 + xkbset (0.5-8) unstable; urgency=medium [ Ondřej Nový ] @@ -122,4 +135,3 @@ * Initial Release. -- Michael Beattie Tue, 30 Jul 2002 14:21:02 +1200 - diff -Nru xkbset-0.5/debian/compat xkbset-0.6/debian/compat --- xkbset-0.5/debian/compat 2017-02-26 15:56:57.000000000 +0000 +++ xkbset-0.6/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -10 diff -Nru xkbset-0.5/debian/control xkbset-0.6/debian/control --- xkbset-0.5/debian/control 2020-04-26 20:36:50.000000000 +0000 +++ xkbset-0.6/debian/control 2020-07-18 17:08:00.000000000 +0000 @@ -3,8 +3,8 @@ Priority: optional Maintainer: Debian Accessibility Team Uploaders: Samuel Thibault -Build-Depends: libx11-dev, debhelper (>> 10) -Standards-Version: 4.4.0 +Build-Depends: libx11-dev, debhelper-compat (= 12) +Standards-Version: 4.5.0 Homepage: https://faculty.missouri.edu/~stephen/software Vcs-Browser: https://salsa.debian.org/debian/xkbset Vcs-Git: https://salsa.debian.org/debian/xkbset.git @@ -36,4 +36,3 @@ . 5. RepeatKeys sets the same parameters as the global repeat settings, but it is important to make note of it as an accessibility feature as well. - diff -Nru xkbset-0.5/debian/patches/01-fix-makefile.patch xkbset-0.6/debian/patches/01-fix-makefile.patch --- xkbset-0.5/debian/patches/01-fix-makefile.patch 2017-02-26 15:57:00.000000000 +0000 +++ xkbset-0.6/debian/patches/01-fix-makefile.patch 2020-12-30 21:21:55.000000000 +0000 @@ -1,12 +1,15 @@ From: Rene Engelhard Subject: Fix install locations in Makefile -diff -urNad /home/rene/xkbset-0.5/Makefile xkbset-0.5/Makefile ---- /home/rene/xkbset-0.5/Makefile 2003-10-17 04:18:33.000000000 +0200 -+++ xkbset-0.5/Makefile 2003-10-17 04:20:25.000000000 +0200 +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/Makefile ++++ b/Makefile @@ -1,8 +1,8 @@ - X11PREFIX=/usr/X11R6 - X11BASE=/usr/X11R6 + X11PREFIX=/usr/local + X11BASE=/usr/local -INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin -INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1 diff -Nru xkbset-0.5/debian/salsa-ci.yml xkbset-0.6/debian/salsa-ci.yml --- xkbset-0.5/debian/salsa-ci.yml 1970-01-01 00:00:00.000000000 +0000 +++ xkbset-0.6/debian/salsa-ci.yml 2020-12-30 14:18:19.000000000 +0000 @@ -0,0 +1,6 @@ +--- +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 + +# vim: ts=2 sw=2 et sts=2 ft=yaml diff -Nru xkbset-0.5/Makefile xkbset-0.6/Makefile --- xkbset-0.5/Makefile 2002-11-24 23:14:18.000000000 +0000 +++ xkbset-0.6/Makefile 2020-12-30 20:32:26.000000000 +0000 @@ -1,5 +1,5 @@ -X11PREFIX=/usr/X11R6 -X11BASE=/usr/X11R6 +X11PREFIX=/usr/local +X11BASE=/usr/local INSTALL_BIN=${DESTDIR}${X11PREFIX}/bin INSTALL_MAN1=${DESTDIR}${X11PREFIX}/man/man1 @@ -11,22 +11,22 @@ all: xkbset xkbset.1 xkbset: getargs.o print.o usage.o main.o misc.o - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS} + ${CC} ${CFLAGS} ${LDFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS} getargs.o: getargs.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c getargs.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${INC_PATH} -c getargs.c print.o: print.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c print.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${INC_PATH} -c print.c usage.o: usage.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c usage.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${INC_PATH} -c usage.c main.o: main.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c main.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${INC_PATH} -c main.c misc.o: misc.c xkbset.h - ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c misc.c + ${CC} ${CPPFLAGS} ${CFLAGS} ${INC_PATH} -c misc.c getargs.c: create_getargs config_getargs perl create_getargs diff -Nru xkbset-0.5/README xkbset-0.6/README --- xkbset-0.5/README 2002-11-22 02:05:25.000000000 +0000 +++ xkbset-0.6/README 2020-12-30 20:59:24.000000000 +0000 @@ -23,5 +23,5 @@ I won't develop it further (in particular I won't finish the man page). Stephen Montgomery-Smith -stephen@math.missouri.edu -http://www.math.missouri.edu/~stephen +stephen@missouri.edu +http://faculty.missouri.edu/~stephen diff -Nru xkbset-0.5/VERSIONS xkbset-0.6/VERSIONS --- xkbset-0.5/VERSIONS 2002-11-22 02:04:33.000000000 +0000 +++ xkbset-0.6/VERSIONS 2020-12-30 20:48:14.000000000 +0000 @@ -1,2 +1,3 @@ xkbset-0.0 The very first version. -xkbset-0.5 A later version +xkbset-0.5 A later version. +xkbset-0.6 A little cleaning up. Binary files /tmp/tmpbZDrpw/nFZtpsfWU0/xkbset-0.5/xkbset-0.6.tar.gz and /tmp/tmpbZDrpw/qB8zcH2Ywz/xkbset-0.6/xkbset-0.6.tar.gz differ