[med-svn] [SCM] Free software framework for ludic-therapeutic activities branch, debian, updated. upstream/1.0.1-13-g2b1b054

[Andreas Tille]

The following commit has been merged in the debian branch:
commit a122ae406f53fe64b567955da386dfddd9ceb655
Author: Andreas Tille <tille at debian.org>
Date:   Thu Feb 2 15:00:35 2012 +0100

    Add "-lopencv_core -lopencv_highgui" to linker flags

diff --git a/debian/changelog b/debian/changelog
index 6cf7db6..73bbeac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-sitplus (1.0.1-3) UNRELEASED; urgency=low
+sitplus (1.0.1-3) unstable; urgency=low
 
-  * debian/rules: Apply patch kindly provided by Nobuhiro Iwamatsu
-    <iwamatsu at debian.org> (thanks)
-    Closes: #653799
   * debian/control: Build-Depends: libcv-dev (>= 2.3.1-7)
+  * debian/rules:
+    - Apply patch kindly provided by Nobuhiro Iwamatsu
+      <iwamatsu at debian.org> (thanks)
+      Closes: #653799
+    - Add "-lopencv_core -lopencv_highgui" to linker flags because
+      cmake seems to fail adding these
 
  -- Andreas Tille <tille at debian.org>  Mon, 09 Jan 2012 10:10:13 +0100
 
diff --git a/debian/rules b/debian/rules
index 277f0c0..2d44784 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,11 @@
 #export DH_VERBOSE=1
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH=/usr/lib/sitplus -DCMAKE_EXE_LINKER_FLAGS=-lboost_system -DOpenCV_DIR=/usr/share/OpenCV/
+	dh_auto_configure -- \
+	    -DCMAKE_BUILD_TYPE=Release \
+	    -DCMAKE_INSTALL_RPATH=/usr/lib/sitplus \
+	    -DCMAKE_EXE_LINKER_FLAGS="-lboost_system -lopencv_core -lopencv_highgui" \
+	    -DOpenCV_DIR=/usr/share/OpenCV/
 
 override_dh_auto_install:
 	dh_auto_install
@@ -16,4 +20,3 @@ override_dh_auto_install:
 
 %:
 	dh $@
-

-- 
Free software framework for ludic-therapeutic activities