From 184e54b67ec57fe58d235d11cde8a43ce7bee0f1 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Mon, 19 Feb 2018 17:34:16 -0800 Subject: [PATCH] remove build/install: targets and replace with override_dh targets --- debian/changelog | 5 ++++- debian/rules | 10 +++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index e5295a3..3244f79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,11 @@ scowl (2017.08.24-2) unstable; urgency=medium * Use $(DEB_VERSION) for hunspel-en-{us,au,ca} insead of $(DEB_VERSION_UPSTREAM) (Closes: #884921) + * Fix failure to build reproducibly with new debhelper versions due to + wrong install: and build: targets in Makefile. (Closes: #890618) + Thanks to Chris Lamb. - -- + -- Don Armstrong Mon, 19 Feb 2018 17:35:59 -0800 scowl (2017.08.24-1) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index 8cad132..70f1bca 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ include /usr/share/dpkg/pkg-info.mk %: dh $@ -build: +override_dh_auto_build: set -e;\ for SPELLING in $(SPELLINGS); do\ for SIZE in $(SIZES); do\ @@ -111,13 +111,9 @@ override_dh_auto_clean: INSTALL_WORDLISTS=$(patsubst %-"",%,$(foreach spelling,$(SPELLINGS),$(foreach size,$(SIZES),install-w$(spelling)-$(size)))) -override_dh_auto_install: install build - -override_dh_auto_build: - -install: build install-scowl $(INSTALL_WORDLISTS) +override_dh_auto_install: install-scowl install-hunspell $(INSTALL_WORDLISTS) installdeb-wordlist -pwamerican --noscripts - installdeb-wordlist --no-package=wamerican --no-package=scowl + installdeb-wordlist --no-package=wamerican --no-package=scowl --no-package=hunspell-en-us --no-package=hunspell-en-au --no-package=hunspell-en-ca install-scowl: dh_installdirs --package=scowl -- 2.39.2