[otb] 01/01: install libs to <prefix>/lib/DEB_HOST_MULTIARCH.

Rashad Kanavath rashad-guest at moszumanska.debian.org
Fri Jan 8 15:32:06 UTC 2016


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

rashad-guest pushed a commit to branch master
in repository otb.

commit 9c32663c33d420bfd477cf500157f575d7452e8b
Author: Rashad Kanavath <rashad.kanavath at c-s.fr>
Date:   Fri Jan 8 15:46:32 2016 +0100

    install libs to <prefix>/lib/DEB_HOST_MULTIARCH.
    
    In debian/*.install files .so.* libs are symliked to
    lib/<DEB_HOST_MULTIARCH>. But inside generated
    OTBTargets-release.cmake path to .so file points
    to /usr/lib. This is because OTB_INSTALL_LIBRARY_DIR
    and OTB_INSTALL_ARCHIVE_DIR are set to 'lib'. Changing
    the above cmake values to lib/<DEB_HOST_MULTIARCH>
    will avoid symlinks in .install files and also give a
    correct OTBTargets-release.cmake. Iy also allows otb
    package to use with Ice and Monteverdi without the need
    to install all otb-* packages.
---
 debian/libotb-dev.install                      | 7 +++----
 debian/libotb-dev.install.in                   | 7 +++----
 debian/libotbapplicationengine-5.2-1.install   | 3 +--
 debian/libotbcarto-5.2-1.install               | 3 +--
 debian/libotbcommandline-5.2-1.install         | 3 +--
 debian/libotbcommandlineparser-5.2-1.install   | 3 +--
 debian/libotbcommon-5.2-1.install              | 3 +--
 debian/libotbcurladapters-5.2-1.install        | 3 +--
 debian/libotbedge-5.2-1.install                | 3 +--
 debian/libotbextendedfilename-5.2-1.install    | 3 +--
 debian/libotbfuzzy-5.2-1.install               | 3 +--
 debian/libotbgdaladapters-5.2-1.install        | 3 +--
 debian/libotbimagebase-5.2-1.install           | 3 +--
 debian/libotbimageio-5.2-1.install             | 3 +--
 debian/libotbimagemanipulation-5.2-1.install   | 3 +--
 debian/libotbiobsq-5.2-1.install               | 3 +--
 debian/libotbiogdal-5.2-1.install              | 3 +--
 debian/libotbiokml-5.2-1.install               | 3 +--
 debian/libotbiolum-5.2-1.install               | 3 +--
 debian/libotbiomstar-5.2-1.install             | 3 +--
 debian/libotbiomw-5.2-1.install                | 3 +--
 debian/libotbioonera-5.2-1.install             | 3 +--
 debian/libotbiorad-5.2-1.install               | 3 +--
 debian/libotbiotilemap-5.2-1.install           | 3 +--
 debian/libotbmathparser-5.2-1.install          | 3 +--
 debian/libotbmetadata-5.2-1.install            | 3 +--
 debian/libotbopenthreadsadapters-5.2-1.install | 3 +--
 debian/libotbossimadapters-5.2-1.install       | 3 +--
 debian/libotbossimplugins-5.2-1.install        | 3 +--
 debian/libotbpolarimetry-5.2-1.install         | 3 +--
 debian/libotbprojection-5.2-1.install          | 3 +--
 debian/libotbqtwidget-5.2-1.install            | 5 ++---
 debian/libotbrcc8-5.2-1.install                | 3 +--
 debian/libotbsiftfast-5.2-1.install            | 3 +--
 debian/libotbstreaming-5.2-1.install           | 3 +--
 debian/libotbsupervised-5.2-1.install          | 3 +--
 debian/libotbtestkernel-5.2-1.install          | 3 +--
 debian/libotbtransform-5.2-1.install           | 3 +--
 debian/libotbvectordatabase-5.2-1.install      | 3 +--
 debian/libotbvectordataio-5.2-1.install        | 3 +--
 debian/libotbwavelet-5.2-1.install             | 3 +--
 debian/otb-bin.install                         | 2 +-
 debian/rules                                   | 2 ++
 43 files changed, 49 insertions(+), 88 deletions(-)

diff --git a/debian/libotb-dev.install b/debian/libotb-dev.install
old mode 100755
new mode 100644
index 719a671..e922095
--- a/debian/libotb-dev.install
+++ b/debian/libotb-dev.install
@@ -1,9 +1,8 @@
-#! /usr/bin/dh-exec
-# OTB libraries (symlinks)
-usr/lib/lib*.so		usr/lib/${DEB_HOST_MULTIARCH}
+# OTB libraries
+usr/lib/*/lib*.so
 
 # OTB headers
 usr/include/OTB-5.2
 
 # CMake helper scripts
