X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=13ac6a9cd20932d69a8f5675c4fe0711f2906b99;hb=c5fa98569c5019da62f04159428be3c91bb1897e;hp=a861e1a1b5d1169391860fd8b70ecf227a4d82d7;hpb=1bf715bcb856a67b7562ca9009a6405346603f83;p=deb_pkgs%2Fscowl.git

diff --git a/debian/rules b/debian/rules
index a861e1a..13ac6a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,7 +40,12 @@ include /usr/share/dpkg/pkg-info.mk
 %:
 	dh $@
 
-build:
+override_dh_auto_build:
+	set -e; \
+	mkdir -p final_utf8;\
+	for file in final/*.[0-9][0-9]; do\
+		iconv -f 'iso8859-1' -t 'utf-8' < $${file} > final_utf8/$$(basename $${file}); \
+	done;
 	set -e;\
 	for SPELLING in $(SPELLINGS); do\
 	  for SIZE in $(SIZES); do\
@@ -100,6 +105,7 @@ build:
 	cd speller && $(MAKE) hunspell
 
 override_dh_auto_clean:
+	rm -rf final_utf8;
 	set -e;\
 	for SIZE in $(SIZES); do\
 	  if [ -n "$$SIZE" ]; then SIZE="-$$SIZE"; fi; \
@@ -111,18 +117,15 @@ 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
+	installdeb-hunspell -phunspell-en-ca -phunspell-en-au -phunspell-en-us
 
 install-scowl:
 	dh_installdirs --package=scowl
 
-	dh_install --package=scowl final/*.[0-9][0-9] usr/share/dict/scowl
+	dh_install --package=scowl final_utf8/*.[0-9][0-9] usr/share/dict/scowl
 	dh_installdocs --package=scowl README debian/README.Debian
 
 install-hunspell:
@@ -135,7 +138,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/')