[odb-api] 01/08: Rename odb -> ecmwf_odb to avoid conflict. Closes: #880890

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit 3e11f25f23052ab3d38ea135efc2246423f9f64b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Nov 5 16:46:26 2017 +0000

    Rename odb -> ecmwf_odb to avoid conflict. Closes: #880890
---
 debian/changelog | 1 +
 debian/rules     | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index efbb2e0..8acdd56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ odb-api (0.17.4-2) UNRELEASED; urgency=medium
 
   * Delete ecbuild configuartion info from include files that break
     multi-arch usability and reproducibility
+  * Rename odb -> ecmwf_odb to avoid conflict. Closes: #880890
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sun, 05 Nov 2017 16:22:05 +0000
 
diff --git a/debian/rules b/debian/rules
index 34159ac..9deccae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,5 +71,6 @@ override_dh_auto_install:
 	mv ${INC_DIR}/tmp ${INC_DIR}/eckit/eckit_config.h
 	grep -v metkit_ecbuildconfig.h ${INC_DIR}/metkit_config.h > ${INC_DIR}/tmp
 	mv ${INC_DIR}/tmp ${INC_DIR}/metkit/metkit_config.h
-
+	# Avoid conflict with different odb ( #880890) 
+	mv debian/tmp/usr/bin/odb	debian/tmp/usr/bin/ecmwf_odb
 

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