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

diff --git a/debian/NEWS b/debian/NEWS
index 125396d6c97d47b7f53a378d6e7ab7749440b319..0d59717bb157053d5cef1649570f6f05e1d98c3b 100644 (file)
--- 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 05b472c8edec19fdcd32b670d474785d4e677652..4add1527ab8e64c0fe1947f54f866e8a4ef9012a 100644 (file)
--- 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 8f2cff715be5e9debd4cf4da66318b4a070bce76..9747002c9884f32e1e788e44858862cc0f920571 100755 (executable)
--- 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