[metview] 06/13: New upstream release.

[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 f445d23b5d012484bf5bd0c3ea5322f0b62154b7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jan 4 17:36:48 2016 +0000

    New upstream release.
---
 debian/changelog                        |  6 ++++++
 debian/patches/fpic.patch               |  8 ++++----
 debian/patches/hurd.patch               |  8 ++++----
 debian/patches/mv_compress.patch        |  6 +++---
 debian/patches/reproducible-build.patch | 16 ++++++++--------
 5 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fce93f2..ccd6750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+metview (4.6.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 04 Jan 2016 17:36:31 +0000
+
 metview (4.5.7-3) unstable; urgency=medium
 
   * Next in the round of exciting metview reproducibility fixes. 
diff --git a/debian/patches/fpic.patch b/debian/patches/fpic.patch
index b3d6df1..cc40da4 100644
--- a/debian/patches/fpic.patch
+++ b/debian/patches/fpic.patch
@@ -3,11 +3,11 @@ Description: Add FPIC support
 Last-Updated: 2015-11-09
 Forwarded: no
 
-Index: metview-4.5.7/CMakeLists.txt
+Index: metview-4.6.1/CMakeLists.txt
 ===================================================================
---- metview-4.5.7.orig/CMakeLists.txt
-+++ metview-4.5.7/CMakeLists.txt
-@@ -768,6 +768,9 @@ endif()
+--- metview-4.6.1.orig/CMakeLists.txt
++++ metview-4.6.1/CMakeLists.txt
+@@ -662,6 +662,9 @@ endif()
  # -------------------------
  # compiler-specific options
  # -------------------------
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index 313c680..ea30f9a 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -3,11 +3,11 @@ Description: Fix for FTBFS on Hurd
 Last-Updated: 2016-01-02
 Forwarded: no
 
-Index: metview-4.5.7/src/libMarsClient/mars.h
+Index: metview-4.6.1/src/libMarsClient/mars.h
 ===================================================================
---- metview-4.5.7.orig/src/libMarsClient/mars.h
-+++ metview-4.5.7/src/libMarsClient/mars.h
-@@ -692,6 +692,12 @@ typedef void* msockopt;
+--- metview-4.6.1.orig/src/libMarsClient/mars.h
++++ metview-4.6.1/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 643acee..0a702ab 100644
--- a/debian/patches/mv_compress.patch
+++ b/debian/patches/mv_compress.patch
@@ -1,7 +1,7 @@
-Index: metview-4.5.7/scripts/mv_compress
+Index: metview-4.6.1/scripts/mv_compress
 ===================================================================
---- metview-4.5.7.orig/scripts/mv_compress
-+++ metview-4.5.7/scripts/mv_compress
+--- metview-4.6.1.orig/scripts/mv_compress
++++ metview-4.6.1/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 769da7f..aff92d2 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -1,19 +1,19 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Hard-code dates to make the build reproducible
-Last-Updated: 2015-11-02
+Last-Updated: 2016-01-05
 Forwarded: not-needed
 
-Index: metview-4.5.7/share/metview/app-defaults/MvVersionDetails.in
+Index: metview-4.6.1/share/metview/app-defaults/MvVersionDetails.in
 ===================================================================
---- metview-4.5.7.orig/share/metview/app-defaults/MvVersionDetails.in
-+++ metview-4.5.7/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
 @@ -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.5.7/scripts/metview_base.in
+Index: metview-4.6.1/scripts/metview_base.in
 ===================================================================
---- metview-4.5.7.orig/scripts/metview_base.in
-+++ metview-4.5.7/scripts/metview_base.in
+--- metview-4.6.1.orig/scripts/metview_base.in
++++ metview-4.6.1/scripts/metview_base.in
 @@ -1,4 +1,4 @@
 -#!/bin/ksh
 +
@@ -43,6 +43,6 @@ Index: metview-4.5.7/scripts/metview_base.in
  METVIEW_RELEASE=@METVIEW_VERSION_STR@
 -METVIEW_VERSION_TITLE="Metview @METVIEW_VERSION_STR@ @EXTRA_TITLE@ (@TODAYS_DATE@)"
 +METVIEW_VERSION_TITLE="Metview @METVIEW_VERSION_STR@ @EXTRA_TITLE@"
- LD_LIBRARY_PATH="@METVIEW_LD_PATHS@:${LD_LIBRARY_PATH}"
  METVIEW_GUI_BUILT=@METVIEW_GUI_BUILT@
  @MV_FLEXTRA_PATH_SET@
+ MV_WEATHER_ROOM_BUILT=@MV_WEATHER_ROOM_BUILT@

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