From 53cef5422d43ddca3d9b323d7b990c9fb1fccb5c Mon Sep 17 00:00:00 2001 From: Luoyaoming Date: Sun, 17 Mar 2024 14:57:04 +0800 Subject: [PATCH] format patches --- debian/patches/deprecate_reprized | 22 +++++++++++++++++++--- debian/patches/fix_hunspell_affix | 12 +++++++++++- debian/patches/hunspell_size_70 | 12 +++++++++++- debian/patches/move_sangs_to_insane | 19 +++++++++++++++---- debian/patches/no-zips.diff | 24 +++++++++++++----------- debian/patches/remove_mys | 10 +++++++++- 6 files changed, 78 insertions(+), 21 deletions(-) diff --git a/debian/patches/deprecate_reprized b/debian/patches/deprecate_reprized index 341f7fd..ba700ed 100644 --- a/debian/patches/deprecate_reprized +++ b/debian/patches/deprecate_reprized @@ -1,6 +1,18 @@ +From: Don Armstrong +Date: Sun, 17 Mar 2024 14:57:03 +0800 +Subject: deprecate_reprized + +--- + final/american-words.40 | 1 - + final/canadian-words.40 | 1 - + final/english-words.95 | 1 + + 3 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/final/american-words.40 b/final/american-words.40 +index 1501ee6..a9e8b7f 100644 --- a/final/american-words.40 +++ b/final/american-words.40 -@@ -191,7 +191,6 @@ +@@ -191,7 +191,6 @@ rationalizations recognizably reorganization's reorganizations @@ -8,9 +20,11 @@ revitalization revitalization's revitalize +diff --git a/final/canadian-words.40 b/final/canadian-words.40 +index 2a180f1..f59e94b 100644 --- a/final/canadian-words.40 +++ b/final/canadian-words.40 -@@ -191,7 +191,6 @@ +@@ -191,7 +191,6 @@ rationalizations recognizably reorganization's reorganizations @@ -18,9 +32,11 @@ revitalization revitalization's revitalize +diff --git a/final/english-words.95 b/final/english-words.95 +index 309b48d..cb32cb4 100644 --- a/final/english-words.95 +++ b/final/english-words.95 -@@ -156928,6 +156928,7 @@ +@@ -156928,6 +156928,7 @@ reprives reprivilege repriving reprize diff --git a/debian/patches/fix_hunspell_affix b/debian/patches/fix_hunspell_affix index b31f39d..8cd1512 100644 --- a/debian/patches/fix_hunspell_affix +++ b/debian/patches/fix_hunspell_affix @@ -1,3 +1,13 @@ +From: Don Armstrong +Date: Sun, 17 Mar 2024 14:57:03 +0800 +Subject: fix_hunspell_affix + +--- + speller/en.aff | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/speller/en.aff b/speller/en.aff +index d0cccb3..c9d21b5 100644 --- a/speller/en.aff +++ b/speller/en.aff @@ -1,5 +1,5 @@ @@ -7,7 +17,7 @@ ICONV 1 ICONV ’ ' NOSUGGEST ! -@@ -14,7 +14,7 @@ +@@ -14,7 +14,7 @@ ONLYINCOMPOUND c COMPOUNDRULE 2 COMPOUNDRULE n*1t COMPOUNDRULE n*mp diff --git a/debian/patches/hunspell_size_70 b/debian/patches/hunspell_size_70 index 1cf9c7e..2a15f3c 100644 --- a/debian/patches/hunspell_size_70 +++ b/debian/patches/hunspell_size_70 @@ -1,6 +1,16 @@ +From: Don Armstrong +Date: Sun, 17 Mar 2024 14:57:03 +0800 +Subject: hunspell_size_70 + +--- + speller/make-hunspell-dict | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/speller/make-hunspell-dict b/speller/make-hunspell-dict +index fa8d8ee..363d851 100755 --- a/speller/make-hunspell-dict +++ b/speller/make-hunspell-dict -@@ -13,7 +13,7 @@ +@@ -13,7 +13,7 @@ export LC_ALL=C export LC_CTYPE=C export LC_COLLATE=C diff --git a/debian/patches/move_sangs_to_insane b/debian/patches/move_sangs_to_insane index c0a51da..28de9b6 100644 --- a/debian/patches/move_sangs_to_insane +++ b/debian/patches/move_sangs_to_insane @@ -1,9 +1,18 @@ From: Don Armstrong -Subject: Move sangs from -35 to -95; it's an obscure plural of a plant - See #861025 for details +Date: Sun, 17 Mar 2024 14:57:03 +0800 +Subject: Move sangs from -35 to -95; + it's an obscure plural of a plant See #861025 for details + +--- + final/english-words.35 | 1 - + final/english-words.95 | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/final/english-words.35 b/final/english-words.35 +index ae88911..fcda961 100644 --- a/final/english-words.35 +++ b/final/english-words.35 -@@ -27622,7 +27622,6 @@ +@@ -27622,7 +27622,6 @@ sandwiching sandy saner sanest @@ -11,9 +20,11 @@ Subject: Move sangs from -35 to -95; it's an obscure plural of a plant sanitarium sanitarium's sanitariums +diff --git a/final/english-words.95 b/final/english-words.95 +index 825a9d7..309b48d 100644 --- a/final/english-words.95 +++ b/final/english-words.95 -@@ -161832,6 +161832,7 @@ +@@ -161832,6 +161832,7 @@ sangrail sangreal sangreeroot sangrel diff --git a/debian/patches/no-zips.diff b/debian/patches/no-zips.diff index 5363929..6feba3f 100644 --- a/debian/patches/no-zips.diff +++ b/debian/patches/no-zips.diff @@ -1,18 +1,20 @@ -Description: avoid worldlist*zip and hunspell*zip for hunspell - Let's not create worldlist*zip and hunspell*zip for hunspell. We are not going - to distribute them or use them in any way. Saves us a zip build-depdency - but more importantly it does not create "binary" files in speller/hunspell - we would need to manually remove it clean. -Author: Rene Engelhard +From: Rene Engelhard +Date: Sun, 17 Mar 2024 14:57:03 +0800 +Subject: avoid worldlist*zip and hunspell*zip for hunspell +Let's not create worldlist*zip and hunspell*zip for hunspell. We are not going +to distribute them or use them in any way. Saves us a zip build-depdency +but more importantly it does not create "binary" files in speller/hunspell +we would need to manually remove it clean. --- -Origin: vendor -Forwarded: no -Last-Update: 2017-10-20 + speller/make-hunspell-dict | 9 --------- + 1 file changed, 9 deletions(-) +diff --git a/speller/make-hunspell-dict b/speller/make-hunspell-dict +index 3d02dda..fa8d8ee 100755 --- a/speller/make-hunspell-dict +++ b/speller/make-hunspell-dict -@@ -56,12 +56,8 @@ +@@ -56,12 +56,8 @@ doit() { cat $3 >> README_$1.txt fi @@ -25,7 +27,7 @@ Last-Update: 2017-10-20 #echo check -@@ -70,11 +66,6 @@ +@@ -70,11 +66,6 @@ doit() { #hunspell -l -d ./$1 < $1.dic.tocheck > misspelled cat $1.tocheck | iconv -f iso-8859-1 -t utf-8 | $UNIX2DOS > $1.txt diff --git a/debian/patches/remove_mys b/debian/patches/remove_mys index 2bc97ea..33c25c4 100644 --- a/debian/patches/remove_mys +++ b/debian/patches/remove_mys @@ -1,8 +1,16 @@ From: Don Armstrong +Date: Sun, 17 Mar 2024 14:57:03 +0800 Subject: remove non-word mys from scowl word list + +--- + final/english-words.35 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/final/english-words.35 b/final/english-words.35 +index 749cb71..ae88911 100644 --- a/final/english-words.35 +++ b/final/english-words.35 -@@ -20702,7 +20702,6 @@ +@@ -20702,7 +20702,6 @@ myopic myriad myriad's myriads