Include the proper variant spelling into the proper language (Closes:

#659841). Thanks to Drew Parsons.

git-svn-id: svn+ssh://svn.donarmstrong.com/sites/don_svn/deb_pkgs/scowl/trunk@664 8f7917da-ec0b-0410-a553-b9b0e350d17e

diff --git a/debian/changelog b/debian/changelog
index 0d6af1b422a37896073c24b354fa586b46364602..8cdc75e7996f8bab3bdeae3c47adc2a8e4b1db4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+scowl (7.1-2) UNRELEASED; urgency=low
+
+  * Include the proper variant spelling into the proper language (Closes:
+    #659841). Thanks to Drew Parsons.
+
+ -- Don Armstrong <don@debian.org>  Wed, 12 Oct 2011 15:04:24 -0700
+

 scowl (7.1-1) unstable; urgency=low
 
   * New upstream release
 scowl (7.1-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/rules b/debian/rules
index a66c8e79a9084816f8ec87f2c99b212fd34f13bc..50e46ca86eb5cba44099778f4ba42bed81579fe9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -55,17 +55,34 @@ build-stamp:
                  echo "  english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
                fi;\
                for VARIANT in $(VARIANTS); do\
                  echo "  english-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
                fi;\
                for VARIANT in $(VARIANTS); do\

-                 if [ -f final/variant_$$VARIANT-$$CLASS.$$EXT ]; then\
-                   echo "cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted";\
-                   cat final/variant_$$VARIANT-$$CLASS.$$EXT >> $$SPELLING-english$$SIZE.unsorted;\
-                   echo "  variant_$$VARIANT-$$CLASS.$$EXT" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+                 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\
                  fi;\
                done;\
                if [ "$$SIZE" = "insane" ]; then\

-                 for special in special_hacker.50; do \
-                   echo "cat final/$$special >> $$SPELLING-english$$SIZE.unsorted";\
-                   cat final/final/$$special >> $$SPELLING-english$$SIZE.unsorted;\
-                   echo "  final/$$special" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
+                 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\
                  done;\
                fi;\
                if [ -f final/$$SPELLING-$$CLASS.$$EXT ]; then\