This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pktools.
commit 2eed558886d6448a6f443511bd41592255ffdfc9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Feb 7 08:28:41 2018 +0100
Install libraries in Multi-Arch path.
---
debian/changelog | 1 +
debian/libalgorithms1.install | 2 +-
debian/libbase1.install | 2 +-
debian/libfileclasses1.install | 2 +-
debian/libimageclasses1.install | 2 +-
debian/liblasclasses1.install | 2 +-
debian/patches/multiarch.patch | 44 +++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/pktools-dev.install | 4 ++--
debian/rules | 5 ++++-
10 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 05ddeb8..7958983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ pktools (2.6.7.3+ds-1) UNRELEASED; urgency=medium
* Update watch file to use HTTPS.
* Update copyright-format URL to use HTTPS.
* Update watch file to check for uppercase releases too.
+ * Install libraries in Multi-Arch path.
-- Bas Couwenberg <sebas...@debian.org> Wed, 07 Feb 2018 07:59:59 +0100
diff --git a/debian/libalgorithms1.install b/debian/libalgorithms1.install
index a60761b..f50bd30 100644
--- a/debian/libalgorithms1.install
+++ b/debian/libalgorithms1.install
@@ -1 +1 @@
-usr/lib/libalgorithms.so.*
+usr/lib/*/libalgorithms.so.*
diff --git a/debian/libbase1.install b/debian/libbase1.install
index 0859144..95ce68e 100644
--- a/debian/libbase1.install
+++ b/debian/libbase1.install
@@ -1 +1 @@
-usr/lib/libbase.so.*
+usr/lib/*/libbase.so.*
diff --git a/debian/libfileclasses1.install b/debian/libfileclasses1.install
index 016e828..4c0debc 100644
--- a/debian/libfileclasses1.install
+++ b/debian/libfileclasses1.install
@@ -1 +1 @@
-usr/lib/libfileClasses.so.*
+usr/lib/*/libfileClasses.so.*
diff --git a/debian/libimageclasses1.install b/debian/libimageclasses1.install
index 94bffc6..320f4d8 100644
--- a/debian/libimageclasses1.install
+++ b/debian/libimageclasses1.install
@@ -1 +1 @@
-usr/lib/libimageClasses.so.*
+usr/lib/*/libimageClasses.so.*
diff --git a/debian/liblasclasses1.install b/debian/liblasclasses1.install
index 9d7fcee..d1df488 100644
--- a/debian/liblasclasses1.install
+++ b/debian/liblasclasses1.install
@@ -1 +1 @@
-usr/lib/liblasClasses.so.*
+usr/lib/*/liblasClasses.so.*
diff --git a/debian/patches/multiarch.patch b/debian/patches/multiarch.patch
new file mode 100644
index 0000000..e9233d1
--- /dev/null
+++ b/debian/patches/multiarch.patch
@@ -0,0 +1,44 @@
+Description: Add option to set install path for libraries.
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: https://savannah.nongnu.org/bugs/index.php?53082
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -86,6 +86,8 @@ set(BUILD_WITH_FANN FALSE CACHE BOOL "Ch
+ #set(BUILD_WITH_NLOPT FALSE CACHE BOOL "Choose if pktools is to be built with
nlopt")
+ set(PKTOOLS_WITH_UTILITIES TRUE CACHE BOOL "Choose if pktools utilities
should be built")
+
++option (INSTALL_LIBRARY_DIR "Install path for libraries"
${PROJECT_LIBRARY_DIR})
++
+ set(GSL_INCLUDE_DIR /usr/include CACHE PATH "Include PATH for GSL")
+ set(GSL_LIB_PATH /usr/lib CACHE PATH "Library PATH for GSL")
+
+@@ -363,7 +365,7 @@ endif()
+ #install (FILES "${PROJECT_BINARY_DIR}/pktools-config" DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
+ #test
+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/pktools-config" DESTINATION bin
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE
WORLD_READ WORLD_EXECUTE)
+-install (FILES "pktools.pc" DESTINATION lib/pkgconfig PERMISSIONS OWNER_READ
OWNER_WRITE GROUP_READ WORLD_READ)
++install (FILES "pktools.pc" DESTINATION ${INSTALL_LIBRARY_DIR}/pkgconfig
PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+
+ if (PKTOOLS_WITH_UTILITIES)
+ install (TARGETS ${PKUTILITIES} DESTINATION bin PERMISSIONS OWNER_READ
OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -148,7 +148,7 @@ endif(BUILD_WITH_LIBLAS)
+
+
###############################################################################
+ # Installation
+-install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME}
${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION lib)
++install (TARGETS ${PKTOOLS_BASE_LIB_NAME} ${PKTOOLS_IMAGECLASSES_LIB_NAME}
${PKTOOLS_ALGORITHMS_LIB_NAME} ${PKTOOLS_FILECLASSES_LIB_NAME} DESTINATION
${INSTALL_LIBRARY_DIR})
+
+ install (FILES ${BASE_H} DESTINATION ${PROJECT_INCLUDE_DIR}/base)
+ install (FILES ${IMGCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/imageclasses)
+@@ -156,7 +156,7 @@ install (FILES ${ALGOR_H} DESTINATION ${
+ install (FILES ${FILECLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/fileclasses)
+
+ if (BUILD_WITH_LIBLAS)
+-install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION lib)
++install (TARGETS ${PKTOOLS_LASCLASSES_LIB_NAME} DESTINATION
${INSTALL_LIBRARY_DIR})
+ install (FILES ${LASCLASS_H} DESTINATION ${PROJECT_INCLUDE_DIR}/lasclasses)
+ endif(BUILD_WITH_LIBLAS)
+
###############################################################################
diff --git a/debian/patches/series b/debian/patches/series
index bb1d521..5c256c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
spelling-errors2.patch
+multiarch.patch
diff --git a/debian/pktools-dev.install b/debian/pktools-dev.install
index b626069..9c93d3c 100644
--- a/debian/pktools-dev.install
+++ b/debian/pktools-dev.install
@@ -1,4 +1,4 @@
usr/bin/pktools-config
usr/include/pktools
-usr/lib/*.so
-usr/lib/pkgconfig
+usr/lib/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index d67b775..7ec2222 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,8 @@ ifneq ($(wildcard
/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
export DEB_CXXFLAGS_MAINT_APPEND := -I/usr/include/hdf5/serial
endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
MANPAGES:=$(wildcard debian/man/*.*.xml)
%:
@@ -27,7 +29,8 @@ MANPAGES:=$(wildcard debian/man/*.*.xml)
override_dh_auto_configure:
dh_auto_configure -- -DBUILD_WITH_FANN=ON \
-DBUILD_WITH_LIBLAS=ON \
- -DBUILD_SHARED_LIBS=ON
+ -DBUILD_SHARED_LIBS=ON \
+
-DINSTALL_LIBRARY_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_clean:
dh_clean debian/man/*.1
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
