[plplot] 02/02: Merge patches from Ubuntu

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository plplot.

commit 0bd6d5680fd7f8d5d300fe0faab5c9ad51ca05f8
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Sep 15 17:19:02 2017 +0200

    Merge patches from Ubuntu
    
     * Honour nocheck in DEB_BUILD_OPTIONS.
     * Enable verbose builds and tests.
     * Remove multiarch path in pkgconfig files.
---
 debian/rules | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 231a847..c605813 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,21 +16,33 @@ CXXFLAGS += $(CPPFLAGS)
 FFLAGS += -fvisibility=hidden
 LDFLAGS += -Wl,--as-needed
 
+export verbose_test = on
+
 export QT_SELECT=5
 
-CONFIGURE_OPTIONS = -DUSE_RPATH=OFF -DPLD_psttf=OFF -DNON_TRANSITIVE=ON \
-	-DENABLE_tk=ON -DENABLE_python=ON \
-	-DBUILD_TEST=ON -DBUILD_DOC=ON \
-	-DENABLE_ada=ON \
+CONFIGURE_OPTIONS = \
+	-DUSE_RPATH=OFF -DPLD_psttf=OFF -DNON_TRANSITIVE=ON \
+	-DENABLE_tk=ON -DENABLE_python=ON -DENABLE_ada=ON \
 	-DOCTAVE_OCT_DIR=$(OCTDIR) -DTRY_OCTAVE4=ON \
+	-DBUILD_DOC=ON \
 	-DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) 
 
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+  CONFIGURE_OPTIONS += -DBUILD_TEST=ON
+endif
+
 %:
 	dh $@ -Scmake --with python2,python3
 
 override_dh_auto_configure:
 	xvfb-run dh_auto_configure -- $(CONFIGURE_OPTIONS)
 
+override_dh_auto_test:
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+	ctest  --extra-verbose
+	$(MAKE) -C obj-* VERBOSE=1 test_diff_psc
+endif
+
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin
@@ -40,6 +52,11 @@ override_dh_auto_install:
 	# This will be reverted later, in override_dh_shlibdeps.
 	# See https://bugs.debian.org/35733#35
 	chmod ugo+x debian/tmp/usr/lib/*/octave/site/oct/api-*/*/plplot_octave.oct
+
+	# Remove multiarch path in pkgconfig files.
+	sed -i 's,-L"/usr/lib/$(DEB_HOST_MULTIARCH)",,g;s,  *, ,g' \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/*.pc
+
 	dh_numpy
 	dh_numpy3
 
@@ -48,9 +65,5 @@ override_dh_shlibdeps:
 	# Dirty hack, part 2: Remove the executable bit from the shared library
 	chmod ugo-x debian/octave-plplot/usr/lib/*/octave/site/oct/api-*/*/plplot_octave.oct
 
-override_dh_auto_test:
-	ctest  --extra-verbose
-	$(MAKE) -C obj-* VERBOSE=1 test_diff_psc
-
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog.release

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