[SCM] whitedune/master: Imported Debian patch 0.30.10-2.1

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 13dc236a9ac4f19c9814be77288da32c8d6657d7
Author: Raúl Benencia <rul at kalgan.cc>
Date:   Mon Mar 7 07:56:28 2016 -0800

    Imported Debian patch 0.30.10-2.1

diff --git a/debian/changelog b/debian/changelog
index 7cf0f85..d96ef00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+whitedune (0.30.10-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS due new binary matching behavior on grep (Closes: #814976)
+
+ -- Raúl Benencia <rul at kalgan.cc>  Mon, 07 Mar 2016 07:56:28 -0800
+
 whitedune (0.30.10-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/avoid-grep-binary.patch b/debian/patches/avoid-grep-binary.patch
new file mode 100644
index 0000000..24b2cad
--- /dev/null
+++ b/debian/patches/avoid-grep-binary.patch
@@ -0,0 +1,13 @@
+Index: whitedune-0.30.10/src/Makefile.in
+===================================================================
+--- whitedune-0.30.10.orig/src/Makefile.in	2011-04-29 02:28:06.000000000 -0700
++++ whitedune-0.30.10/src/Makefile.in	2016-03-07 08:08:45.863708021 -0800
+@@ -771,7 +771,7 @@
+ resource.c: dune.rc swt/rc/rc $(ICONS) resource.h
+ 	sed 's.\\\\./.' < dune.rc > dune1.rc.c
+ 	$(CXXCPP) dune1.rc.c > dune2.rc.c 
+-	grep -v '//' dune2.rc.c > dune3.rc.c
++	grep -av '//' dune2.rc.c > dune3.rc.c
+ 	if swt/rc/rc < dune3.rc.c > resource.c ; then echo > /dev/null; else rm  resource.c ; exit 1 ; fi
+ 	rm dune1.rc.c dune2.rc.c dune3.rc.c
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 76b5394..06d490e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 libxp-configure.patch
 png1.5.patch
+avoid-grep-binary.patch

-- 
whitedune packaging