-usr/lib/cmake/OTB-5.2
+usr/lib/*/cmake/OTB-5.2
diff --git a/debian/libotb-dev.install.in b/debian/libotb-dev.install.in
index 2cc96fe..b7243d4 100644
--- a/debian/libotb-dev.install.in
+++ b/debian/libotb-dev.install.in
@@ -1,9 +1,8 @@
-#! /usr/bin/dh-exec
-# OTB libraries (symlinks)
-usr/lib/lib*.so		usr/lib/${DEB_HOST_MULTIARCH}
+# OTB libraries
+usr/lib/*/lib*.so
 
 # OTB headers
 usr/include/OTB- at SOVERSION@
 
 # CMake helper scripts
-usr/lib/cmake/OTB- at SOVERSION@
+usr/lib/*/cmake/OTB- at SOVERSION@
diff --git a/debian/libotbapplicationengine-5.2-1.install b/debian/libotbapplicationengine-5.2-1.install
old mode 100755
new mode 100644
index d9d52ed..6f63630
--- a/debian/libotbapplicationengine-5.2-1.install
+++ b/debian/libotbapplicationengine-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBApplicationEngine*.so.*   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBApplicationEngine*.so.*
diff --git a/debian/libotbcarto-5.2-1.install b/debian/libotbcarto-5.2-1.install
old mode 100755
new mode 100644
index aca5c57..f0f3b55
--- a/debian/libotbcarto-5.2-1.install
+++ b/debian/libotbcarto-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBCarto*.so.*               usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBCarto*.so.*
diff --git a/debian/libotbcommandline-5.2-1.install b/debian/libotbcommandline-5.2-1.install
old mode 100755
new mode 100644
index 47a805d..0ed7910
--- a/debian/libotbcommandline-5.2-1.install
+++ b/debian/libotbcommandline-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBCommandLine-*.so.*   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBCommandLine-*.so.*
diff --git a/debian/libotbcommandlineparser-5.2-1.install b/debian/libotbcommandlineparser-5.2-1.install
old mode 100755
new mode 100644
index fe13200..b004629
--- a/debian/libotbcommandlineparser-5.2-1.install
+++ b/debian/libotbcommandlineparser-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBCommandLineP*.so.*   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBCommandLineP*.so.*
diff --git a/debian/libotbcommon-5.2-1.install b/debian/libotbcommon-5.2-1.install
old mode 100755
new mode 100644
index 567825d..bbc8893
--- a/debian/libotbcommon-5.2-1.install
+++ b/debian/libotbcommon-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBCommon*.so.*              usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBCommon*.so.*
diff --git a/debian/libotbcurladapters-5.2-1.install b/debian/libotbcurladapters-5.2-1.install
old mode 100755
new mode 100644
index db70764..2eb8fe2
--- a/debian/libotbcurladapters-5.2-1.install
+++ b/debian/libotbcurladapters-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBCurlAdapters-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBCurlAdapters-*.so.*
diff --git a/debian/libotbedge-5.2-1.install b/debian/libotbedge-5.2-1.install
old mode 100755
new mode 100644
index 866504c..fb1c5ed
--- a/debian/libotbedge-5.2-1.install
+++ b/debian/libotbedge-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBEdge-*.so.*                usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBEdge-*.so.*
diff --git a/debian/libotbextendedfilename-5.2-1.install b/debian/libotbextendedfilename-5.2-1.install
old mode 100755
new mode 100644
index dd1fe33..eb8bf3b
--- a/debian/libotbextendedfilename-5.2-1.install
+++ b/debian/libotbextendedfilename-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBExtendedFilename*.so.*    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBExtendedFilename*.so.*
diff --git a/debian/libotbfuzzy-5.2-1.install b/debian/libotbfuzzy-5.2-1.install
old mode 100755
new mode 100644
index 12e71b1..30fae47
--- a/debian/libotbfuzzy-5.2-1.install
+++ b/debian/libotbfuzzy-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBFuzzy*.so.*               usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBFuzzy*.so.*
diff --git a/debian/libotbgdaladapters-5.2-1.install b/debian/libotbgdaladapters-5.2-1.install
old mode 100755
new mode 100644
index 0ae7dbb..be8dc90
--- a/debian/libotbgdaladapters-5.2-1.install
+++ b/debian/libotbgdaladapters-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBGdalAdapters-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBGdalAdapters-*.so.*
diff --git a/debian/libotbimagebase-5.2-1.install b/debian/libotbimagebase-5.2-1.install
old mode 100755
new mode 100644
index 79cd850..82a77a2
--- a/debian/libotbimagebase-5.2-1.install
+++ b/debian/libotbimagebase-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBImageBase-*.so.*               usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBImageBase-*.so.*
diff --git a/debian/libotbimageio-5.2-1.install b/debian/libotbimageio-5.2-1.install
old mode 100755
new mode 100644
index 341e138..8314d3e
--- a/debian/libotbimageio-5.2-1.install
+++ b/debian/libotbimageio-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBImageIO-*.so.*               usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBImageIO-*.so.*
diff --git a/debian/libotbimagemanipulation-5.2-1.install b/debian/libotbimagemanipulation-5.2-1.install
old mode 100755
new mode 100644
index 6f56378..43cbe07
--- a/debian/libotbimagemanipulation-5.2-1.install
+++ b/debian/libotbimagemanipulation-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBImageManipulation-*.so.*               usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBImageManipulation-*.so.*
diff --git a/debian/libotbiobsq-5.2-1.install b/debian/libotbiobsq-5.2-1.install
old mode 100755
new mode 100644
index 22e9717..97d79eb
--- a/debian/libotbiobsq-5.2-1.install
+++ b/debian/libotbiobsq-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOBSQ-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOBSQ-*.so.*
diff --git a/debian/libotbiogdal-5.2-1.install b/debian/libotbiogdal-5.2-1.install
old mode 100755
new mode 100644
index 064729a..2727927
--- a/debian/libotbiogdal-5.2-1.install
+++ b/debian/libotbiogdal-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOGDAL-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOGDAL-*.so.*
diff --git a/debian/libotbiokml-5.2-1.install b/debian/libotbiokml-5.2-1.install
old mode 100755
new mode 100644
index 4ed8d74..204befc
--- a/debian/libotbiokml-5.2-1.install
+++ b/debian/libotbiokml-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOKML-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOKML-*.so.*
diff --git a/debian/libotbiolum-5.2-1.install b/debian/libotbiolum-5.2-1.install
old mode 100755
new mode 100644
index d68cf45..e3ee57e
--- a/debian/libotbiolum-5.2-1.install
+++ b/debian/libotbiolum-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOLUM-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOLUM-*.so.*
diff --git a/debian/libotbiomstar-5.2-1.install b/debian/libotbiomstar-5.2-1.install
old mode 100755
new mode 100644
index c42f619..66d8ee4
--- a/debian/libotbiomstar-5.2-1.install
+++ b/debian/libotbiomstar-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOMSTAR-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOMSTAR-*.so.*
diff --git a/debian/libotbiomw-5.2-1.install b/debian/libotbiomw-5.2-1.install
old mode 100755
new mode 100644
index 9c5d024..f7399dc
--- a/debian/libotbiomw-5.2-1.install
+++ b/debian/libotbiomw-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOMW-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOMW-*.so.*
diff --git a/debian/libotbioonera-5.2-1.install b/debian/libotbioonera-5.2-1.install
old mode 100755
new mode 100644
index 376372b..fb7a296
--- a/debian/libotbioonera-5.2-1.install
+++ b/debian/libotbioonera-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOONERA-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOONERA-*.so.*
diff --git a/debian/libotbiorad-5.2-1.install b/debian/libotbiorad-5.2-1.install
old mode 100755
new mode 100644
index 6081b38..c453b91
--- a/debian/libotbiorad-5.2-1.install
+++ b/debian/libotbiorad-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIORAD-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIORAD-*.so.*
diff --git a/debian/libotbiotilemap-5.2-1.install b/debian/libotbiotilemap-5.2-1.install
old mode 100755
new mode 100644
index 2110a22..281c4d6
--- a/debian/libotbiotilemap-5.2-1.install
+++ b/debian/libotbiotilemap-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBIOTileMap-*.so.*                  usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBIOTileMap-*.so.*
diff --git a/debian/libotbmathparser-5.2-1.install b/debian/libotbmathparser-5.2-1.install
old mode 100755
new mode 100644
index 93c8a2b..de05a02
--- a/debian/libotbmathparser-5.2-1.install
+++ b/debian/libotbmathparser-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBMathParser-*.so.*                usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBMathParser-*.so.*
diff --git a/debian/libotbmetadata-5.2-1.install b/debian/libotbmetadata-5.2-1.install
old mode 100755
new mode 100644
index 53018ce..af517af
--- a/debian/libotbmetadata-5.2-1.install
+++ b/debian/libotbmetadata-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBMetadata*.so.*            usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBMetadata*.so.*
diff --git a/debian/libotbopenthreadsadapters-5.2-1.install b/debian/libotbopenthreadsadapters-5.2-1.install
old mode 100755
new mode 100644
index 7857b33..d1ee397
--- a/debian/libotbopenthreadsadapters-5.2-1.install
+++ b/debian/libotbopenthreadsadapters-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBOpenThreadsAdapters-*.so.*                    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBOpenThreadsAdapters-*.so.*
diff --git a/debian/libotbossimadapters-5.2-1.install b/debian/libotbossimadapters-5.2-1.install
old mode 100755
new mode 100644
index feacc82..c29348f
--- a/debian/libotbossimadapters-5.2-1.install
+++ b/debian/libotbossimadapters-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBOSSIMAdapters-*.so.*                    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBOSSIMAdapters-*.so.*
diff --git a/debian/libotbossimplugins-5.2-1.install b/debian/libotbossimplugins-5.2-1.install
old mode 100755
new mode 100644
index 477c5b8..c7ce89c
--- a/debian/libotbossimplugins-5.2-1.install
+++ b/debian/libotbossimplugins-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libotbossimplugins-*.so.*                    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libotbossimplugins-*.so.*
diff --git a/debian/libotbpolarimetry-5.2-1.install b/debian/libotbpolarimetry-5.2-1.install
old mode 100755
new mode 100644
index 6bd9e33..2781165
--- a/debian/libotbpolarimetry-5.2-1.install
+++ b/debian/libotbpolarimetry-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBPolarimetry-*.so.*                   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBPolarimetry-*.so.*
diff --git a/debian/libotbprojection-5.2-1.install b/debian/libotbprojection-5.2-1.install
old mode 100755
new mode 100644
index 07fdc51..a66010b
--- a/debian/libotbprojection-5.2-1.install
+++ b/debian/libotbprojection-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBProjection-*.so.*                   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBProjection-*.so.*
diff --git a/debian/libotbqtwidget-5.2-1.install b/debian/libotbqtwidget-5.2-1.install
old mode 100755
new mode 100644
index 227b3a8..bedfaf8
--- a/debian/libotbqtwidget-5.2-1.install
+++ b/debian/libotbqtwidget-5.2-1.install
@@ -1,3 +1,2 @@
-#! /usr/bin/dh-exec
-# OTB Qt4 libraries (binaries and all symlinks)
-usr/lib/libOTBQtWidget-*.so.*      usr/lib/${DEB_HOST_MULTIARCH}
+# OTB Qt4 libraries
+usr/lib/*/libOTBQtWidget-*.so.*
diff --git a/debian/libotbrcc8-5.2-1.install b/debian/libotbrcc8-5.2-1.install
old mode 100755
new mode 100644
index 11c1c30..7b79b48
--- a/debian/libotbrcc8-5.2-1.install
+++ b/debian/libotbrcc8-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBRCC8*.so.*                usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBRCC8*.so.*
diff --git a/debian/libotbsiftfast-5.2-1.install b/debian/libotbsiftfast-5.2-1.install
old mode 100755
new mode 100644
index 9b8c9c2..fe62b03
--- a/debian/libotbsiftfast-5.2-1.install
+++ b/debian/libotbsiftfast-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libotbsiftfast-*.so.*                    usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libotbsiftfast-*.so.*
\ No newline at end of file
diff --git a/debian/libotbstreaming-5.2-1.install b/debian/libotbstreaming-5.2-1.install
old mode 100755
new mode 100644
index 205d3c3..25f45ed
--- a/debian/libotbstreaming-5.2-1.install
+++ b/debian/libotbstreaming-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBStreaming-*.so.*              usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBStreaming-*.so.*
diff --git a/debian/libotbsupervised-5.2-1.install b/debian/libotbsupervised-5.2-1.install
old mode 100755
new mode 100644
index 331b473..e75f50e
--- a/debian/libotbsupervised-5.2-1.install
+++ b/debian/libotbsupervised-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBSupervised-*.so.*                   usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBSupervised-*.so.*
diff --git a/debian/libotbtestkernel-5.2-1.install b/debian/libotbtestkernel-5.2-1.install
old mode 100755
new mode 100644
index d6244c4..a7822eb
--- a/debian/libotbtestkernel-5.2-1.install
+++ b/debian/libotbtestkernel-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBTestKernel*.so.*                usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBTestKernel*.so.*
diff --git a/debian/libotbtransform-5.2-1.install b/debian/libotbtransform-5.2-1.install
old mode 100755
new mode 100644
index b526cc1..39d2d04
--- a/debian/libotbtransform-5.2-1.install
+++ b/debian/libotbtransform-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBTransform*.so.*           usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBTransform*.so.*
diff --git a/debian/libotbvectordatabase-5.2-1.install b/debian/libotbvectordatabase-5.2-1.install
old mode 100755
new mode 100644
index 2009ce8..3b24763
--- a/debian/libotbvectordatabase-5.2-1.install
+++ b/debian/libotbvectordatabase-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBVectorDataBase-*.so.*              usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBVectorDataBase-*.so.*
diff --git a/debian/libotbvectordataio-5.2-1.install b/debian/libotbvectordataio-5.2-1.install
old mode 100755
new mode 100644
index 8f1a20d..a14ff8a
--- a/debian/libotbvectordataio-5.2-1.install
+++ b/debian/libotbvectordataio-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBVectorDataIO-*.so.*              usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBVectorDataIO-*.so.*
diff --git a/debian/libotbwavelet-5.2-1.install b/debian/libotbwavelet-5.2-1.install
old mode 100755
new mode 100644
index 27fd304..faf0926
--- a/debian/libotbwavelet-5.2-1.install
+++ b/debian/libotbwavelet-5.2-1.install
@@ -1,2 +1 @@
-#! /usr/bin/dh-exec
-usr/lib/libOTBWavelet*.so.*             usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/libOTBWavelet*.so.*
diff --git a/debian/otb-bin.install b/debian/otb-bin.install
index 144da0f..77f959f 100644
--- a/debian/otb-bin.install
+++ b/debian/otb-bin.install
@@ -1,4 +1,4 @@
-# Executables
+# CommandLine Application Launcher and scripts
 usr/bin/otbApplicationLauncherCommandLine
 usr/bin/otbcli_*
 usr/bin/otbcli
diff --git a/debian/rules b/debian/rules
index bd1ad4c..c9c1aa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,6 +32,8 @@ OTB_VERSION_FULL   = $(OTB_VERSION_MAJOR).$(OTB_VERSION_MINOR).$(OTB_VERSION_PAT
 CMAKE_FLAGS = \
 	-DCMAKE_INSTALL_PREFIX=/usr \
 	-DCMAKE_BUILD_TYPE:STRING=Release \
+	-DOTB_INSTALL_LIBRARY_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
+	-DOTB_INSTALL_ARCHIVE_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DOTB_USE_CURL:BOOL=ON \
 	-DOTB_USE_LIBKML:BOOL=ON \

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



More information about the Pkg-grass-devel mailing list