[emos] 08/08: * Set libemos-bin as MultiArch: allowed, with libemos-dev depend on libemos-bin:any * Fix interpol links in libemos-data to be relative.

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Oct 28 13:46:34 UTC 2015 

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

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

commit 5b8f1e22572cfe44ef0b11c5c47561e901351116
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 28 13:45:40 2015 +0000

    * Set libemos-bin as MultiArch: allowed, with libemos-dev depend on
      libemos-bin:any
    * Fix interpol links in libemos-data to be relative.
---
 debian/changelog          |  6 ++++--
 debian/control            |  4 ++--
 debian/libemos-data.links | 50 +++++++++++++++++++++++------------------------
 3 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 229c303..d1ee13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,11 @@ 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.
+  * Set libemos-bin as MultiArch: allowed, with libemos-dev depend on 
+    libemos-bin:any
+  * Fix interpol links in libemos-data to be relative.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 12:17:32 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 28 Oct 2015 13:17:32 +0000
 
 emoslib (2:4.1.1-4) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ee54b15..6146271 100644
--- a/debian/control
+++ b/debian/control
@@ -27,7 +27,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libemos0d ( = ${binary:Version}), ${misc:Depends}, libemos-bin (= ${binary:Version}) 
+Depends: libemos0d ( = ${binary:Version}), ${misc:Depends}, libemos-bin:any
 Recommends: pkg-config
 Description: ECMWF Interpolation Library - development
  The Interpolation library (EMOSLIB) includes Interpolation software and GRIB, 
@@ -41,7 +41,7 @@ Description: ECMWF Interpolation Library - development
 Package: libemos-bin
 Section: libs
 Architecture: any
-Multi-Arch: same
+Multi-Arch: allowed
 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.links b/debian/libemos-data.links
