[graywolf] 01/01: Install library multi-arch

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository graywolf.

commit f63310b807b6d2748141cafc44793aef0fc98c28
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Wed Jul 22 19:26:19 2015 +0200

    Install library multi-arch
---
 debian/control                                      |  3 +++
 debian/libycadgraywolf-dev.install                  |  2 +-
 debian/libycadgraywolf0.install                     |  2 +-
 debian/patches/04_install_directory_multiarch.patch | 12 ++++++++++++
 debian/patches/series                               |  1 +
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 05378fa..9de634a 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Library for common functions used by graywolf
  This library contains functions shared by the graywolf binaries
  found in the /usr/lib/graywolf/bin/ directory. It is actually
@@ -28,6 +29,7 @@ Architecture: any
 Section: libdevel
 Depends: libycadgraywolf0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: Library for graywolf - development files
  This library contains functions shared by the graywolf binaries
  found in the /usr/lib/graywolf/bin/ directory.
@@ -40,6 +42,7 @@ Section: debug
 Priority: extra
 Depends: libycadgraywolf0 (= ${binary:Version}),
          ${misc:Depends}
+Multi-Arch: same
 Description: debug symbols for libycadgraywolf0
  This library contains functions shared by the graywolf binaries
  found in the /usr/lib/graywolf/bin/ directory.
diff --git a/debian/libycadgraywolf-dev.install b/debian/libycadgraywolf-dev.install
index e18a6d8..998256d 100644
--- a/debian/libycadgraywolf-dev.install
+++ b/debian/libycadgraywolf-dev.install
@@ -1,2 +1,2 @@
-usr/lib/lib*.so
+usr/lib/*/lib*.so
 include/yalecad /usr/include/
diff --git a/debian/libycadgraywolf0.install b/debian/libycadgraywolf0.install
index d0dbfd1..3ddde58 100644
--- a/debian/libycadgraywolf0.install
+++ b/debian/libycadgraywolf0.install
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff --git a/debian/patches/04_install_directory_multiarch.patch b/debian/patches/04_install_directory_multiarch.patch
new file mode 100644
index 0000000..1c743da
--- /dev/null
+++ b/debian/patches/04_install_directory_multiarch.patch
@@ -0,0 +1,12 @@
+Description: This patch makes the library support multi-arch
+Author: Ruben Undheim <ruben.undheim at gmail.com>
+Index: graywolf/src/Ylib/CMakeLists.txt
+===================================================================
+--- graywolf.orig/src/Ylib/CMakeLists.txt	2015-07-22 19:23:59.054959148 +0200
++++ graywolf/src/Ylib/CMakeLists.txt	2015-07-22 19:24:18.034778631 +0200
+@@ -12,4 +12,4 @@
+ 
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
+ 
+-install(TARGETS ycadgraywolf DESTINATION lib)
++install(TARGETS ycadgraywolf DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
diff --git a/debian/patches/series b/debian/patches/series
index 6581490..365ca71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_no_rpath_in_debian_package.patch
 02_dont_create_link.patch
 03_link_library.patch
+04_install_directory_multiarch.patch

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