From eec5a7e57e3fa1160b39d0d5ef7679ac744fadec Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 30 Dec 2020 16:44:13 -0800 Subject: [PATCH] Switch to using mk-list instead of Debian-specific custom code --- debian/changelog | 8 +++++ debian/rules | 82 +++++++++++------------------------------------- 2 files changed, 27 insertions(+), 63 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4877384..05b472c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +scowl (2020.12.07-1) unstable; urgency=medium + + * New upstream release + * Switch to using mk-list instead of custom code for identifying files + to include + + -- Don Armstrong Wed, 30 Dec 2020 16:43:45 -0800 + scowl (2019.10.06-1) unstable; urgency=medium * New upstream release (Closes: #952736) diff --git a/debian/rules b/debian/rules index 13ac6a9..8f2cff7 100755 --- a/debian/rules +++ b/debian/rules @@ -18,87 +18,43 @@ 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 -e;\ + 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";\ + 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 -u | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\ done;\ done -- 2.39.2