[odb-api] 06/08: Change odb_api-targets-release.cmake refernces from odb -> ecmwf_odb

Alastair McKinstry mckinstry at moszumanska.debian.org
Sat Nov 11 09:33:21 UTC 2017


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 7c2655f0f02e0845d545728269d19f074b192fbd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Nov 9 18:21:00 2017 +0000

    Change odb_api-targets-release.cmake refernces from odb -> ecmwf_odb
---
 debian/changelog | 6 ++++++
 debian/rules     | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1b4f64..1bbbcf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+odb-api (0.17.4-3) UNRELEASED; urgency=medium
+
+  * Change odb_api-targets-release.cmake refernces from odb -> ecmwf_odb
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Nov 2017 18:20:26 +0000
+
 odb-api (0.17.4-2) unstable; urgency=medium
 
   * Delete ecbuild configuartion info from include files that break
diff --git a/debian/rules b/debian/rules
index 4656c5f..07e215e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ override_dh_auto_install:
 	mv ${CMAKE_DIR_ECKIT}/tmp ${CMAKE_DIR_ECKIT}/eckit-targets-release.cmake
 	cat ${CMAKE_DIR_ODBAPI}/odb_api-targets-release.cmake | \
 		sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' | \
+		sed -e 's%"/usr/bin/odb"%"/usr/bin/ecmwf_odb"%' | \
 		sed -e 	's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' > ${CMAKE_DIR_ODBAPI}/tmp
 	mv ${CMAKE_DIR_ODBAPI}/tmp ${CMAKE_DIR_ODBAPI}/odb_api-targets-release.cmake
 	# Sanitise paths for bit reproducibility
@@ -72,4 +73,5 @@ override_dh_auto_install:
 	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
+	sefodb_api-targets-release.cmake
 

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



More information about the debian-science-commits mailing list