[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, master, updated. upstream/1.0.3-43-g02c4962

[Andreas Tille]

The following commit has been merged in the master branch:
commit 02c496294e431090e0aafaa544aad144626cfa8f
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 20 09:08:46 2012 +0200

    Build with recent opencv 2.4

diff --git a/debian/changelog b/debian/changelog
index 86a68f6..ed48b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sitplus (1.0.3-3) unstable; urgency=low
+
+  * debian/patches/sitplus-opencv2.4.patch: Build with recent opencv 2.4
+    (Thanks for the patch to Nobuhiro Iwamatsu <iwamatsu at nigauri.org>)
+    Closes: #678226
+
+ -- Andreas Tille <tille at debian.org>  Wed, 20 Jun 2012 09:07:20 +0200
+
 sitplus (1.0.3-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/series b/debian/patches/series
index 7e3897f..2ea7ad1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 spelling.diff
 as-needed.patch
 0001-remove-workaround-for-older-libconfig-versions.patch
+sitplus-opencv2.4.patch
diff --git a/debian/patches/sitplus-opencv2.4.patch b/debian/patches/sitplus-opencv2.4.patch
new file mode 100644
index 0000000..69bd433
--- /dev/null
+++ b/debian/patches/sitplus-opencv2.4.patch
@@ -0,0 +1,15 @@
+Description: Enable building with recent with opencv 2.4
+Author: : Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Date: Wed, 20 Jun 2012 02:42:02 UTC
+Bug-Debian: http://bugs.debian.org/678226
+
+--- sitplus.orig/src/creavision/crvimage.h
++++ sitplus/src/creavision/crvimage.h
+@@ -24,6 +24,7 @@
+ 
+ #include <assert.h>
+ #include <cv.h>
++#include <opencv2/legacy/legacy.hpp>
+ 
+ class CIplImage
+ {

-- 
Free software framework for ludic-therapeutic activities