X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=blobdiff_plain;f=debian%2Frules;h=c1a5186f8b901fb914c53c377138f69600548bc1;hp=d00537b09c4f93b1c561f7d5af61518cc6fdc7ef;hb=d2e69afe66d4eba2ab1e6dfc9d329a927802f118;hpb=39721535827e68cffbea5e6a3065095ab6224c27

diff --git a/debian/rules b/debian/rules
index d00537b..c1a5186 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,10 +16,15 @@ export DH_OPTIONS
 # The medium size packages have no -size part in their names
 # These are the scowl extensions (complexity numbers?) that contribute to each word list (i.e. each size);
 # the -size parts "-small", "", "-large", and "-huge" correspond to the end of the binary package name:
-export SIZE_EXTENSIONS-small:=10 20 35
-export SIZE_EXTENSIONS:=$(SIZE_EXTENSIONS-small) 40 50
-export SIZE_EXTENSIONS-large:=$(SIZE_EXTENSIONS) 55 60 70
-export SIZE_EXTENSIONS-huge:=$(SIZE_EXTENSIONS-large) 80
+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 95
+#SIZE_EXTENSIONS-huge:=10 20 35 40 50 55 60 70 80 95
+export SIZE_EXTENSIONS_small
+export SIZE_EXTENSIONS
+export SIZE_EXTENSIONS_large
+export SIZE_EXTENSIONS_huge
 
 # These are the scowl word list classes we use:
 CLASSES:=words proper-names upper contractions
@@ -31,11 +36,13 @@ build-stamp:
 
 	set -e;\
 	for SPELLING in american british canadian; do\
-	  for SIZE in -small "" -large -huge; do\
+	  for SIZE in small "" large huge; 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); 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;\
@@ -55,8 +62,8 @@ build-stamp:
 		fi;\
 	      done;\
 	    done;\
-	  echo "sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
-	  sort -u < $$SPELLING-english$$SIZE.unsorted > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+	  echo "cat $$SPELLING-english$$SIZE.unsorted | sort -u | iconv -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted";\
+	  cat $$SPELLING-english$$SIZE.unsorted | sort -u | iconv -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
 	  done;\
 	done
 
@@ -175,27 +182,9 @@ binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
-#	dh_installdocs    # moved to the install targets, because it doesn't DWIM with "-A -p scowl README"
-#	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installcatalogs
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installman
-#	dh_installcron
-#	dh_installinfo
-#	dh_undocumented
-#	dh_strip
 	dh_link
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -208,8 +197,6 @@ binary-indep: build install
 
 # Build architecture dependant packages using the common target.
 binary-arch: build install
-# (Uncomment this next line if you have such packages.)
-#	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 # Any other binary targets build just one binary package at a time.
 binary-%: build install