refresn patches; remove upstreamed unsigned char in deaccent_char

diff --git a/debian/patches/deaccent_char_is_unsigned b/debian/patches/deaccent_char_is_unsigned
deleted file mode 100644 (file)
index 3662d3a..0000000
--- a/debian/patches/deaccent_char_is_unsigned
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/deaccent.hh
-+++ b/src/deaccent.hh
-@@ -1,5 +1,5 @@
- 
--static const char deaccent_lookup[256] = {
-+static const unsigned char deaccent_lookup[256] = {
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 
- 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 

diff --git a/debian/patches/deprecate_reprized b/debian/patches/deprecate_reprized
index b9b8aee82594e554d00bad7b3bdec1b47792ade6..341f7fdf9e6447bf0d176a026faa1ea53eb7e764 100644 (file)
--- a/debian/patches/deprecate_reprized
+++ b/debian/patches/deprecate_reprized
@@ -1,6 +1,6 @@
 --- a/final/american-words.40
 +++ b/final/american-words.40
-@@ -187,7 +187,6 @@
+@@ -191,7 +191,6 @@
  recognizably
  reorganization's
  reorganizations
@@ -10,7 +10,7 @@
  revitalize
 --- a/final/canadian-words.40
 +++ b/final/canadian-words.40
-@@ -187,7 +187,6 @@
+@@ -191,7 +191,6 @@
  recognizably
  reorganization's
  reorganizations
@@ -20,7 +20,7 @@
  revitalize
 --- a/final/english-words.95
 +++ b/final/english-words.95
-@@ -156930,6 +156930,7 @@
+@@ -156928,6 +156928,7 @@
  reprivilege
  repriving
  reprize

diff --git a/debian/patches/move_sangs_to_insane b/debian/patches/move_sangs_to_insane
index 87eda19f3c4448f927edea0357ca5aa1c7cbbb2d..c0a51da2b9c81a9fcee590b4d5ebf5af093c1c8e 100644 (file)
--- a/debian/patches/move_sangs_to_insane
+++ b/debian/patches/move_sangs_to_insane
@@ -3,7 +3,7 @@ Subject: Move sangs from -35 to -95; it's an obscure plural of a plant
  See #861025 for details
 --- a/final/english-words.35
 +++ b/final/english-words.35
-@@ -27623,7 +27623,6 @@
+@@ -27622,7 +27622,6 @@
  sandy
  saner
  sanest
@@ -13,7 +13,7 @@ Subject: Move sangs from -35 to -95; it's an obscure plural of a plant
  sanitariums
 --- a/final/english-words.95
 +++ b/final/english-words.95
-@@ -161834,6 +161834,7 @@
+@@ -161832,6 +161832,7 @@
  sangreal
  sangreeroot
  sangrel

diff --git a/debian/patches/remove_mys b/debian/patches/remove_mys
index 511317fd860622079df83e0b89005846d86b39d1..2bc97eafd66b18c6ce2a87ca4d009c532dca4a43 100644 (file)
--- a/debian/patches/remove_mys
+++ b/debian/patches/remove_mys
@@ -2,7 +2,7 @@ From: Don Armstrong <don@debian.org>
 Subject: remove non-word mys from scowl word list
 --- a/final/english-words.35
 +++ b/final/english-words.35
-@@ -20704,7 +20704,6 @@
+@@ -20702,7 +20702,6 @@
  myriad
  myriad's
  myriads

diff --git a/debian/patches/series b/debian/patches/series
index 8f9118883eeeea54f74bff4afb092c750764044a..2330f78773e610b5835339a113158653fde514f2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 remove_mys
 no-zips.diff
 move_sangs_to_insane
-deaccent_char_is_unsigned
 deprecate_reprized
 hunspell_size_70