[emos] 08/13: * Build-dep on libeccodes-dev >= 2.0.1-2 for cmake config change * libemos-bin now depends on libeccodes-tools, which ships bufr_filter instead of 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 0fa0380b0c4d7487ebf4ff3d58da3daf2fdc28d9
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 29 09:47:59 2016 +0000

    * Build-dep on libeccodes-dev >= 2.0.1-2 for cmake config change
    * libemos-bin now depends on libeccodes-tools, which ships bufr_filter
      instead of libemos-bin
---
 debian/changelog | 6 +++---
 debian/control   | 4 +---
 debian/rules     | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50e430e..2292d40 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,9 @@ 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
+  * Build-dep on libeccodes-dev >= 2.0.1-2 for cmake config change
+  * libemos-bin now depends on libeccodes-tools, which ships bufr_filter
+    instead of libemos-bin
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 29 Nov 2016 07:11:28 +0000
 
diff --git a/debian/control b/debian/control
index 379c9db..b828cd9 100644
--- a/debian/control
+++ b/debian/control
@@ -45,9 +45,7 @@ Package: libemos-bin
 Section: libs
 Architecture: any
 Multi-Arch: allowed
-Depends: ${misc:Depends}, ${shlibs:Depends}, libemos-data
-Conflicts: libeccodes-tools
-Breaks: libeccodes-tools
+Depends: ${misc:Depends}, ${shlibs:Depends}, libemos-data, 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
diff --git a/debian/rules b/debian/rules
index bdc5ebb..f107d46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,6 +86,8 @@ override_dh_auto_install:
 		( chrpath -d $$d || echo "Ignoring non-ELF file errors") ; done
 	chrpath -d debian/tmp/lib/*.0d
 	(cd ${DESTDIR}/share/libemos/tables/bufrtables && sh ./links.sh)
+	# Now in libeccodes
+	rm -f debian/tmp/bin/bufr_filter
 	dh_auto_install	
 	# Fix broken paths 
 	cat ${CMAKE_DIR}/libemos-targets-release.cmake | \

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