From 0ebe9b1fa47c74f4654e0d729dc72afcb201263c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 25 Dec 2021 16:36:51 +0000 Subject: [PATCH] debian/compat: Bump to 12 (stretch-backports) and fix Necessary changes: * Delete obsolete "install" target from rules, which stopped the actual dh install from working. This was broken dead code but seems to have actually become a proble with to the changes in v9 for usual target dependencies. Precautionary changes: * Pass INSTALL="install --strip-program=true" to make install. This is as dh v11 does. It seems like a good plan to do it here. I have not examined the actual binaries etc. to check for debugging info. * Pass --no-parallel to dh. I don't trust vtwm's 90s-era Makefile to necessarily be parallel-safe and vtwm builds very quickly anyway. Closes: #965873 --- debian/compat | 2 +- debian/rules | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/debian/compat b/debian/compat index 7ed6ff8..48082f7 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +12 diff --git a/debian/rules b/debian/rules index d1acd7c..ee9667b 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,7 @@ endif export CDEBUGFLAGS %: - dh $@ + dh $@ --no-parallel override_dh_auto_configure: xmkmf @@ -36,14 +36,9 @@ override_dh_auto_clean: override_dh_clean: dh_clean debian/README.Debian -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - override_dh_auto_install: - $(MAKE) DESTDIR=debian/vtwm install install.man + $(MAKE) DESTDIR=debian/vtwm install install.man \ + INSTALL="install --strip-program=true" rm debian/vtwm/etc/X11/vtwm/system.vtwmrc install -m 644 debian/system.vtwmrc-menu debian/vtwm/etc/X11/vtwm -- 2.30.2