Run of fresh-snapshots for hunspell

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot hunspell 

Merge these changes:

git pull https://janitor.debian.net/git/hunspell fresh-snapshots/main

Summary

Merged new upstream version: 1.7.0+git20190510.4eafbec (was: 1.7.0).

Diff

=== modified file 'debian/changelog'
--- a/debian/changelog	2018-11-29 06:09:53 +0000
+++ b/debian/changelog	2019-08-14 03:37:56 +0000
@@ -1,3 +1,9 @@
+hunspell (1.7.0+git20190510.4eafbec-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Wed, 14 Aug 2019 03:37:50 +0000
+
 hunspell (1.7.0-2) unstable; urgency=medium
 
   * upload to unstable

=== modified file 'debian/patches/aspell_conv'
--- a/debian/patches/aspell_conv	2016-04-21 12:45:29 +0000
+++ b/debian/patches/aspell_conv	2019-08-14 03:38:10 +0000
@@ -1,7 +1,8 @@
-diff -urNad hunspell-1.1.5~/man/hunspell.4 hunspell-1.1.5/man/hunspell.4
---- hunspell-1.1.5~/man/hunspell.5	2007-03-14 14:37:31.000000000 +0100
-+++ hunspell-1.1.5/man/hunspell.5	2007-04-11 14:36:27.000000000 +0200
-@@ -1356,6 +1356,38 @@
+Index: hunspell/man/hunspell.5
+===================================================================
+--- hunspell.orig/man/hunspell.5
++++ hunspell/man/hunspell.5
+@@ -1487,6 +1487,38 @@ frequency order to set edit distance sug
  echo "TRY qwertzuiopasdfghjklyxcvbnmQWERTZUIOPASDFGHJKLYXCVBNM" >>xx.aff
  .fi
  

=== modified file 'debian/patches/readd-lost-1.6.1-ChangeLog-entries.diff'
--- a/debian/patches/readd-lost-1.6.1-ChangeLog-entries.diff	2017-09-18 18:15:00 +0000
+++ b/debian/patches/readd-lost-1.6.1-ChangeLog-entries.diff	2019-08-14 03:38:10 +0000
@@ -1,7 +1,7 @@
-diff --git a/ChangeLog b/ChangeLog
-index 1f6e774..b390185 100644
---- a/ChangeLog
-+++ b/ChangeLog
+Index: hunspell/ChangeLog
+===================================================================
+--- hunspell.orig/ChangeLog
++++ hunspell/ChangeLog
 @@ -1,3 +1,60 @@
 +2017-03-25 Dimitrij Mijoski <dmjpp at hotm>:
 +	* Version 1.6.1

=== modified file 'src/tools/makealias'
--- a/src/tools/makealias	2018-11-13 06:50:53 +0000
+++ b/src/tools/makealias	2019-08-14 03:37:56 +0000
@@ -1,28 +1,51 @@
 #!/bin/sh
 # makealias: make alias compressed dic and aff files
-# Usage: alias.sh dic aff (not alias.sh aff dic!)
 # Author: László Németh
-# Version: 2018-05-16
+# Version: 2019-05-10
 
 export LC_ALL=C
 
+usage()
+{
+echo 'makealias: make alias compressed dic and aff files for faster load and smaller memory footprint
+Usage: makealias [--minimize-diff old_file_without_file_extension] file.dic file.aff' >/dev/stderr
+exit
+}
+
+filecheck()
+{
+  if [ ! -f $1 ]; then
+    echo File not found: $1
+    exit
+  fi
+}
+
 case $# in
-0|1) 
-echo 'makealias: make alias compressed dic and aff files
-Usage: makealias [--minimize-diff old_file_without_file_extension] file.dic file.aff' >/dev/stderr
-exit;;
+0|1|3) usage;;
 esac
 
 if [ "$1" = "--minimize-diff" ]; then
+  filecheck $2.aff
   AWK_ARG="-v mindiff=$2.aff"
   shift; shift
 fi
 
