[emos] 06/08: Set libemos-bin as MultiArch: same.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository emos.

commit ecf70bf44afc66e4635f83ac0ff87d47a9b4bb11
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 28 12:19:03 2015 +0000

    Set libemos-bin as MultiArch: same.
---
 debian/changelog                          |  5 +++--
 debian/control                            |  1 +
 debian/libemos-data.install               |  2 +-
 debian/patches/interpol_tables_path.patch | 19 +++++++++++++++++++
 debian/patches/series                     |  1 +
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 06b40fe..229c303 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-emoslib (2:4.1.1-5) UNRELEASED; urgency=medium
+emoslib (2:4.1.1-5) unstable; urgency=medium
 
   * Add s390x to the list of archs on which we disable tests.
   * Set INTERPOL_TABLES_PATH during build to be install location
+  * Set libemos-bin as MultiArch: same.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 11:13:56 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 12:17:32 +0000
 
 emoslib (2:4.1.1-4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8a94e88..ee54b15 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Description: ECMWF Interpolation Library - development
 Package: libemos-bin
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}, libemos-data
 Description: ECMWF Interpolation Library - binaries
  The Interpolation library (EMOSLIB) includes Interpolation software and GRIB,
diff --git a/debian/libemos-data.install b/debian/libemos-data.install
index be01774..73f0362 100644
--- a/debian/libemos-data.install
+++ b/debian/libemos-data.install
@@ -2,4 +2,4 @@ share/libemos/tables/bufrtables/*.TXT	/usr/share/emos/bufrtables
 share/libemos/tables/gribtables/*	/usr/share/emos/gribtables
 share/libemos/tables/gribtemplates/*	/usr/share/emos/gribtemplates
 share/libemos/tables/land_sea_mask/0*	/usr/share/emos/land_sea_mask
-share/libemos/tables/interpol/*	/usr/share/emos/interpol
+usr/share/emos/interpol/*	/usr/share/emos/interpol
diff --git a/debian/patches/interpol_tables_path.patch b/debian/patches/interpol_tables_path.patch
new file mode 100644
index 0000000..9e47d7a
--- /dev/null
+++ b/debian/patches/interpol_tables_path.patch
@@ -0,0 +1,19 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Install INTERPOL tables into install directory; needed to keep 
+ INTELPOL_TABLES_PATH install-friendly
+Last-Updated: 2015-10-28
+Forwarded: no
+
+Index: emoslib-4.1.1/CMakeLists.txt
+===================================================================
+--- emoslib-4.1.1.orig/CMakeLists.txt
++++ emoslib-4.1.1/CMakeLists.txt
+@@ -207,7 +207,7 @@ message( STATUS "INTERPOL_TABLES_PATH: $
+ file( COPY tables/interpol DESTINATION ${CMAKE_BINARY_DIR}/${INSTALL_DATA_DIR}/tables )
+ 
+ # always install tables/interpol
+-install( DIRECTORY tables/interpol DESTINATION "${INTERPOL_TABLES_PATH}" FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
++install( DIRECTORY tables/interpol DESTINATION "${CMAKE_INSTALL_PREFIX}/${INTERPOL_TABLES_PATH}" FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
+ 
+ ################################################################################
+ # final definitions
diff --git a/debian/patches/series b/debian/patches/series
index 8902218..edcd1db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ cmake_fixes.patch
 testbuild.patch
 links-fix.patch
 disable-test-downloads.patch
+interpol_tables_path.patch

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