[odb-api] 12/14: Back out cmake file change

[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 117532895761568e0bc1ec6137ff02cf1a1fb9d2
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Nov 5 10:52:08 2017 +0000

    Back out cmake file change
---
 debian/changelog | 2 --
 debian/rules     | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 786b93b..62c9717 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,6 @@ odb-api (0.17.4-1) UNRELEASED; urgency=medium
   * Sanitise build path in cmake files for reproducibility.
   * Fix for unsigned long convert to size_t on 32-bit systems. Closes: #880680
   * Patch to find libOdb.so.0d in python module via multiarch path
-  * Sanitise targets in odb_api-targets.cmake to enable build of magics++
-    with ODB
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 03 Nov 2017 13:28:15 +0000
 
diff --git a/debian/rules b/debian/rules
index 065446f..5ff9ce1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,11 +53,6 @@ override_dh_auto_install:
 		sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' | \
 		sed -e 	's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' > ${CMAKE_DIR_ODBAPI}/tmp
 	mv ${CMAKE_DIR_ODBAPI}/tmp ${CMAKE_DIR_ODBAPI}/odb_api-targets-release.cmake
-	# Drop broken targets from config file; causes failure to build magics, metview with odb
-	cat ${CMAKE_DIR_ODBAPI}/odb_api-targets.cmake | \
-		sed -e 's%eckit_cmd%%' | sed -e 's%eckit%%' | sed -e 's%metkit%%' \
-		>  ${CMAKE_DIR_ODBAPI}/tmp
-	mv ${CMAKE_DIR_ODBAPI}/tmp ${CMAKE_DIR_ODBAPI}/odb_api-config.cmake
 	# Sanitise paths for bit reproducibility
 	cat ${CMAKE_DIR_ODBAPI}/odb_api-config.cmake | \
 		sed -e 's%${CURDIR}%/build/odb-api%g' > ${CMAKE_DIR_ODBAPI}/tmp

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