[med-svn] [libncl] 01/01: Fix RPATH issue without brute force chrpath

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libncl.

commit 9673c857ebaa311a6954f5f285934d933effb580
Author: Andreas Tille <tille at debian.org>
Date:   Thu Jan 7 14:01:25 2016 +0100

    Fix RPATH issue without brute force chrpath
---
 debian/control                       |  3 +--
 debian/libncl-dev.install            |  4 ++--
 debian/libncl.install                |  2 +-
 debian/patches/fix_rpath_issue.patch | 12 ++++++++++++
 debian/patches/series                |  1 +
 debian/rules                         |  3 +--
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 668f4b3..f09fa3d 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                d-shlibs,
                dh-exec,
-               python,
-               chrpath
+               python
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libncl.git
 Vcs-Git: git://anonscm.debian.org/debian-med/libncl.git
diff --git a/debian/libncl-dev.install b/debian/libncl-dev.install
index 75cd65b..d06cea8 100755
--- a/debian/libncl-dev.install
+++ b/debian/libncl-dev.install
@@ -1,5 +1,5 @@
 #!/usr/bin/dh-exec
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ncl/libncl.so	/usr/lib/${DEB_HOST_MULTIARCH}/
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ncl/*.a	/usr/lib/${DEB_HOST_MULTIARCH}/
+debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/libncl.so	/usr/lib/${DEB_HOST_MULTIARCH}/
+debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*.a		/usr/lib/${DEB_HOST_MULTIARCH}/
 debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig	/usr/lib/${DEB_HOST_MULTIARCH}/
 debian/tmp/usr/include					/usr
diff --git a/debian/libncl.install b/debian/libncl.install
index 9c79585..4af90d5 100755
--- a/debian/libncl.install
+++ b/debian/libncl.install
@@ -1,2 +1,2 @@
 #!/usr/bin/dh-exec
-debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/ncl/*[0-9].so	/usr/lib/${DEB_HOST_MULTIARCH}
+debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/*[0-9].so	/usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/patches/fix_rpath_issue.patch b/debian/patches/fix_rpath_issue.patch
new file mode 100644
index 0000000..1ec7e40
--- /dev/null
+++ b/debian/patches/fix_rpath_issue.patch
@@ -0,0 +1,12 @@
+Author: Vincent Danjean <vdanjean.ml at free.fr>
+Last-Update: Wed, 6 Jan 2016 16:23:29 +0100
+Description: Make sure build system uses standard location for libraries
+
+--- a/ncl/Makefile.am
++++ b/ncl/Makefile.am
+@@ -1,4 +1,4 @@
+-pkglib_LTLIBRARIES = libncl.la
++lib_LTLIBRARIES = libncl.la
+ libncl_ladir = $(includedir)/ncl
+ libncl_la_LDFLAGS = -release @PACKAGE_VERSION@
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9239351
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_rpath_issue.patch
diff --git a/debian/rules b/debian/rules
index 5e6727a..efdcd9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,12 @@ override_dh_clean:
 	find . -name ".roundTripNCL*" -delete
 
 override_dh_install:
-	chrpath --delete debian/tmp/usr/bin/N*
 	dh_install
 	bash debian/d-shlibmove --commit \
 		    --multiarch \
 		    --devunversioned \
 		    --movedev "debian/tmp/usr/include/ncl/*.h" usr/include/ncl \
-                        debian/tmp/usr/lib/*/ncl/libncl.so
+                        debian/tmp/usr/lib/*/libncl.so
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compression xz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libncl.git