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

Andreas Tille tille at debian.org
Thu Feb 2 12:16:13 UTC 2012


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

    Try to get rid of #653799, another build problem remains

diff --git a/debian/changelog b/debian/changelog
index 912f835..6cf7db6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sitplus (1.0.1-3) UNRELEASED; 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)
+
+ -- Andreas Tille <tille at debian.org>  Mon, 09 Jan 2012 10:10:13 +0100
+
 sitplus (1.0.1-2) unstable; urgency=low
 
   * debian/patches/as-needed.patch: Fix FTBFS with --as-needed linker option.
diff --git a/debian/control b/debian/control
index 9d52ede..cc18cb8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,12 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 DM-Upload-Allowed: yes
 Uploaders: Luis Rivas Vañó <luinix at gmail.com>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), cmake, libpoco-dev, libboost-dev, libboost-program-options-dev, libboost-thread-dev, libboost-system-dev, wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig8-dev, libsdl1.2-dev, libcv-dev, libcvaux-dev, libhighgui-dev, libv4l-dev, libportmidi-dev, libboost-filesystem-dev, asciidoc, libsdl-gfx1.2-dev, libsdl-image1.2-dev, libwxgtk2.8-dev
+Build-Depends: debhelper (>= 8), cmake, libpoco-dev, libboost-dev,
+ libboost-program-options-dev, libboost-thread-dev, libboost-system-dev,
+ wx2.8-headers, libwxbase2.8-dev, libbluetooth-dev, libconfig8-dev, libsdl1.2-dev,
+ libcv-dev (>= 2.3.1-7), libcvaux-dev, libhighgui-dev, libv4l-dev, libportmidi-dev,
+ libboost-filesystem-dev, asciidoc, libsdl-gfx1.2-dev, libsdl-image1.2-dev,
+ libwxgtk2.8-dev
 Standards-Version: 3.9.2
 Homepage: http://sitplus.crea-si.com
 Vcs-Git: git://git.debian.org/debian-med/sitplus.git
diff --git a/debian/rules b/debian/rules
index 3a77152..277f0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,12 +8,12 @@
 #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
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_RPATH=/usr/lib/sitplus -DCMAKE_EXE_LINKER_FLAGS=-lboost_system -DOpenCV_DIR=/usr/share/OpenCV/
 
 override_dh_auto_install:
 	dh_auto_install
 	rm -f ${CURDIR}/debian/tmp/usr/share/sitplus/graphics/pictures/License.txt
 
 %:
-	dh $@ 
+	dh $@
 

-- 
Free software framework for ludic-therapeutic activities



More information about the debian-med-commit mailing list