[otb] 01/01: Install libraries to DEB_HOST_MULTIARCH

[Andreas Tille]

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

tille pushed a commit to branch master
in repository otb.

commit 2913621e23cc85aacbd0c58bf3cf41d1f9a0fb8a
Author: Andreas Tille <tille at debian.org>
Date:   Fri Oct 10 06:16:47 2014 +0200

    Install libraries to DEB_HOST_MULTIARCH
---
 debian/control            |  1 +
 debian/libotb-dev.install |  5 ++---
 debian/libotb.install     |  5 ++---
 debian/otb-bin-qt.install |  4 +++-
 debian/otb-bin.install    |  3 ++-
 debian/rules              | 18 ++++++++++++++----
 6 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/debian/control b/debian/control
index 5a8cb3e..857481e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1~),
+               dh-exec,
                cmake (>= 2.8.3),
                libinsighttoolkit4-dev,
                libgdal-dev (>= 1.10.0),
diff --git a/debian/libotb-dev.install b/debian/libotb-dev.install
old mode 100644
new mode 100755
index 6fcd4ba..0447e46
--- a/debian/libotb-dev.install
+++ b/debian/libotb-dev.install
@@ -1,7 +1,6 @@
+#! /usr/bin/dh-exec
 # OTB libraries (symlinks)
-usr/lib/otb/libotb*.so		usr/lib
-usr/lib/otb/libOTB[A-V]*.so	usr/lib
-usr/lib/otb/libsiftfast.so	usr/lib
+usr/lib/otb/lib*.so		usr/lib/${DEB_HOST_MULTIARCH}
 
 # OTB headers
 usr/include/otb
diff --git a/debian/libotb.install b/debian/libotb.install
old mode 100644
new mode 100755
index c4b2cb7..fbb819a
--- a/debian/libotb.install
+++ b/debian/libotb.install
@@ -1,7 +1,6 @@
+#! /usr/bin/dh-exec
 # OTB libraries (binaries and versioned symlinks)
-usr/lib/otb/libotb*.so.*	usr/lib
-usr/lib/otb/libOTB[A-V]*.so.*	usr/lib
-usr/lib/otb/libsiftfast.so.*	usr/lib
+usr/lib/otb/lib*.so.*	usr/lib/${DEB_HOST_MULTIARCH}
 
 # Executables
 usr/bin/otbTestDriver
diff --git a/debian/otb-bin-qt.install b/debian/otb-bin-qt.install
old mode 100644
new mode 100755
index 9a18835..b26ce0d
--- a/debian/otb-bin-qt.install
+++ b/debian/otb-bin-qt.install
@@ -1,5 +1,7 @@
+#! /usr/bin/dh-exec
+
 # OTB specific libraries (binaries and all symlinks)
-usr/lib/otb/libOTBWrapperQtWidget.so*
+usr/lib/otb/libOTBWrapperQtWidget.so*	usr/lib/${DEB_HOST_MULTIARCH}
 
 # Executables
 usr/bin/otbApplicationLauncherQt
diff --git a/debian/otb-bin.install b/debian/otb-bin.install
old mode 100644
new mode 100755
index a6dd81c..076ccb6
--- a/debian/otb-bin.install
+++ b/debian/otb-bin.install
@@ -1,5 +1,6 @@
+#! /usr/bin/dh-exec
 # OTB specific libraries (binaries and all symlinks)
-usr/lib/otb/libOTBWrapperCommandLine.so*
+usr/lib/otb/libOTBWrapperCommandLine.so*	usr/lib/${DEB_HOST_MULTIARCH}
 
 # Executables
 usr/bin/otbApplicationLauncherCommandLine
diff --git a/debian/rules b/debian/rules
index 6796c3e..96984f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,12 +48,17 @@ CMAKE_FLAGS = \
 	-DOTB_WRAP_PYTHON:BOOL=ON \
 	-DOTB_USE_EXTERNAL_TINYXML:BOOL=ON
 
-pkgcli:=otb-bin
-pkggui:=otb-bin-qt
+DEBPKGNAME     := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+pkgcli:=$(DEBPKGNAME)-bin
+pkggui:=$(DEBPKGNAME)-bin-qt
+pkglib:=lib$(DEBPKGNAME)
+pkgdev:=$(pkglib)-dev
 mancli:=$(CURDIR)/debian/$(pkgcli)/usr/share/man/man1
 mangui:=$(CURDIR)/debian/$(pkggui)/usr/share/man/man1
 
-OTB_LIB_DIRS = /usr/lib/otb
+# OTB_LIB_DIRS = $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+# rather use all libs since the installed libs are spread over several packages
+OTB_LIB_DIRS = $(CURDIR)/debian/tmp/usr/lib/otb
 
 %:
 	dh $@ --parallel
@@ -62,7 +67,12 @@ override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_FLAGS)
 
 override_dh_shlibdeps:
-	LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):$(OTB_LIB_DIRS) dh_shlibdeps
+	dh_shlibdeps -l$(OTB_LIB_DIRS)
+
+override_dh_install:
+	dh_install
+	rm -f $(CURDIR)/debian/$(pkglib)/usr/lib/$(DEB_HOST_MULTIARCH)/libOTBWrapper*
+	rm -f $(CURDIR)/debian/$(pkgdev)/usr/lib/$(DEB_HOST_MULTIARCH)/libOTBWrapper*
 
 override_dh_installman:
 	mkdir -p $(mancli)

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