[metview] 09/13: Fix paths in metview

[Alastair McKinstry]

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

mckinstry pushed a commit to tag debian/4.6.1-1
in repository metview.

commit 0076465fd3e5cfa9f63078061670afea7d910a97
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 10 10:21:51 2016 +0000

    Fix paths in metview
---
 debian/patches/cmake-fixes.patch        | 21 +++++++++++++++++----
 debian/patches/fix-scripts.patch        |  5 +++--
 debian/patches/reproducible-build.patch |  2 +-
 debian/rules                            |  3 +++
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index 331b2a0..1581d25 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -1,8 +1,8 @@
-Index: metview-4.5.3/CMakeLists.txt
+Index: metview-4.6.1/CMakeLists.txt
 ===================================================================
---- metview-4.5.3.orig/CMakeLists.txt
-+++ metview-4.5.3/CMakeLists.txt
-@@ -119,7 +119,7 @@ endif()
+--- metview-4.6.1.orig/CMakeLists.txt
++++ metview-4.6.1/CMakeLists.txt
+@@ -134,7 +134,7 @@ endif()
  
  if(MARS_SOURCE_PATH)
      # if the user specified a path, then only look there
@@ -11,3 +11,16 @@ Index: metview-4.5.3/CMakeLists.txt
  else()
      # otherwise look in some default locations
      set(MARS_SOURCE_PATHS ${CMAKE_SOURCE_DIR}/src/libMars         # embedded in source
+Index: metview-4.6.1/share/metview/etc/CMakeLists.txt
+===================================================================
+--- metview-4.6.1.orig/share/metview/etc/CMakeLists.txt
++++ metview-4.6.1/share/metview/etc/CMakeLists.txt
+@@ -171,7 +171,7 @@ ADD_CUSTOM_COMMAND(
+ 
+ ADD_CUSTOM_COMMAND(
+     OUTPUT  ${CMAKE_BINARY_DIR}/share/metview/etc/macro_icon_function_help.xml
+-    COMMAND ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_icon_fun_help.mv ${dict_file} ${CMAKE_BINARY_DIR}/share/metview/etc/macro_icon_function_help.xml
++    COMMAND ksh ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_icon_fun_help.mv ${dict_file} ${CMAKE_BINARY_DIR}/share/metview/etc/macro_icon_function_help.xml
+     DEPENDS ${FULL_STARTUP_SCRIPT_PATH} ${dict_file} ${metview_core_targets}
+ )
+ 
diff --git a/debian/patches/fix-scripts.patch b/debian/patches/fix-scripts.patch
index f53581d..5bae458 100644
--- a/debian/patches/fix-scripts.patch
+++ b/debian/patches/fix-scripts.patch
@@ -1,7 +1,8 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Ensure all scripts have a correct start line
+ and paths are correct in Metview
 Forwarded: not-needed
-Last-Updated: 2014-06-21
+Last-Updated: 2016-01-11
 
 Index: metview-4.6.1/scripts/document_macros.pl
 ===================================================================
@@ -74,7 +75,7 @@ Index: metview-4.6.1/scripts/metview_base.in
  # THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
  #
  WMO_SITE_NR=@SITE_WMO_CODE@
-+METVIEW_BIN=@MULTIARCH_LIB_DIR@
++METVIEW_BIN=/usr/lib/@DEB_HOST_MULTIARCH@/metview
  ##QT_DIR_LIB=/usr/local/apps/qt/4.6.2-64/lib
  PATH=@NETCDF_BIN@:@ODB_API_BIN_DIR@:${PATH}
  INSTALLDIR=@CMAKE_INSTALL_PREFIX@
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 0346f2b..a6c57e8 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -21,7 +21,7 @@ Index: metview-4.6.1/scripts/metview_base.in
 -# THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
 -#
  WMO_SITE_NR=@SITE_WMO_CODE@
- METVIEW_BIN=@MULTIARCH_LIB_DIR@
+ METVIEW_BIN=/usr/lib/@DEB_HOST_MULTIARCH@/metview
  ##QT_DIR_LIB=/usr/local/apps/qt/4.6.2-64/lib
 @@ -41,7 +39,7 @@ MV_ODB1_VERSION=@MV_ODB1_VERSION@
  ##MV_ODB1_BIN=/usr/local/apps/odb/CY37R3.001/pgf90/LP64/bin
diff --git a/debian/rules b/debian/rules
index f2c7877..07b7a08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,6 +45,9 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	chmod +x ./scripts/*.mv
+	# Hack. how to do this via ecbuild?
+	sed -e 's%@DEB_HOST_MULTIARCH@%${DEB_HOST_MULTIARCH}%g' < scripts/metview_base.in \
+		> scripts/tmpx && mv scripts/tmpx scripts/metview_base.in
 	dh_auto_configure -- \
 		-DMETVIEW_SITE=debian  \
 		-DCMAKE_BUILD_TYPE=Release \

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