[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#814968: hunspell: diff for NMU version 1.3.3-3.1



Control: tags 814968 + patch
Control: tags 814968 + pending

Dear maintainer,

This FTBFS is caused by a recent update on the grep package that sightly
changes the binary file matching behavior. In this case, the fix consists
in forcing grep to match text. I've prepared an NMU with this changes
(versioned as 1.3.3-3.1).

As I don't have privileges to upload it to DELAYED, I've uploaded it to the
mentors repository. Please visit the following URL:

  http://mentors.debian.net/package/hunspell

Alternatively, one can download the package with dget using this command:

  dget -x http://mentors.debian.net/debian/pool/main/h/hunspell/hunspell_1.3.3-3.1.dsc

Cheers,
Rul
diff -Nru hunspell-1.3.3/debian/changelog hunspell-1.3.3/debian/changelog
--- hunspell-1.3.3/debian/changelog	2014-10-17 11:59:33.000000000 -0700
+++ hunspell-1.3.3/debian/changelog	2016-03-09 07:59:01.000000000 -0800
@@ -1,3 +1,11 @@
+hunspell (1.3.3-3.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS caused by new binary matching behavior on grep
+    (Closes: #814968)
+
+ -- Raúl Benencia <rul@kalgan.cc>  Wed, 09 Mar 2016 07:55:05 -0800
+
 hunspell (1.3.3-3) unstable; urgency=medium
 
   * debian/patches/bug185.diff: backport patch from upstream bug 185
diff -Nru hunspell-1.3.3/debian/patches/avoid-grep-binary-match.diff hunspell-1.3.3/debian/patches/avoid-grep-binary-match.diff
--- hunspell-1.3.3/debian/patches/avoid-grep-binary-match.diff	1969-12-31 16:00:00.000000000 -0800
+++ hunspell-1.3.3/debian/patches/avoid-grep-binary-match.diff	2016-03-09 08:00:53.000000000 -0800
@@ -0,0 +1,16 @@
+Description: Fix FTBFS due new grep binary matching behavior
+Author: Raúl Benencia <rul@kalgan.cc>
+Bug-Debian: https://bugs.debian.org/814968
+Index: hunspell-1.3.3/tests/test.sh
+===================================================================
+--- hunspell-1.3.3.orig/tests/test.sh	2016-03-09 07:39:34.759672607 -0800
++++ hunspell-1.3.3/tests/test.sh	2016-03-09 07:41:58.662645078 -0800
+@@ -96,7 +96,7 @@
+ 
+ # Tests suggestions
+ if test -f $TESTDIR/$NAME.sug; then
+-    hunspell $* -a -d $TESTDIR/$NAME <$TESTDIR/$NAME.wrong | grep '^&' | \
++    hunspell $* -a -d $TESTDIR/$NAME <$TESTDIR/$NAME.wrong | grep -a '^&' | \
+         sed 's/^[^:]*: //' >$TEMPDIR/$NAME.sug 
+     if ! cmp $TEMPDIR/$NAME.sug $TESTDIR/$NAME.sug >/dev/null; then
+         echo "============================================="
diff -Nru hunspell-1.3.3/debian/patches/series hunspell-1.3.3/debian/patches/series
--- hunspell-1.3.3/debian/patches/series	2014-10-16 14:30:18.000000000 -0700
+++ hunspell-1.3.3/debian/patches/series	2016-03-09 07:41:38.000000000 -0800
@@ -2,3 +2,4 @@
 debian-changes-1.2.4-2
 bug185.diff
 dont-translate-init-string.diff
+avoid-grep-binary-match.diff

Attachment: signature.asc
Description: PGP signature


Reply to: