From: Don Armstrong <don@donarmstrong.com>
Date: Thu, 20 Jan 2022 05:49:01 +0000 (-0800)
Subject: Fix uniqifying using dictionary order (Closes: #1003935)
X-Git-Tag: debian/2020.12.07-2^0
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=commitdiff_plain;h=896203dffaf33a758faa35840e35b6483dd47939;ds=sidebyside

Fix uniqifying using dictionary order (Closes: #1003935)
---

diff --git a/debian/changelog b/debian/changelog
index cbba9c9..2ed6c73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scowl (2020.12.07-2) unstable; urgency=medium
+
+  * Separate uniqifying from sort; users (and other plurals with
+    contractions) missing from wordlist because of this. (Closes:
+    #1003935)
+
+ -- Don Armstrong <don@debian.org>  Wed, 19 Jan 2022 21:16:40 -0800
+
 scowl (2020.12.07-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 9747002..a72a41e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ override_dh_auto_build:
 				echo "  $${word_list}" >> w$$SPELLING$$SIZE.scowl-word-lists-used;\
 			fi;\
 		done; \
-	  cat $$SPELLING-english$$SIZE.unsorted | LC_ALL=C sort -ud | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+	  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