Package: metview / 5.10.2-1

fix-scripts.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Ensure all scripts have a correct start line
 and paths are correct in Metview
Forwarded: not-needed
Last-Updated: 2020-03-23

Index: metview-5.9.0/metview/scripts/document_macros.pl
===================================================================
--- metview-5.9.0.orig/metview/scripts/document_macros.pl
+++ metview-5.9.0/metview/scripts/document_macros.pl
@@ -1,4 +1,4 @@
-
+#!/usr/bin/perl
 # **************************** LICENSE START ***********************************
 #
 # Copyright 2012 ECMWF and INPE. This software is distributed under the terms
Index: metview-5.9.0/metview/scripts/metview_help
===================================================================
--- metview-5.9.0.orig/metview/scripts/metview_help
+++ metview-5.9.0/metview/scripts/metview_help
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 # **************************** LICENSE START ***********************************
 #
 # Copyright 2014 ECMWF and INPE. This software is distributed under the terms
Index: metview-5.9.0/metview/scripts/mv_flextra_prep.mv
===================================================================
--- metview-5.9.0.orig/metview/scripts/mv_flextra_prep.mv
+++ metview-5.9.0/metview/scripts/mv_flextra_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
 # Metview Macro
 
 # **************************** LICENSE START ***********************************
Index: metview-5.9.0/metview/scripts/mv_mars_catalog.py
===================================================================
--- metview-5.9.0.orig/metview/scripts/mv_mars_catalog.py
+++ metview-5.9.0/metview/scripts/mv_mars_catalog.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
 # Copyright 2012 ECMWF and INPE. This software is distributed under the terms
 # of the Apache License version 2.0. In applying this license, ECMWF does not
 # waive the privileges and immunities granted to it by virtue of its status as
Index: metview-5.9.0/metview/scripts/mv_scm_vis.mv
===================================================================
--- metview-5.9.0.orig/metview/scripts/mv_scm_vis.mv
+++ metview-5.9.0/metview/scripts/mv_scm_vis.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview 
 # Metview Macro
 
 # **************************** LICENSE START ***********************************
Index: metview-5.9.0/metview/scripts/mv_vapor_prep.mv
===================================================================
--- metview-5.9.0.orig/metview/scripts/mv_vapor_prep.mv
+++ metview-5.9.0/metview/scripts/mv_vapor_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/magml
 # Metview Macro
 
 #  **************************** LICENSE START ***********************************
@@ -1020,4 +1021,4 @@ function listToString(lst)
   
   return s
   
-end listToString 
\ No newline at end of file
+end listToString 
Index: metview-5.9.0/metview/scripts/metview_base.in
===================================================================
--- metview-5.9.0.orig/metview/scripts/metview_base.in
+++ metview-5.9.0/metview/scripts/metview_base.in
@@ -17,13 +17,15 @@ set -ea
 # THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
 #
 WMO_SITE_NR=@SITE_WMO_CODE@
+ARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+METVIEW_BIN=/usr/lib/$ARCH/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@
+INSTALLDIR=/usr/share/metview
 METVIEW_SCRIPT=@METVIEW_SCRIPT@
 MV_MARS_ACCESS=@MARS_ACCESS@
 MARS_HOME=@MARS_HOME@
-METVIEW_DIR_DEV=@CMAKE_BINARY_DIR@
+METVIEW_DIR_DEV=/usr
 METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
 METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
 MV_ENVIRON=@MV_ENVIRON@
@@ -52,7 +54,7 @@ MV_BUNDLE_CONTAINS_MAGICS=x@MV_BUNDLE_CO
 MV_BUNDLE_CONTAINS_EMOSLIB=x@MV_BUNDLE_CONTAINS_EMOSLIB@
 MV_BUNDLE_CONTAINS_ECCODES=x@MV_BUNDLE_CONTAINS_ECCODES@
 
-MV_BUNDLE_SRC=@METVIEW_BUNDLE_SRC@
+MV_BUNDLE_SRC=/build/metview
 METVIEW_QT5=@METVIEW_QT5@
 MV_MIR=@HAVE_PPROC_MIR@
 
@@ -502,7 +504,7 @@ case $METVIEW_VERSION in
 
  dev)
 	METVIEW_DIR=${METVIEW_DIR_DEV}
-	METVIEW_DIR_SHARE=${METVIEW_DIR_DEV}/share/metview
+	METVIEW_DIR_SHARE=${METVIEW_DIR_DEV}
 	METVIEW_BIN=${METVIEW_BIN:=$METVIEW_DIR/bin}
 	METV_DEV=yes
 	MV_DEBUG_PRINT=${MV_DEBUG_PRINT:=1}
@@ -543,7 +545,7 @@ case $METVIEW_VERSION in
 
  prod)
 	METVIEW_DIR=$INSTALLDIR
-	METVIEW_DIR_SHARE=${METVIEW_DIR}/share/metview
+	METVIEW_DIR_SHARE=${METVIEW_DIR}
 	METVIEW_BIN=${METVIEW_BIN:=$METVIEW_DIR/@MV_BIN_DIR@}
 	METVIEW_LIB=$METVIEW_DIR/@MV_INSTALL_LIB_DIR@
 	LD_LIBRARY_PATH=$METVIEW_LIB:$LD_LIBRARY_PATH
Index: metview-5.9.0/metview/scripts/metview_create_user_dir
===================================================================
--- metview-5.9.0.orig/metview/scripts/metview_create_user_dir
+++ metview-5.9.0/metview/scripts/metview_create_user_dir
@@ -20,7 +20,7 @@
 #
 
 
-USER_SOURCE_DIR=$METVIEW_DIR/share/metview/app-defaults/UserDir
+USER_SOURCE_DIR=$METVIEW_DIR/app-defaults/UserDir
 
 
 if [ x$1 = x ]