X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=a9e36b7d43b49bfbaff6a23873a8a30ce27d0c72;hb=HEAD;hp=3e0aa21e088f0ec2ac6fd7870ec941048aa00544;hpb=0005008332a39079bb30e5579181bf945545f993;p=deb_pkgs%2Fscowl.git

diff --git a/debian/rules b/debian/rules
index 3e0aa21..a9e36b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,88 +18,54 @@ export DH_OPTIONS
 # the -size parts "-small", "", "-large", and "-huge" correspond to the end of the binary package name:
 empty:=
 SIZES=small "" large huge insane
-SIZE_EXTENSIONS_small:=10 20 35
-SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS_small) 40 50
-SIZE_EXTENSIONS_large:=$(SIZE_EXTENSIONS) 55 60 70
-SIZE_EXTENSIONS_huge:=$(SIZE_EXTENSIONS_large) 80
-SIZE_EXTENSIONS_insane:=$(SIZE_EXTENSIONS_huge) 95
-export SIZE_EXTENSIONS_small
-export SIZE_EXTENSIONS
-export SIZE_EXTENSIONS_large
-export SIZE_EXTENSIONS_huge
-export SIZE_EXTENSIONS_insane
+SIZE_OPTIONS_small:=-v2 35
+SIZE_OPTIONS:=-v2 50
+SIZE_OPTIONS_large:=-v2 70
+SIZE_OPTIONS_huge:=-v2 80
+SIZE_OPTIONS_insane:=-v3 95
+export SIZE_OPTIONS_small
+export SIZE_OPTIONS
+export SIZE_OPTIONS_large
+export SIZE_OPTIONS_huge
+export SIZE_OPTIONS_insane
 
 SPELLINGS:= american british canadian
 
-# These are the scowl word list classes we use:
-CLASSES:=words proper-names upper contractions
-VARIANTS:=1 2
-
 include /usr/share/dpkg/pkg-info.mk
 
 %:
 	dh $@
 
 override_dh_auto_build:
-	set -e;\
+	set -ex; \
+	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 -ex;\
 	for SPELLING in $(SPELLINGS); do\
 	  for SIZE in $(SIZES); do\
 	    if [ -n "$$SIZE" ]; then SIZE_NAME="_$$SIZE"; SIZE="-$$SIZE"; else SIZE_NAME=""; SIZE=""; fi; \
 	    echo "The following SCOWL word lists were concatenated and sorted (with duplicates" > w$$SPELLING$$SIZE.scowl-word-lists-used;\
 	    echo "removed) to create this word list (see README.Debian for more details):" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-	    for CLASS in $(CLASSES); do\
-	      for EXT in $$(eval echo "\$$""SIZE_EXTENSIONS$$SIZE_NAME"); do\
-		echo "class $$CLASS ext $$EXT size name $$SIZE_NAME"; \
-		if [ -f final/english-$$CLASS.$$EXT ]; then\
-		  echo "cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-		  cat final/english-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-		  echo "  english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-		fi;\
-		for VARIANT in $(VARIANTS); do\
-		  VARIANT_FILE="$${SPELLING}_"; \
-		  if [ "$$VARIANT_FILE" = "american_" ]; then \
-			VARIANT_FILE=""; \
-		  fi; \
-		  if [ -f final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT ]; then\
-		    echo "cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-		    cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-		    echo "  $${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-		  fi;\
-		done;\
-		if [ "$$SIZE" = "insane" ]; then\
-		  for VARIANT in $(VARIANTS); do\
-		    for VARIANT_FILE in $(SPELLINGS); do \
-		      VARIANT_FILE="$${VARIANT_FILE}_"; \
-		      if [ "$$VARIANT_FILE" = "american_" ]; then \
-		   	VARIANT_FILE=""; \
-		      fi; \
-		      if [ -f final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT ]; then\
-		        echo "cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-		        cat final/$${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-		        echo "  $${VARIANT_FILE}variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-		      fi;\
-		    done; \
-                  done; \
-		  for special in final/special_*.$$CLASS; do \
-		    echo "cat $$special >> $$SPELLING-english$$SIZE.unsorted";\
-		    cat $$special >> $$SPELLING-english$$SIZE.unsorted;\
-		    echo "  $$special" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-		  done;\
-		fi;\
-		if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\
-		  echo "cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-		  cat final/$$SPELLING-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-		  echo "  $$SPELLING-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
-		fi;\
-	      done;\
-	    done;\
-	  echo "cat $$SPELLING-english$$SIZE.unsorted | LC_ALL=C sort -u | iconv -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
-	  cat $$SPELLING-english$$SIZE.unsorted | LC_ALL=C sort -u | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+		ARGS=`eval echo "\$$""SIZE_OPTIONS$$SIZE_NAME"`; \
+		for word_list in `./mk-list -f $${SPELLING} $${ARGS}`; do \
+			if [ -f final/"$${word_list}" ]; then\
+				cat final/$${word_list} >> $$SPELLING-english$$SIZE.unsorted; \
+				echo "  $${word_list}" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+			fi;\
+		done; \
+	  cat $$SPELLING-english$$SIZE.unsorted | LC_ALL=C sort -d | uniq | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
 	  done;\
 	done
 	cd speller && $(MAKE) hunspell
+	( cd speller; \
+	  for a in *.dic; do \
+			/usr/lib/qt5/bin/qwebengine_convert_dict $$a $${a%%.dic}.bdic; \
+	done;)
 
 override_dh_auto_clean:
+	rm -rf final_utf8;
 	set -e;\
 	for SIZE in $(SIZES); do\
 	  if [ -n "$$SIZE" ]; then SIZE="-$$SIZE"; fi; \
@@ -119,7 +85,7 @@ override_dh_auto_install: install-scowl install-hunspell $(INSTALL_WORDLISTS)
 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: