[metview] 70/97: WIP: Now fails needing latest grib-api

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit c467d7421130e580154bdb1b96e9c425509f8926
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed May 6 15:44:24 2015 +0100

    WIP: Now fails needing latest grib-api
---
 debian/patches/cmake-fixes.patch | 13 +++++++++++++
 debian/patches/series            |  2 +-
 debian/rules                     |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index e69de29..331b2a0 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -0,0 +1,13 @@
+Index: metview-4.5.3/CMakeLists.txt
+===================================================================
+--- metview-4.5.3.orig/CMakeLists.txt
++++ metview-4.5.3/CMakeLists.txt
+@@ -119,7 +119,7 @@ endif()
+ 
+ if(MARS_SOURCE_PATH)
+     # if the user specified a path, then only look there
+-    set(MARS_SOURCE_PATHS ${MARS_SOURCE_PATH}/src)
++    set(MARS_SOURCE_PATHS ${MARS_SOURCE_PATH})
+ else()
+     # otherwise look in some default locations
+     set(MARS_SOURCE_PATHS ${CMAKE_SOURCE_DIR}/src/libMars         # embedded in source
diff --git a/debian/patches/series b/debian/patches/series
index 1ee7323..d3de448 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@ fix-scripts.patch
 # no-m32.patch
 # fix-colors.patch
 # socklen-fix.patch
-# cmake-fixes.patch
+cmake-fixes.patch
diff --git a/debian/rules b/debian/rules
index d63f401..da0de80 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,7 @@ override_dh_auto_clean:
 # Also -fPIC, for some reason.
 
 override_dh_auto_configure:
+	mkdir -p config
 	cp debian/CONFIG.site config/CONFIG.site
 	chmod +x ./scripts/*.mv
 	dh_auto_configure -- \
@@ -41,7 +42,7 @@ override_dh_auto_configure:
 		-DCMAKE_BUILD_TYPE=Debug \
 		-DMETVIEW_EXTRA_LIBRARIES='terralib m' \
 		-DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
-		-DMARS_SOURCE_PATH=${CMAKE_SOURCE_DIR}/src/libMars
+		-DMARS_SOURCE_PATH=${CMAKE_SOURCE_DIR}/src/libMars/MARS
 	#dh_auto_configure -- \
 		--enable-magics \
 		LIBS=" -lterralib -lm" CPPFLAGS=" -I/usr/include/terralib/kernel " \

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