[visp] 03/06: Make visp-config arch-independent (Closes: #728783)

[Thomas Moulard]

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

thomas_moulard-guest pushed a commit to annotated tag debian/2.8.0-4
in repository visp.

commit 8a715702e0747508bfcad38b2e959b5218070fd6
Author: Thomas Moulard <thomas.moulard at gmail.com>
Date:   Sat Nov 30 16:20:05 2013 +0900

    Make visp-config arch-independent (Closes: #728783)
---
 ...fig-should-rely-on-pkg-config-information.patch | 43 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 44 insertions(+)

diff --git a/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch b/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch
new file mode 100644
index 0000000..e3fc07c
--- /dev/null
+++ b/debian/patches/0004-visp-config-should-rely-on-pkg-config-information.patch
@@ -0,0 +1,43 @@
+From: Thomas Moulard <thomas.moulard at gmail.com>
+Date: Sat, 30 Nov 2013 16:16:13 +0900
+Subject: visp-config should rely on pkg-config information
+
+Make visp-config arch-independent by relying on pkg-config information.
+
+Author: Thomas Moulard <thomas.moulard at gmail.com>
+Forwarded: yes
+---
+ CMakeModules/visp-config.install.in | 18 ++++++------------
+ 1 file changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/CMakeModules/visp-config.install.in b/CMakeModules/visp-config.install.in
+index e797f26..88504df 100755
+--- a/CMakeModules/visp-config.install.in
++++ b/CMakeModules/visp-config.install.in
+@@ -48,20 +48,14 @@ relpath=`(cd $relpath/..; pwd)`
+
+ PREFIX=$relpath
+
+-CFLAGS="${VISP_CONFIG_CFLAGS_SCRIPT}"
++CFLAGS_CMD=`pkg-config --cflags visp`
++CFLAGS=$CFLAGS_CMD
+
+-LIBS="${VISP_CONFIG_LIBS_SCRIPT}"
++LIBS_CMD=`pkg-config --libs visp`
++LIBS=$LIBS_CMD
+
+-VERSION="${VISP_VERSION}"
+-
+-#CFLAGS_CMD=`pkg-config --cflags visp`
+-#CFLAGS=$CFLAGS_CMD
+-
+-#LIBS_CMD=`pkg-config --libs visp`
+-#LIBS=$LIBS_CMD
+-
+-#VERSION_CMD=`pkg-config --modversion visp`
+-#VERSION=$VERSION_CMD
++VERSION_CMD=`pkg-config --modversion visp`
++VERSION=$VERSION_CMD
+
+ NO_NEWLINE_CHARACTER="${VISP_ECHO_NO_NEWLINE_CHARACTER}"
+ NO_NEWLINE_OPTION="${VISP_ECHO_NO_NEWLINE_OPTION}"
diff --git a/debian/patches/series b/debian/patches/series
index 08fe315..da4b914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Install-vpConfig.h-in-include-architecture-triplet.patch
 0002-Fix-vpLex.c-portability-issue.patch
 0003-Fix-compilation-issue-with-Ogre-1.9.patch
+0004-visp-config-should-rely-on-pkg-config-information.patch

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