diff -Nru vmtouch-1.3.1/debian/changelog vmtouch-1.3.1/debian/changelog --- vmtouch-1.3.1/debian/changelog 2019-07-18 12:18:41.000000000 +0000 +++ vmtouch-1.3.1/debian/changelog 2021-01-11 22:32:44.000000000 +0000 @@ -1,3 +1,15 @@ +vmtouch (1.3.1-2) unstable; urgency=medium + + * Fix path of binary in init script. Closes: #947603 + * Upgrade to watch file format version 4 + * Add upstream metadata + * Bump debhelper compat level to 13 + * Add Rules-Requires-Root: no + * Add patch to add CPPFLAGS to cc invocation + * Bump Standards-Version to 4.5.1 + + -- Lucas Nussbaum Mon, 11 Jan 2021 23:32:44 +0100 + vmtouch (1.3.1-1) unstable; urgency=medium [ Ondřej Nový ] diff -Nru vmtouch-1.3.1/debian/control vmtouch-1.3.1/debian/control --- vmtouch-1.3.1/debian/control 2019-07-18 12:13:19.000000000 +0000 +++ vmtouch-1.3.1/debian/control 2021-01-11 22:29:31.000000000 +0000 @@ -4,11 +4,12 @@ Maintainer: Lucas Nussbaum Uploaders: Antoine Beaupré , Doug Hoyte -Build-Depends: debhelper-compat (= 12) -Standards-Version: 4.3.0 +Build-Depends: debhelper-compat (= 13) +Standards-Version: 4.5.1 Homepage: https://hoytech.com/vmtouch/ Vcs-Git: https://salsa.debian.org/debian/vmtouch.git Vcs-Browser: https://salsa.debian.org/debian/vmtouch +Rules-Requires-Root: no Package: vmtouch Architecture: any diff -Nru vmtouch-1.3.1/debian/patches/add-cppflags.patch vmtouch-1.3.1/debian/patches/add-cppflags.patch --- vmtouch-1.3.1/debian/patches/add-cppflags.patch 1970-01-01 00:00:00.000000000 +0000 +++ vmtouch-1.3.1/debian/patches/add-cppflags.patch 2021-01-11 22:32:30.000000000 +0000 @@ -0,0 +1,14 @@ +From: Lucas Nussbaum +Subject: Add CPPFLAGS to the gcc cmdline, so hardening flags are passed correctly + +--- a/Makefile ++++ b/Makefile +@@ -10,7 +10,7 @@ all: vmtouch vmtouch.8 + .PHONY: all install clean uninstall + + vmtouch: vmtouch.c +- ${CC} ${CFLAGS} ${LDFLAGS} -o vmtouch vmtouch.c ++ ${CC} ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} -o vmtouch vmtouch.c + + vmtouch.8: vmtouch.pod + pod2man --section 8 --center "System Manager's Manual" --release " " vmtouch.pod > vmtouch.8 diff -Nru vmtouch-1.3.1/debian/patches/series vmtouch-1.3.1/debian/patches/series --- vmtouch-1.3.1/debian/patches/series 2019-07-18 12:16:08.000000000 +0000 +++ vmtouch-1.3.1/debian/patches/series 2021-01-11 22:04:26.000000000 +0000 @@ -0,0 +1 @@ +add-cppflags.patch diff -Nru vmtouch-1.3.1/debian/upstream/metadata vmtouch-1.3.1/debian/upstream/metadata --- vmtouch-1.3.1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ vmtouch-1.3.1/debian/upstream/metadata 2021-01-11 20:51:29.000000000 +0000 @@ -0,0 +1,5 @@ +--- +Bug-Database: https://github.com/hoytech/vmtouch/issues +Bug-Submit: https://github.com/hoytech/vmtouch/issues/new +Repository: https://github.com/hoytech/vmtouch.git +Repository-Browse: https://github.com/hoytech/vmtouch diff -Nru vmtouch-1.3.1/debian/vmtouch.init vmtouch-1.3.1/debian/vmtouch.init --- vmtouch-1.3.1/debian/vmtouch.init 2019-07-18 12:13:19.000000000 +0000 +++ vmtouch-1.3.1/debian/vmtouch.init 2021-01-11 20:33:58.000000000 +0000 @@ -10,7 +10,7 @@ ### END INIT INFO PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/vmtouch +DAEMON=/usr/bin/vmtouch NAME=vmtouch DESC=vmtouch diff -Nru vmtouch-1.3.1/debian/watch vmtouch-1.3.1/debian/watch --- vmtouch-1.3.1/debian/watch 2019-07-18 12:13:19.000000000 +0000 +++ vmtouch-1.3.1/debian/watch 2021-01-11 20:51:00.000000000 +0000 @@ -1,3 +1,2 @@ -version=3 -opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/vmtouch-$1\.tar\.gz/ \ - https://github.com/hoytech/vmtouch/tags .*/v?(\d\S+)\.tar\.gz +version=4 +opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/vmtouch-$1\.tar\.gz/ https://github.com/hoytech/vmtouch/tags .*/v?(\d\S+)\.tar\.gz