[limereg] 30/37: clean up the patch

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository limereg.

commit a9859827249cff90728cac45c851a3066f2f2608
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Mon Apr 24 20:29:38 2017 +0200

    clean up the patch
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/ocv3check | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/ocv3check b/debian/patches/ocv3check
index 65f9d44..e639d90 100644
--- a/debian/patches/ocv3check
+++ b/debian/patches/ocv3check
@@ -1,8 +1,10 @@
-diff --git a/configure.ac b/configure.ac
-index 6877b7a..7f55f45 100644
+Description: Add support for OpenCV 3.
+Author: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Bug-Debian: https://bugs.debian.org/841406
+
 --- a/configure.ac
 +++ b/configure.ac
-@@ -42,6 +42,7 @@ else
+@@ -42,6 +42,7 @@
  fi
  
  HAVE_OPENCV=false
@@ -10,7 +12,7 @@ index 6877b7a..7f55f45 100644
  PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.1, [HAVE_OPENCV=true], [true])
  if test x$HAVE_OPENCV = xfalse; then
    AC_MSG_WARN([*** opencv >= 2.3.1 not found - Cannot build the command line tool, which relies on OpenCV. Only the library will be built, because the lib has no dependency to OpenCV. http://opencvlibrary.sourceforge.net ***])
-@@ -50,8 +51,16 @@ else
+@@ -50,8 +51,16 @@
    OPENCV_CFLAGS="$OPENCV_CFLAGS -DOPENCV_PREFIX=`pkg-config opencv --variable=prefix`"
    #OPENCV_INCLUDE=pkg-config opencv --variable=includedir_old
    AC_DEFINE([HAVE_OPENCV],[1],[Define to 1 if you have OpenCV >= 2.3.1])
@@ -27,11 +29,9 @@ index 6877b7a..7f55f45 100644
  
  #ToDo: Make Boost optional like OpenCV. (Boost_Require takes two arguments if found and if not ...)
  HAVE_BOOST=false
-diff --git a/exe/Makefile.am b/exe/Makefile.am
-index 15fb25f..1bb8fc2 100644
 --- a/exe/Makefile.am
 +++ b/exe/Makefile.am
-@@ -22,7 +22,12 @@ limereg_CFLAGS += @OPENCV_CFLAGS@
+@@ -22,7 +22,12 @@
  limereg_CPPFLAGS += @OPENCV_CFLAGS@
  #limereg_LDFLAGS += @OPENCV_LDFLAGS@
  #limereg_LDADD += @OPENCV_LIBS@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/limereg.git