[sfcgal] 02/02: re-enable tests which work fine if not skipping rpath

[Sven Geggus]

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

giggls-guest pushed a commit to branch master
in repository sfcgal.

commit f0e32bd8de8c95ac212903f3ca12a3a8e093ed03
Author: Sven Geggus <sven-deb at geggus.net>
Date:   Fri Aug 28 12:21:00 2015 +0200

    re-enable tests which work fine if not skipping rpath
    
    instead we now remove rpath from libs and binaries
    using chrpath during install
---
 debian/changelog |  8 ++++++++
 debian/control   |  2 +-
 debian/rules     | 24 +++++++++++-------------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d9790ce..ce939c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+sfcgal (1.1.0-4) UNRELEASED; urgency=medium
+
+  * re-enable tests which work fine without CMAKE_SKIP_RPATH
+  * remove rpath during install using chrpath instead
+  * skip style-test using patch from upstream
+
+ -- Sven Geggus <sven-debian at geggus.net>  Fri, 28 Aug 2015 16:37:16 +0200
+
 sfcgal (1.1.0-3) unstable; urgency=medium
 
   * Make package build in unstable with boost 1.58 and gcc5
diff --git a/debian/control b/debian/control
index 8f53ce0..296225e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Sven Geggus <sven-debian at geggus.net>
 Build-Depends: debhelper (>= 9), cmake,
     libcgal-dev, libboost-all-dev, libmpfr-dev, libgmp-dev,
     libopenscenegraph-dev, libopenthreads-dev, libpq-dev,
-    libqt4-dev, libqt4-opengl-dev, pkg-kde-tools
+    libqt4-dev, libqt4-opengl-dev, pkg-kde-tools, chrpath
 Standards-Version: 3.9.6
 Homepage: http://www.sfcgal.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-grass/sfcgal.git/
diff --git a/debian/rules b/debian/rules
index 5e90f35..95e3e84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,19 @@ include /usr/share/dpkg/default.mk
 	dh $@ --with pkgkde_symbolshelper --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DSFCGAL_BUILD_VIEWER=ON -DCMAKE_SKIP_RPATH=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
+	dh_auto_configure -- -DSFCGAL_BUILD_VIEWER=ON \
+        -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON \
+        -DSFCGAL_BUILD_TESTS=ON -DCMAKE_INSTALL_LIBDIR=lib/$(DEB_HOST_MULTIARCH)
 
-# in addition to the upstream stuff we also want to
-# install the two manpages written for the debian package
-override_dh_install:
-	dh_install --list-missing
-	
+override_dh_install:	
+	# removing embedded rpath in binaries
+	-find $(CURDIR)/debian/tmp/usr/bin -type f -exec chrpath --delete {} \;
 
-# As of version 1.1.0 "style test" does currently work on Debian
-# GNU/Linux for unknown reasons
-# the other 3 tests will work on systems with installed libraries
-# only thus upstream needs to fix the tests before we would be able
-# to use them here
-override_dh_auto_test:
-	true
+	# removing embedded rpath in libraries
+	-find $(CURDIR)/debian/tmp/usr/lib -name "*.so*" -type f -exec chrpath --delete {} \;
 
+	dh_install --list-missing
+
+	
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git