X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=70f1bca08eaa2d2a787d4d728016ad0985e1e89c;hb=184e54b67ec57fe58d235d11cde8a43ce7bee0f1;hp=a861e1a1b5d1169391860fd8b70ecf227a4d82d7;hpb=ac4bd44e5e62039df4feb3b30fd0d6c68d21f1e7;p=deb_pkgs%2Fscowl.git

diff --git a/debian/rules b/debian/rules
index a861e1a..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
@@ -135,7 +131,7 @@ override_dh_auto_test:
 
 override_dh_gencontrol:
 	dh_gencontrol -Nhunspell-en-us -Nhunspell-en-au -Nhunspell-en-ca
-	dh_gencontrol -phunspell-en-us -phunspell-en-au -phunspell-en-ca -- -v1:$(DEB_VERSION_UPSTREAM)
+	dh_gencontrol -phunspell-en-us -phunspell-en-au -phunspell-en-ca -- -v1:$(DEB_VERSION)
 
 
 WORDLIST=$(shell echo $(*)|sed -re 's/^w([a-z]*)(-*[a-z]*)/\1-english\2/')