[metview] 01/03: Next in the round of exciting metview reproducibility fixes.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository metview.

commit cf1f9f5239ab7cc8dbf4dbb698c8e463d6f6b2db
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Nov 1 10:36:09 2015 +0000

    Next in the round of exciting metview reproducibility fixes.
---
 debian/changelog                        |  6 ++++++
 debian/patches/reproducible-build.patch | 38 ++++++++++++++++++++++++++++++++-
 debian/rules                            |  8 ++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6c5cfd..2ab2033 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+metview (4.5.7-3) unstable; urgency=medium
+
+  * Next in the round of exciting metview reproducibility fixes.
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Sun, 01 Nov 2015 10:30:45 +0000
+
 metview (4.5.7-2) unstable; urgency=medium
 
   * Set DISABLE_OS_CHECK=On (new feature) for Hurd, kFreeBSD builds.
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index b13abca..769da7f 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -1,6 +1,6 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Hard-code dates to make the build reproducible
-Last-Updated: 2015-10-21
+Last-Updated: 2015-11-02
 Forwarded: not-needed
 
 Index: metview-4.5.7/share/metview/app-defaults/MvVersionDetails.in
@@ -10,3 +10,39 @@ Index: metview-4.5.7/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
+===================================================================
+--- metview-4.5.7.orig/scripts/metview_base.in
++++ metview-4.5.7/scripts/metview_base.in
+@@ -1,4 +1,4 @@
+-#!/bin/ksh
++
+ 
+ # **************************** LICENSE START ***********************************
+ #
+@@ -14,8 +14,6 @@
+ #
+ set -ea
+ #
+-# THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
+-#
+ WMO_SITE_NR=@SITE_WMO_CODE@
+ ##QT_DIR_LIB=/usr/local/apps/qt/4.6.2-64/lib
+ PATH=@NETCDF_BIN@:@ODB_API_BIN_DIR@:${PATH}
+@@ -23,7 +21,6 @@ INSTALLDIR=@CMAKE_INSTALL_PREFIX@
+ METVIEW_SCRIPT=@METVIEW_SCRIPT@
+ MV_MARS_ACCESS=@MARS_ACCESS@
+ MARS_HOME=@MARS_HOME@
+-METVIEW_DIR_DEV=@CMAKE_BINARY_DIR@
+ METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
+ METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
+ MV_ENVIRON=@MV_ENVIRON@
+@@ -40,7 +37,7 @@ MV_ODB1_VERSION=@MV_ODB1_VERSION@
+ ##MV_ODB1_BIN=/usr/local/apps/odb/CY37R3.001/pgf90/LP64/bin
+ ##MV_ODB1_USE_SCRIPT=/usr/local/share/ecmwf/use/sh.odb
+ 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@
diff --git a/debian/rules b/debian/rules
index 6f0d9ae..92ee9e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,12 @@ MV_DIR:=/usr/lib/$(DEB_HOST_MULTIARCH)/metview
 export METVIEW_DIR_DEV:=$(CURDIR)/debian/build
 export METVIEW_BIN:=$(METVIEW_DIR_DEV)/bin
 
+FPIC:= ''
+
+ifeq ($(DEB_HOST_MULTIARCH), s390x)
+	FPIC:= -fpic
+endif
+
 # magic debhelper rule
 %:
 	dh $@ --buildsystem=cmake --builddirectory=$(METVIEW_DIR_DEV)
@@ -41,7 +47,7 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DMETVIEW_SITE=debian  \
 		-DCMAKE_BUILD_TYPE=Debug \
-		-DMETVIEW_EXTRA_LIBRARIES='terralib' \
+		-DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64' \
 		-DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
 		-DMAGICS_PATH=/usr \
 		-DBUILD_SHARED_LIBS=On \

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