index 05d5ff6..46a5828 100644
--- a/debian/libemos-data.links
+++ b/debian/libemos-data.links
@@ -1,26 +1,26 @@
-/usr/share/emos/interpol/LSM_GG_0048  ./usr/share/emos/land_sea_mask/LSM_GG_0048
-/usr/share/emos/interpol/LSM_GG_0080  ./usr/share/emos/land_sea_mask/LSM_GG_0080
-/usr/share/emos/interpol/LSM_GG_0128  ./usr/share/emos/land_sea_mask/LSM_GG_0128
-/usr/share/emos/interpol/LSM_GG_0160  ./usr/share/emos/land_sea_mask/LSM_GG_0160
-/usr/share/emos/interpol/LSM_GG_0200  ./usr/share/emos/land_sea_mask/LSM_GG_0200
-/usr/share/emos/interpol/LSM_GG_0256  ./usr/share/emos/land_sea_mask/LSM_GG_0256
-/usr/share/emos/interpol/LSM_GG_0320  ./usr/share/emos/land_sea_mask/LSM_GG_0320
-/usr/share/emos/interpol/LSM_GG_0400  ./usr/share/emos/land_sea_mask/LSM_GG_0400
-/usr/share/emos/interpol/LSM_GG_0640  ./usr/share/emos/land_sea_mask/LSM_GG_0640
-/usr/share/emos/interpol/defaults_for_table_001 ./usr/share/emos/land_sea_mask/defaults_for_table_001
-/usr/share/emos/interpol/defaults_for_table_128 ./usr/share/emos/land_sea_mask/defaults_for_table_128
-/usr/share/emos/interpol/defaults_for_table_129 ./usr/share/emos/land_sea_mask/defaults_for_table_129
-/usr/share/emos/interpol/lsm_xx_lsm0p25deg   ./usr/share/emos/land_sea_mask/lsm_xx_lsm0p25deg
-/usr/share/emos/interpol/lsm_xx_lsm0p5deg   ./usr/share/emos/land_sea_mask/lsm_xx_lsm0p5deg
-/usr/share/emos/interpol/lsm_xx_lsm10m01    ./usr/share/emos/land_sea_mask/lsm_xx_lsm10m01
-/usr/share/emos/interpol/lsm_xx_lsmn080  ./usr/share/emos/land_sea_mask/lsm_xx_lsmn080
-/usr/share/emos/interpol/lsm_xx_lsmr160  ./usr/share/emos/land_sea_mask/lsm_xx_lsmr160
-/usr/share/emos/interpol/ksm_xx_lsm0p5deg ./usr/share/emos/land_sea_mask/ksm_xx_lsm0p5deg
-/usr/share/emos/interpol/parameter_processing_defaults ./usr/share/emos/land_sea_mask/parameter_processing_defaults
-/usr/share/emos/interpol/r160_xx_19790930 ./usr/share/emos/land_sea_mask/r160_xx_19790930
-/usr/share/emos/interpol/r160_xx_19910917 ./usr/share/emos/land_sea_mask/r160_xx_19910917
-/usr/share/emos/interpol/r160_xx_19930804 ./usr/share/emos/land_sea_mask/r160_xx_19930804
-/usr/share/emos/interpol/r160_xx_19940302 ./usr/share/emos/land_sea_mask/r160_xx_19940302
-/usr/share/emos/interpol/r160_xx_19940823 ./usr/share/emos/land_sea_mask/r160_xx_19940823
-/usr/share/emos/interpol/r160_xx_19950404 ./usr/share/emos/land_sea_mask/r160_xx_19950404
+../interpol/LSM_GG_0048  ./usr/share/emos/land_sea_mask/LSM_GG_0048
+../interpol/LSM_GG_0080  ./usr/share/emos/land_sea_mask/LSM_GG_0080
+../interpol/LSM_GG_0128  ./usr/share/emos/land_sea_mask/LSM_GG_0128
+../interpol/LSM_GG_0160  ./usr/share/emos/land_sea_mask/LSM_GG_0160
+../interpol/LSM_GG_0200  ./usr/share/emos/land_sea_mask/LSM_GG_0200
+../interpol/LSM_GG_0256  ./usr/share/emos/land_sea_mask/LSM_GG_0256
+../interpol/LSM_GG_0320  ./usr/share/emos/land_sea_mask/LSM_GG_0320
+../interpol/LSM_GG_0400  ./usr/share/emos/land_sea_mask/LSM_GG_0400
+../interpol/LSM_GG_0640  ./usr/share/emos/land_sea_mask/LSM_GG_0640
+../interpol/defaults_for_table_001 ./usr/share/emos/land_sea_mask/defaults_for_table_001
+../interpol/defaults_for_table_128 ./usr/share/emos/land_sea_mask/defaults_for_table_128
+../interpol/defaults_for_table_129 ./usr/share/emos/land_sea_mask/defaults_for_table_129
+../interpol/lsm_xx_lsm0p25deg   ./usr/share/emos/land_sea_mask/lsm_xx_lsm0p25deg
+../interpol/lsm_xx_lsm0p5deg   ./usr/share/emos/land_sea_mask/lsm_xx_lsm0p5deg
+../interpol/lsm_xx_lsm10m01    ./usr/share/emos/land_sea_mask/lsm_xx_lsm10m01
+../interpol/lsm_xx_lsmn080  ./usr/share/emos/land_sea_mask/lsm_xx_lsmn080
+../interpol/lsm_xx_lsmr160  ./usr/share/emos/land_sea_mask/lsm_xx_lsmr160
+../interpol/ksm_xx_lsm0p5deg ./usr/share/emos/land_sea_mask/ksm_xx_lsm0p5deg
+../interpol/parameter_processing_defaults ./usr/share/emos/land_sea_mask/parameter_processing_defaults
+../interpol/r160_xx_19790930 ./usr/share/emos/land_sea_mask/r160_xx_19790930
+../interpol/r160_xx_19910917 ./usr/share/emos/land_sea_mask/r160_xx_19910917
+../interpol/r160_xx_19930804 ./usr/share/emos/land_sea_mask/r160_xx_19930804
+../interpol/r160_xx_19940302 ./usr/share/emos/land_sea_mask/r160_xx_19940302
+../interpol/r160_xx_19940823 ./usr/share/emos/land_sea_mask/r160_xx_19940823
+../interpol/r160_xx_19950404 ./usr/share/emos/land_sea_mask/r160_xx_19950404
 

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

More information about the debian-science-commits mailing list