From 887de8b44738a187fa383867ec51d403cbfde44d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 17 Dec 2021 18:13:48 +0000
Subject: [PATCH] debian: switch to dh(1); now provides newly required rules
 targets

Closes: #999188
---
 debian/rules | 39 +++++++++++++--------------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/debian/rules b/debian/rules
index 4f479c3..d1acd7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,23 +20,20 @@ CDEBUGFLAGS+= -O0
 endif
 export CDEBUGFLAGS
 
-build: build-stamp
-build-stamp:
-	dh_testdir
+%:
+	dh $@
 
+override_dh_auto_configure:
 	xmkmf
-	$(MAKE) LIBDIR=/usr/lib TWMDIR=/usr/lib/X11/twm
-
-	>"$@"
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+override_dh_auto_build:
+	$(MAKE) LIBDIR=/usr/lib TWMDIR=/usr/lib/X11/twm
 
+override_dh_auto_clean:
 	[ ! -f Makefile ] || $(MAKE) clean
 	rm -f Makefile
 
+override_dh_clean:
 	dh_clean debian/README.Debian
 
 install: build
@@ -45,18 +42,17 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
+override_dh_auto_install:
 	$(MAKE) DESTDIR=debian/vtwm install install.man
 	rm debian/vtwm/etc/X11/vtwm/system.vtwmrc
 	install -m 644 debian/system.vtwmrc-menu debian/vtwm/etc/X11/vtwm
 
 	sed -n '/^RUNTIME HINTS/,$$p' <doc/INSTALL >debian/README.Debian
 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
 # Do not ship the following files from the doc/ directory:
 #   doc/CHANGELOG (dh_installchangelog handles this)
 #   doc/INSTALL (handled above in install target)
+override_dh_installdocs:
 	dh_installdocs \
 	  doc/1.README \
 	  doc/2.1.ANNOUNCE \
@@ -81,20 +77,11 @@ binary-arch: build install
 	  doc/HISTORY \
 	  doc/SOUND \
 	  doc/WISHLIST
+
+override_dh_installexamples:
 	dh_installexamples system.vtwmrc.2D system.vtwmrc.3D
-	dh_installmenu
-	dh_installchangelogs doc/CHANGELOG
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_installchangelogs:
+	dh_installchangelogs doc/CHANGELOG
 
 # vim:set ai noet sts=8 sw=8 tw=80:
-- 
2.30.2