From: Don Armstrong <don@donarmstrong.com>
Date: Mon, 3 May 2021 23:23:35 +0000 (-0700)
Subject: wordlists are now sorted in dictionary order (Closes: #987857)
X-Git-Tag: debian/2020.12.07-1~4
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fscowl.git;a=commitdiff_plain;h=07fdbfcdf355178d63740c228bce5fec74127eab

wordlists are now sorted in dictionary order (Closes: #987857)
---

diff --git a/debian/NEWS b/debian/NEWS
index 125396d..0d59717 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+scowl (2020.12.07-2) unstable; urgency=medium
+
+  * Wordlists are now sorted with the -d option to sort, which only sorts
+    in dictionary order instead of sorting in LC_SORT=C order. (Closes:
+    #987857)
+
+ -- Don Armstrong <don@debian.org>  Mon, 03 May 2021 16:20:26 -0700
+
 scowl (2019.10.06-1) unstable; urgency=medium
 
   * The scowl binary package now distributes all of its wordlists in UTF-8
diff --git a/debian/changelog b/debian/changelog
index 05b472c..4add152 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+scowl (2020.12.07-2) unstable; urgency=medium
+
+  * Wordlists are now sorted with the -d option to sort, which only sorts
+    in dictionary order instead of sorting in LC_SORT=C order. (Closes:
+    #987857)
+
+ -- Don Armstrong <don@debian.org>  Mon, 03 May 2021 16:20:26 -0700
+
 scowl (2020.12.07-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 8f2cff7..9747002 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 -u | iconv -f 'iso8859-1' -t 'utf-8' > $$SPELLING-english$$SIZE; rm $$SPELLING-english$$SIZE.unsorted;\
+	  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;\
 	  done;\
 	done
 	cd speller && $(MAKE) hunspell