diff -Nru sleepenh-1.6/changelog sleepenh-1.7/changelog --- sleepenh-1.6/changelog 2016-01-07 06:21:22.000000000 +0000 +++ sleepenh-1.7/changelog 2018-10-27 20:34:32.000000000 +0000 @@ -1,3 +1,11 @@ +sleepenh (1.7) unstable; urgency=medium + + * Fix typo: immediatly -> immediately + * sleepenh.1: update shell example + * Makefile: append $(EXTRA_CFLAGS) to CFLAGS + + -- Nicolas Schier Sat, 27 Oct 2018 22:34:09 +0200 + sleepenh (1.6) unstable; urgency=medium * Fix variable descriptions and time warp diff -Nru sleepenh-1.6/debian/changelog sleepenh-1.7/debian/changelog --- sleepenh-1.6/debian/changelog 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/changelog 2018-11-03 21:41:18.000000000 +0000 @@ -1,3 +1,21 @@ +sleepenh (1.7-1) unstable; urgency=medium + + * Import upstream version 1.7 + * Purge obsolete Debian patch + * Update maintainer email address + * Update Vcs-* and remove obsolete Homepage URIs (Closes: #911267), + thanks to Micha Lenk for reporting and repo migration to salsa + * Update Priority from extra to optional + * debian/copyright: update source URI + * debian/copyright: update upstream email address + * Update package description + * debian/copyright: use https scheme for copyright format URI + * debian/rules: enable hardening build flags + * Bump standards version to 4.2.1 + * Update debhelper compat level to 11 + + -- Nicolas Schier Sat, 03 Nov 2018 22:41:18 +0100 + sleepenh (1.6-1) unstable; urgency=medium * New upstream release: diff -Nru sleepenh-1.6/debian/compat sleepenh-1.7/debian/compat --- sleepenh-1.6/debian/compat 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/compat 2018-11-03 21:02:57.000000000 +0000 @@ -1 +1 @@ -9 +11 diff -Nru sleepenh-1.6/debian/control sleepenh-1.7/debian/control --- sleepenh-1.6/debian/control 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/control 2018-11-03 21:03:02.000000000 +0000 @@ -1,12 +1,11 @@ Source: sleepenh Section: utils -Priority: extra -Maintainer: Nicolas Schier -Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.6 -Homepage: https://github.com/nsc-deb/sleepenh -Vcs-Browser: https://github.com/nsc-deb/sleepenh-debian -Vcs-Git: https://github.com/nsc-deb/sleepenh-debian.git +Priority: optional +Maintainer: Nicolas Schier +Build-Depends: debhelper (>= 11) +Standards-Version: 4.2.1 +Vcs-Browser: https://salsa.debian.org/debian/sleepenh +Vcs-Git: https://salsa.debian.org/debian/sleepenh.git Package: sleepenh Architecture: any @@ -14,9 +13,9 @@ ${misc:Depends}, ${shlibs:Depends} Description: Sleep until a given date with subsecond resolution - sleepenh is an sleep program for using in shell scripts - that need to perform a loop that repeats at a regular - time interval, without cumulative errors. + sleepenh is a sleep program for shell scripts that need to + perform a loop that repeats at a regular time interval, without + cumulative errors. . It supports microsecond resolution. . @@ -27,12 +26,12 @@ example sends 'A' to ttyS0 every 1.2 seconds. #!/bin/sh # does not wait (or wait 0), just to get initial timestamp - TIMESTAMP=`sleepenh 0` + TIMESTAMP=$(sleepenh 0) while true; do # send the byte to ttyS0 echo -n "A" > /dev/ttyS0; # wait until the required time - TIMESTAMP=`sleepenh $TIMESTAMP 1.200`; + TIMESTAMP=$(sleepenh $TIMESTAMP 1.200); done . For more details, please read the manpage. diff -Nru sleepenh-1.6/debian/copyright sleepenh-1.7/debian/copyright --- sleepenh-1.6/debian/copyright 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/copyright 2018-10-27 20:54:19.000000000 +0000 @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: https://github.com/nsc-deb/sleepenh +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://rocketgit.com/user/nicolas/sleepenh Files: * Copyright: 2003-2008, Pedro Zorzenon Neto - 2014, Nicolas Schier + 2014, Nicolas Schier License: GPL-2.0+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru sleepenh-1.6/debian/patches/0001-makefile-add-extra-cflags.patch sleepenh-1.7/debian/patches/0001-makefile-add-extra-cflags.patch --- sleepenh-1.6/debian/patches/0001-makefile-add-extra-cflags.patch 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/patches/0001-makefile-add-extra-cflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -Description: Makefile: Add EXTRA_CFLAGS to CFLAGS -Author: Nicolas Schier -Forwarded: no -Last-Update: 2015-01-07 - ---- sleepenh-1.6.orig/Makefile -+++ sleepenh-1.6/Makefile -@@ -4,7 +4,7 @@ Q := - endif - - CC = gcc --CFLAGS = -std=gnu11 -Wall -Wextra -O2 -+CFLAGS = -std=gnu11 -Wall -Wextra -O2 $(EXTRA_CFLAGS) - - targets := sleepenh sleepenh.1.gz - diff -Nru sleepenh-1.6/debian/patches/series sleepenh-1.7/debian/patches/series --- sleepenh-1.6/debian/patches/series 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001-makefile-add-extra-cflags.patch diff -Nru sleepenh-1.6/debian/rules sleepenh-1.7/debian/rules --- sleepenh-1.6/debian/rules 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/rules 2018-10-27 20:54:19.000000000 +0000 @@ -4,7 +4,10 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +include /usr/share/dpkg/default.mk + vcsversion = $(shell sed -ne '1{s,^.*(\([0-9\.]\+\)-.*).*$$,\1,p;q}' < debian/changelog) +export DEB_BUILD_MAINT_OPTIONS += hardening=+all %: dh $@ diff -Nru sleepenh-1.6/debian/watch sleepenh-1.7/debian/watch --- sleepenh-1.6/debian/watch 2016-03-05 23:07:12.000000000 +0000 +++ sleepenh-1.7/debian/watch 2018-11-03 21:03:34.000000000 +0000 @@ -1,3 +1,4 @@ -version=3 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/sleepenh-$1\.tar\.gz/ \ - https://github.com/nsc-deb/sleepenh/tags .*/v?(\d\S*)\.tar\.gz +version=4 +opts="mode=git,gitmode=full,compression=xz,pgpmode=none" \ + https://rocketgit.com/user/nicolas/sleepenh \ + refs/tags/([\d\.]+) debian uupdate diff -Nru sleepenh-1.6/Makefile sleepenh-1.7/Makefile --- sleepenh-1.6/Makefile 2016-01-07 06:21:22.000000000 +0000 +++ sleepenh-1.7/Makefile 2018-10-27 20:34:32.000000000 +0000 @@ -4,7 +4,7 @@ endif CC = gcc -CFLAGS = -std=gnu11 -Wall -Wextra -O2 +CFLAGS = -std=gnu11 -Wall -Wextra -O2 $(EXTRA_CFLAGS) targets := sleepenh sleepenh.1.gz diff -Nru sleepenh-1.6/sleepenh.1 sleepenh-1.7/sleepenh.1 --- sleepenh-1.6/sleepenh.1 2016-01-07 06:21:22.000000000 +0000 +++ sleepenh-1.7/sleepenh.1 2018-10-27 20:34:32.000000000 +0000 @@ -33,7 +33,7 @@ .TP \fB\-w\fR, \fB\-\-warp\fR warp resulting timestamp, when there is no need -to sleep. An immediatly following call of +to sleep. An immediately following call of sleepenh with the resulting TIMESTAMP would most probably result in a real sleep. .TP @@ -78,7 +78,7 @@ every 4 seconds. This will do that: .RS #!/bin/sh - TIMESTAMP=`sleepenh 0` + TIMESTAMP=$(sleepenh 0) while true; do # send the byte to ttyS0 echo \-n "A" > /dev/ttyS0; @@ -88,7 +88,7 @@ sleepenh 0; # wait the required time - TIMESTAMP=`sleepenh $TIMESTAMP 4.0`; + TIMESTAMP=$(sleepenh $TIMESTAMP 4.0); done .RE .SH HINT diff -Nru sleepenh-1.6/sleepenh.c sleepenh-1.7/sleepenh.c --- sleepenh-1.6/sleepenh.c 2016-01-07 06:21:22.000000000 +0000 +++ sleepenh-1.7/sleepenh.c 2018-10-27 20:34:32.000000000 +0000 @@ -87,7 +87,7 @@ "Options:\n" " -h, --help display this help and exit\n" " -w, --warp warp resulting timestamp, when there is no need\n" - " to sleep. An immediatly following call of\n" + " to sleep. An immediately following call of\n" " sleepenh with the resulting TIMESTAMP would\n" " most probably result in a real sleep.\n" " -V, --version output version information and exit\n"