[emos] 07/13: * libemos-bin conflicts with libeccodes-tools, which replaces it * libemos-dev now depends on libeccodes-tools | libemos-bin

[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 28c0916c2fe20e060adcc831879c0683e1ccabee
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 29 07:11:39 2016 +0000

    * libemos-bin conflicts with libeccodes-tools, which replaces it
    * libemos-dev now depends on libeccodes-tools | libemos-bin
---
 debian/changelog | 6 ++++--
 debian/control   | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3c3394..50e430e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-emoslib (2:4.4.5-1) UNRELEASED; urgency=medium
+emoslib (2:4.4.5-1) unstable; urgency=medium
 
   * New upstream release
   * Now build in preference against eccodes, not libgrib-api
   * Build-dep on libeccodes-dev >= 2.0.1-2 for cmake config changes
+  * libemos-bin conflicts with libeccodes-tools, which replaces it
+  * libemos-dev now depends on libeccodes-tools | libemos-bin
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 28 Nov 2016 17:11:41 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 29 Nov 2016 07:11:28 +0000
 
 emoslib (2:4.4.4-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 14a784e..379c9db 100644
--- a/debian/control
+++ b/debian/control
@@ -30,7 +30,7 @@ Section: libdevel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: libemos0d ( = ${binary:Version}), ${misc:Depends}, libemos-bin:any
+Depends: libemos0d ( = ${binary:Version}), ${misc:Depends}, libeccodes-tools | libemos-bin:any 
 Recommends: pkg-config
 Description: ECMWF Interpolation Library - development
  The Interpolation library (EMOSLIB) includes Interpolation software and GRIB, 
@@ -46,6 +46,8 @@ Section: libs
 Architecture: any
 Multi-Arch: allowed
 Depends: ${misc:Depends}, ${shlibs:Depends}, libemos-data
+Conflicts: libeccodes-tools
+Breaks: libeccodes-tools
 Description: ECMWF Interpolation Library - binaries
  The Interpolation library (EMOSLIB) includes Interpolation software and GRIB,
  BUFR, CREX encoding/decoding routines. It is used by the ECMWF meteorological

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