[metview] 05/15: - fix-paths.patch removed
Alastair McKinstry
mckinstry at moszumanska.debian.org
Mon Jun 20 07:51:50 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/4.6.5-3
in repository metview.
commit ced89810d0e4391aabf89a2b57ca603638ef5f64
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Mar 18 14:50:59 2016 +0000
- fix-paths.patch removed
---
debian/changelog | 3 ++-
debian/patches/cmake-fixes.patch | 18 +++++++-------
debian/patches/fix-bashisms.patch | 6 ++---
debian/patches/fix-paths.patch | 15 ------------
debian/patches/fix-scripts.patch | 42 ++++++++++++++++-----------------
debian/patches/fpic.patch | 8 +++----
debian/patches/g++-6.patch | 12 +++++-----
debian/patches/hurd.patch | 6 ++---
debian/patches/mv_compress.patch | 6 ++---
debian/patches/reproducible-build.patch | 12 +++++-----
debian/patches/series | 1 -
11 files changed, 57 insertions(+), 72 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 942f21f..331ba8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
metview (4.6.5-1) UNRELEASED; urgency=medium
- * Nw upstream release
+ * New upstream release:
+ - fix-paths.patch removed
-- Alastair McKinstry <mckinstry at debian.org> Fri, 18 Mar 2016 14:09:14 +0000
diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index db2ec9e..05bc3a7 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -1,7 +1,7 @@
-Index: metview-4.6.1/CMakeLists.txt
+Index: metview-4.6.5/CMakeLists.txt
===================================================================
---- metview-4.6.1.orig/CMakeLists.txt
-+++ metview-4.6.1/CMakeLists.txt
+--- metview-4.6.5.orig/CMakeLists.txt
++++ metview-4.6.5/CMakeLists.txt
@@ -134,7 +134,7 @@ endif()
if(MARS_SOURCE_PATH)
@@ -11,10 +11,10 @@ Index: metview-4.6.1/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
+Index: metview-4.6.5/share/metview/etc/CMakeLists.txt
===================================================================
---- metview-4.6.1.orig/share/metview/etc/CMakeLists.txt
-+++ metview-4.6.1/share/metview/etc/CMakeLists.txt
+--- metview-4.6.5.orig/share/metview/etc/CMakeLists.txt
++++ metview-4.6.5/share/metview/etc/CMakeLists.txt
@@ -148,7 +148,7 @@ set(extra_install_files macro_built_in_f
ADD_CUSTOM_COMMAND(
@@ -42,10 +42,10 @@ Index: metview-4.6.1/share/metview/etc/CMakeLists.txt
DEPENDS ${FULL_STARTUP_SCRIPT_PATH} ${dict_file} ${metview_core_targets}
)
-Index: metview-4.6.1/scripts/metview_base.in
+Index: metview-4.6.5/scripts/metview_base.in
===================================================================
---- metview-4.6.1.orig/scripts/metview_base.in
-+++ metview-4.6.1/scripts/metview_base.in
+--- metview-4.6.5.orig/scripts/metview_base.in
++++ metview-4.6.5/scripts/metview_base.in
@@ -17,14 +17,14 @@ set -ea
# THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
#
diff --git a/debian/patches/fix-bashisms.patch b/debian/patches/fix-bashisms.patch
index e1e44de..5d1f39e 100644
--- a/debian/patches/fix-bashisms.patch
+++ b/debian/patches/fix-bashisms.patch
@@ -3,10 +3,10 @@ Description: Remove bashisms to that we can use the dash shell
Last-Updated: 2016-02-14
Forwarded: no
-Index: metview-4.6.1/scripts/logrun
+Index: metview-4.6.5/scripts/logrun
===================================================================
---- metview-4.6.1.orig/scripts/logrun
-+++ metview-4.6.1/scripts/logrun
+--- metview-4.6.5.orig/scripts/logrun
++++ metview-4.6.5/scripts/logrun
@@ -31,12 +31,14 @@ else
# -- create log file --
echo "[logrun info] process $$ starting `date` with cmd:" > $MYLOG
diff --git a/debian/patches/fix-paths.patch b/debian/patches/fix-paths.patch
deleted file mode 100644
index ee4336b..0000000
--- a/debian/patches/fix-paths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix patch of ksh on Debian systems.
-Forwarded: no
-Last-Updated: 2014-02-23
-
-Index: metview-4.4.7+dfsg.1/scripts/mv_flextra_prep
-===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/mv_flextra_prep
-+++ metview-4.4.7+dfsg.1/scripts/mv_flextra_prep
-@@ -1,4 +1,4 @@
--#!/usr/bin/ksh
-+#!/bin/ksh
-
- # **************************** LICENSE START ***********************************
- #
diff --git a/debian/patches/fix-scripts.patch b/debian/patches/fix-scripts.patch
index 5bae458..516ef2a 100644
--- a/debian/patches/fix-scripts.patch
+++ b/debian/patches/fix-scripts.patch
@@ -4,57 +4,57 @@ Description: Ensure all scripts have a correct start line
Forwarded: not-needed
Last-Updated: 2016-01-11
-Index: metview-4.6.1/scripts/document_macros.pl
+Index: metview-4.6.5/scripts/document_macros.pl
===================================================================
---- metview-4.6.1.orig/scripts/document_macros.pl
-+++ metview-4.6.1/scripts/document_macros.pl
+--- metview-4.6.5.orig/scripts/document_macros.pl
++++ metview-4.6.5/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-4.6.1/scripts/metview_help
+Index: metview-4.6.5/scripts/metview_help
===================================================================
---- metview-4.6.1.orig/scripts/metview_help
-+++ metview-4.6.1/scripts/metview_help
+--- metview-4.6.5.orig/scripts/metview_help
++++ metview-4.6.5/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-4.6.1/scripts/mv_flextra_prep.mv
+Index: metview-4.6.5/scripts/mv_flextra_prep.mv
===================================================================
---- metview-4.6.1.orig/scripts/mv_flextra_prep.mv
-+++ metview-4.6.1/scripts/mv_flextra_prep.mv
+--- metview-4.6.5.orig/scripts/mv_flextra_prep.mv
++++ metview-4.6.5/scripts/mv_flextra_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
-Index: metview-4.6.1/scripts/mv_mars_catalog.py
+Index: metview-4.6.5/scripts/mv_mars_catalog.py
===================================================================
---- metview-4.6.1.orig/scripts/mv_mars_catalog.py
-+++ metview-4.6.1/scripts/mv_mars_catalog.py
+--- metview-4.6.5.orig/scripts/mv_mars_catalog.py
++++ metview-4.6.5/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-4.6.1/scripts/mv_scm_vis.mv
+Index: metview-4.6.5/scripts/mv_scm_vis.mv
===================================================================
---- metview-4.6.1.orig/scripts/mv_scm_vis.mv
-+++ metview-4.6.1/scripts/mv_scm_vis.mv
+--- metview-4.6.5.orig/scripts/mv_scm_vis.mv
++++ metview-4.6.5/scripts/mv_scm_vis.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
-Index: metview-4.6.1/scripts/mv_vapor_prep.mv
+Index: metview-4.6.5/scripts/mv_vapor_prep.mv
===================================================================
---- metview-4.6.1.orig/scripts/mv_vapor_prep.mv
-+++ metview-4.6.1/scripts/mv_vapor_prep.mv
+--- metview-4.6.5.orig/scripts/mv_vapor_prep.mv
++++ metview-4.6.5/scripts/mv_vapor_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/magml
# Metview Macro
@@ -67,10 +67,10 @@ Index: metview-4.6.1/scripts/mv_vapor_prep.mv
-end listToString
\ No newline at end of file
+end listToString
-Index: metview-4.6.1/scripts/metview_base.in
+Index: metview-4.6.5/scripts/metview_base.in
===================================================================
---- metview-4.6.1.orig/scripts/metview_base.in
-+++ metview-4.6.1/scripts/metview_base.in
+--- metview-4.6.5.orig/scripts/metview_base.in
++++ metview-4.6.5/scripts/metview_base.in
@@ -17,13 +17,14 @@ set -ea
# THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
#
diff --git a/debian/patches/fpic.patch b/debian/patches/fpic.patch
index 9ae8cef..fadc376 100644
--- a/debian/patches/fpic.patch
+++ b/debian/patches/fpic.patch
@@ -5,11 +5,11 @@ Description: Add FPIC support
Last-Updated: 2015-11-09
Forwarded: no
-Index: metview-4.6.1/CMakeLists.txt
+Index: metview-4.6.5/CMakeLists.txt
===================================================================
---- metview-4.6.1.orig/CMakeLists.txt
-+++ metview-4.6.1/CMakeLists.txt
-@@ -662,6 +662,9 @@ endif()
+--- metview-4.6.5.orig/CMakeLists.txt
++++ metview-4.6.5/CMakeLists.txt
+@@ -669,6 +669,9 @@ endif()
# -------------------------
# compiler-specific options
# -------------------------
diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch
index e95323b..48ad25a 100644
--- a/debian/patches/g++-6.patch
+++ b/debian/patches/g++-6.patch
@@ -3,10 +3,10 @@ Description: Fixes for G++-6
Last-Updated: 2016-02-14
Forwarded: no
-Index: metview-4.6.1/src/libMarsClient/rpcmars.x
+Index: metview-4.6.5/src/libMarsClient/rpcmars.x
===================================================================
---- metview-4.6.1.orig/src/libMarsClient/rpcmars.x
-+++ metview-4.6.1/src/libMarsClient/rpcmars.x
+--- metview-4.6.5.orig/src/libMarsClient/rpcmars.x
++++ metview-4.6.5/src/libMarsClient/rpcmars.x
@@ -2,7 +2,7 @@
%#include <rpc/xdr.h>
#ifdef RPC_HDR
@@ -25,10 +25,10 @@ Index: metview-4.6.1/src/libMarsClient/rpcmars.x
long order;
#endif
-Index: metview-4.6.1/src/libUtil/MvFlextra.cc
+Index: metview-4.6.5/src/libUtil/MvFlextra.cc
===================================================================
---- metview-4.6.1.orig/src/libUtil/MvFlextra.cc
-+++ metview-4.6.1/src/libUtil/MvFlextra.cc
+--- metview-4.6.5.orig/src/libUtil/MvFlextra.cc
++++ metview-4.6.5/src/libUtil/MvFlextra.cc
@@ -11,6 +11,7 @@
#include "MvDate.h"
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index ea30f9a..9b391df 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -3,10 +3,10 @@ Description: Fix for FTBFS on Hurd
Last-Updated: 2016-01-02
Forwarded: no
-Index: metview-4.6.1/src/libMarsClient/mars.h
+Index: metview-4.6.5/src/libMarsClient/mars.h
===================================================================
---- metview-4.6.1.orig/src/libMarsClient/mars.h
-+++ metview-4.6.1/src/libMarsClient/mars.h
+--- metview-4.6.5.orig/src/libMarsClient/mars.h
++++ metview-4.6.5/src/libMarsClient/mars.h
@@ -694,6 +694,12 @@ typedef void* msockopt;
#endif
diff --git a/debian/patches/mv_compress.patch b/debian/patches/mv_compress.patch
index 0a702ab..7774b6b 100644
--- a/debian/patches/mv_compress.patch
+++ b/debian/patches/mv_compress.patch
@@ -1,7 +1,7 @@
-Index: metview-4.6.1/scripts/mv_compress
+Index: metview-4.6.5/scripts/mv_compress
===================================================================
---- metview-4.6.1.orig/scripts/mv_compress
-+++ metview-4.6.1/scripts/mv_compress
+--- metview-4.6.5.orig/scripts/mv_compress
++++ metview-4.6.5/scripts/mv_compress
@@ -25,7 +25,7 @@ text_ERR="ERROR: script `basename $0` FA
#The original version of this function was taken from:
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 747470f..0f69874 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -3,17 +3,17 @@ Description: Hard-code dates to make the build bit-reproducible
Last-Updated: 2016-01-05
Forwarded: not-needed
-Index: metview-4.6.1/share/metview/app-defaults/MvVersionDetails.in
+Index: metview-4.6.5/share/metview/app-defaults/MvVersionDetails.in
===================================================================
---- metview-4.6.1.orig/share/metview/app-defaults/MvVersionDetails.in
-+++ metview-4.6.1/share/metview/app-defaults/MvVersionDetails.in
+--- metview-4.6.5.orig/share/metview/app-defaults/MvVersionDetails.in
++++ metview-4.6.5/share/metview/app-defaults/MvVersionDetails.in
@@ -1 +1 @@
-1 Metview @metview_MAJOR_VERSION_STR@ @metview_MINOR_VERSION_STR@ @metview_REVISION_VERSION_STR@ @THIS_YEAR@ 1990- at THIS_YEAR@ @THIS_VERBOSE_DATE@
+1 Metview @metview_MAJOR_VERSION_STR@ @metview_MINOR_VERSION_STR@ @metview_REVISION_VERSION_STR@ 2015 1990-2015 21-October-2015
-Index: metview-4.6.1/scripts/metview_base.in
+Index: metview-4.6.5/scripts/metview_base.in
===================================================================
---- metview-4.6.1.orig/scripts/metview_base.in
-+++ metview-4.6.1/scripts/metview_base.in
+--- metview-4.6.5.orig/scripts/metview_base.in
++++ metview-4.6.5/scripts/metview_base.in
@@ -14,8 +14,6 @@
#
set -ea
diff --git a/debian/patches/series b/debian/patches/series
index 97f587a..306daa9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix-paths.patch
fix-scripts.patch
cmake-fixes.patch
mv_compress.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list