[visp] 01/01: fix on some archs

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository visp.

commit 02bbec06e6e49edd56a6d77db0fcb3a8e0fba170
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Tue May 12 16:45:51 2015 +0200

    fix on some archs
---
 debian/changelog                                   |  8 +++++++
 debian/libvisp-dev.install                         |  2 +-
 .../0003-Fix-segfault-on-sparc-powerpc.patch       | 25 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 debian/rules                                       | 17 +++++++++++----
 5 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd2126c..c78e987 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+visp (2.10.0-2) unstable; urgency=medium
+
+  * Add patch to fix segfault on sparc, powerpc...
+  * Override dh_install to avoid an error on hurd where usr/lib/*/visp/*
+    doesn't exist
+
+ -- Fabien Spindler <Fabien.Spindler at inria.fr>  Tue, 12 May 2015 14:38:23 +0200
+
 visp (2.10.0-1) unstable; urgency=medium
 
   * Imported Upstream version 2.10.0
diff --git a/debian/libvisp-dev.install b/debian/libvisp-dev.install
index c9adf7b..cafc722 100644
--- a/debian/libvisp-dev.install
+++ b/debian/libvisp-dev.install
@@ -3,4 +3,4 @@ usr/include/*/visp/*
 usr/lib/*/libvisp.so
 usr/lib/*/cmake/*
 usr/lib/*/pkgconfig/*
-usr/lib/*/visp/*
+#usr/lib/*/visp/*
diff --git a/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch b/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch
new file mode 100644
index 0000000..d96704f
--- /dev/null
+++ b/debian/patches/0003-Fix-segfault-on-sparc-powerpc.patch
@@ -0,0 +1,25 @@
+From 5e0cfb715a74209f1af039198cf4b82488fea677 Mon Sep 17 00:00:00 2001
+From: Fabien Spindler <Fabien.Spindler at inria.fr>
+Date: Tue, 12 May 2015 10:56:07 +0200
+Subject: [PATCH 3/3] Fix segfault on sparc, powerpc...
+
+---
+ src/tools/io/vpParseArgv.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/tools/io/vpParseArgv.cpp b/src/tools/io/vpParseArgv.cpp
+index a662226..6dd569f 100644
+--- a/src/tools/io/vpParseArgv.cpp
++++ b/src/tools/io/vpParseArgv.cpp
+@@ -173,7 +173,7 @@ vpParseArgv::parse(int *argcPtr, const char **argv, vpArgvInfo *argTable,
+       infoPtr = matchPtr;
+       switch (infoPtr->type) {
+       case ARGV_CONSTANT:
+-  *((long long *) infoPtr->dst) = 1;
++  *((int *) infoPtr->dst) = 1;
+          break;
+       case ARGV_INT:
+          nargs = (uintptr_t) infoPtr->src;
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index b3c4cf8..b28e5f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-Install-headers-in-include-architecture-triplet.patch
 0002-Fix-to-be-able-to-use-the-library-either-from-build-.patch
+0003-Fix-segfault-on-sparc-powerpc.patch
+
diff --git a/debian/rules b/debian/rules
index a49c40f..973b8e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,10 +60,11 @@ else
 endif
 
 
-.PHONY: override_dh_auto_configure	\
-	override_dh_auto_build-indep	\
-	override_dh_strip		\
-	override_dh_auto_test
+.PHONY: override_dh_auto_configure \
+	override_dh_auto_build-indep \
+	override_dh_strip \
+	override_dh_auto_test \
+	override_dh_install
 
 %:
 	dh  $@ --parallel
@@ -101,3 +102,11 @@ endif
 override_dh_auto_test:
 	export VISP_INPUT_IMAGE_PATH=/usr/share/visp-images-data/ \
 	 && dh_auto_test --max-parallel=1 || ${DH_AUTOTEST_CAN_FAIL}
+
+override_dh_install:
+ifneq ($(DEB_HOST_ARCH_OS),hurd)
+	# On hurd usr/lib/*/visp/* is empty and produces an error
+	dh_install "usr/lib/*/visp/*" -p libvisp-dev
+	# Continue zith regular dh_install
+	dh_install
+endif

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