[plplot] 02/02: Let dh_strip and dh_shlibdeps recognize octave shared lib module

Ole Streicher olebole at moszumanska.debian.org
Tue Jul 18 18:35:38 UTC 2017


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

olebole pushed a commit to branch master
in repository plplot.

commit 5e4d3fe1c4c61b111e794144e4b6b1756b586893
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Jul 18 14:50:26 2017 +0200

    Let dh_strip and dh_shlibdeps recognize octave shared lib module
---
 debian/rules | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index b0e7f97..0bc644a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ CFLAGS += $(CPPFLAGS) -fvisibility=hidden
 # Don't add -fvisibility=hidden to CXXFLAGS for now as this breaks the
 # octave bindings.
 CXXFLAGS += $(CPPFLAGS)
-#CXXFLAGS += -fvisibility=hidden
 FFLAGS += -fvisibility=hidden
 LDFLAGS += -Wl,--as-needed
 
@@ -33,8 +32,18 @@ override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin
 	mv debian/tmp/usr/bin/plserver debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/plplot/bin/plserver
+	# Dirty hack: Make shared lib executable to force its detection
+	# by dh_strip and dh_shlibdeps.
+	# This will be reverted later, in override_dh_shlibdeps.
+	# See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=35733#35
+	chmod ugo+x debian/tmp/usr/lib/*/octave/site/oct/api-*/*/plplot_octave.oct
 	dh_numpy
 
+override_dh_shlibdeps:
+	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:
 	dh_auto_test
 	$(MAKE) -C obj-* test_diff_psc

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



More information about the debian-science-commits mailing list