+case $1 in
+*.dic) filecheck $1;;
+*) usage;;
+esac
+
+case $2 in
+*.aff) filecheck $2;;
+*) usage;;
+esac
+
 DIC=`basename $1 .dic`
 AFF=`basename $2 .aff`
 
-# FLAG type definition must be before alias definitions
-grep '^FLAG' $2 >"${AFF}_alias.aff"
+# Alias definitions must be between FLAG type definition and SFX/PFX lines.
+# copy aff content before SFX/PFX lines
+sed '/^[SP]FX/,$d;s/\s\+$//' $2 >"${AFF}_alias.aff"
 
 # space conversion (space separated multi-word expressions
 # are allowed in the dictionary)
@@ -189,7 +212,7 @@
     }
 }' "${DIC}_alias.tmp.dic" $2 >"${DIC}_alias.tmp" 2>"${AFF}_alias.$$"
 cat "${DIC}_alias.tmp" | sed 's/_/ /g' > "${DIC}_alias.dic"
-grep -v '^FLAG' "${AFF}_alias.$$" | sed 's/\s\+$//' >>"${AFF}_alias.aff"
+sed -n '/^[SP]FX/,$p' "${AFF}_alias.$$" | sed 's/\s\+$//' >>"${AFF}_alias.aff"
 echo "output: ${DIC}_alias.dic, ${AFF}_alias.aff"
 
 rm ${DIC}_alias.tmp ${DIC}_alias.tmp.dic ${AFF}_alias.$$

=== modified file 'tests/Makefile.am'
--- a/tests/Makefile.am	2018-11-13 06:50:53 +0000
+++ b/tests/Makefile.am	2019-08-14 03:37:56 +0000
@@ -95,6 +95,7 @@
 reputf.dic \
 ignore.dic \
 ignoreutf.dic \
+right_to_left_mark.dic \
 1592880.dic \
 1695964.dic \
 1463589.dic \
@@ -487,6 +488,9 @@
 ignoreutf.aff \
 ignoreutf.dic \
 ignoreutf.good \
+right_to_left_mark.aff \
+right_to_left_mark.dic \
+right_to_left_mark.good \
 1592880.aff \
 1592880.dic \
 1592880.good \

=== added file 'tests/right_to_left_mark.aff'
--- a/tests/right_to_left_mark.aff	1970-01-01 00:00:00 +0000
+++ b/tests/right_to_left_mark.aff	2019-02-20 07:56:57 +0000
@@ -0,0 +1,7 @@
+# Arabic test for feature ignoring diacritics and RLM (U+200F, RIGHT-TO-LEFT-MARK)
+# (Extended version of the test "ignoreutf")
+SET UTF-8
+# Arabic diacritics (harakat):
+# sukun, shadda, kasra, damma, fatha, kasratan, dammantan, fathatan (left to right)
+IGNORE ًٌٍَُِّْ‏
+WORDCHARS ًٌٍَُِّْ‏

=== added file 'tests/right_to_left_mark.dic'
--- a/tests/right_to_left_mark.dic	1970-01-01 00:00:00 +0000
+++ b/tests/right_to_left_mark.dic	2019-02-20 07:56:57 +0000
@@ -0,0 +1,10 @@
+9
+طِير
+فَتحة
+ضُمة
+كِسرة
+فتحًتان
+ضمتانٌ
+كسرتاٍن
+شدّة
+سكوْن

=== added file 'tests/right_to_left_mark.good'
--- a/tests/right_to_left_mark.good	1970-01-01 00:00:00 +0000
+++ b/tests/right_to_left_mark.good	2019-02-20 07:56:57 +0000
@@ -0,0 +1,9 @@
+‏ط‏ي‏ر	
+‏ف‏ت‏ح‏ة
+‏ض‏م‏ة	
+‏ك‏س‏ر‏ة	
+‏ف‏ت‏ح‏ت‏ا‏ن	
+‏ض‏م‏ت‏ا‏ن	
+‏ك‏س‏ر‏ت‏ا‏ن	
+‏ش‏د‏ة	
+‏س‏ك‏و‏ن	

Full build log Full worker log