[metview] 81/97: Fix CONFIG.site to make reproducible

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository metview.

commit e4ad3382e160a85b34f5d1939cfe53206e45530b
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jul 23 08:40:58 2015 +0100

    Fix CONFIG.site to make reproducible
---
 debian/CONFIG.site                   | 42 ++++++++++++++++++++++++++----------
 debian/patches/reproducibility.patch | 31 --------------------------
 debian/patches/series                |  1 -
 debian/rules                         |  9 ++++----
 4 files changed, 35 insertions(+), 48 deletions(-)

diff --git a/debian/CONFIG.site b/debian/CONFIG.site
index 9aa49c2..b0228a7 100644
--- a/debian/CONFIG.site
+++ b/debian/CONFIG.site
@@ -1,19 +1,39 @@
+#!/bin/ksh
 #
-# THIS FILE IS GENERATED BY configure Fri Jun 20 02:40:00 IST 2014
+# DO NOT EDIT! SCRIPT PRODUCED BY make IN DIR ./scripts!
+#
+set -ea
+#
+# THIS FILE IS GENERATED BY configure 
 #
 WMO_SITE_NR=255
+PATH=::${PATH}
 INSTALLDIR=/usr
-METVIEW_SCRIPT=/usr/bin/metview
-MV_MARS_ACCESS=MARS_none
+METVIEW_SCRIPT=metview
+MV_MARS_ACCESS=MARS_webapi
+METVIEW_BIN=/usr/lib/metview_bin
 MARS_HOME=
-METVIEW_BIN=/usr/lib/metview
+# Remove METVIEW_DIR_DEV on installation
+METVIEW_DIR_DEV=UNDEFINED
 METVIEW_TITLE_PROD="Production "
-METVIEW_TITLE_DEV="Development autotools "
+METVIEW_TITLE_DEV="Development "
 MV_ENVIRON=common
-OS=linux
-MAJOR_VERSION=3
+MV_USAGE_LOG=OFF
+MV_LOG_DIR=
+##OS=linux
+##MAJOR_VERSION=2
 SHELL=/bin/sh
-MAGPLUS_HOME=/usr
-GRIBAPI_DIR=/usr/share/grib_api
-METVIEW_EXTRA_GRIB_DEFINITION_PATH=/usr/share/grib_api/definitions
-MV_PYTHON_COMMAND=python
+#MAGPLUS_HOME=/usr
+GRIBAPI_DIR=
+##MV_PYTHON_COMMAND=/usr/local/bin/python
+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=4.5.6
+METVIEW_VERSION_TITLE="Metview 4.5.6  (Debian)"
+LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
+METVIEW_GUI_BUILT=true
+
+MV_WEATHER_ROOM_BUILT=false
+unset MAGPLUS_HOME
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
deleted file mode 100644
index 29be4c1..0000000
--- a/debian/patches/reproducibility.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Do not put build paths, timestamps in Debian packages
- It breaks bit-reproducibility,
- Also set METVIEW_BIN
-Last-Updated: 2015-07-22
-Forwarded: not-needed
-
-Index: metview-4.5.6/scripts/CONFIG.site.in
-===================================================================
---- metview-4.5.6.orig/scripts/CONFIG.site.in
-+++ metview-4.5.6/scripts/CONFIG.site.in
-@@ -4,16 +4,16 @@
- #
- set -ea
- #
--# THIS FILE IS GENERATED BY configure on @TODAYS_DATE@
-+# THIS FILE IS GENERATED BY configure 
- #
- 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}
- INSTALLDIR=@CMAKE_INSTALL_PREFIX@
- METVIEW_SCRIPT=@METVIEW_SCRIPT@
- MV_MARS_ACCESS=@MARS_ACCESS@
-+METVIEW_BIN=/usr/lib/metview_bin
- MARS_HOME=@MARS_HOME@
--METVIEW_DIR_DEV=@metview_BINARY_DIR@
-+METVIEW_DIR_DEV=UNDEFINED
- METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
- METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
- MV_ENVIRON=@MV_ENVIRON@
diff --git a/debian/patches/series b/debian/patches/series
index d1ec29b..75dcc5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-paths.patch
 fix-scripts.patch
 cmake-fixes.patch
-reproducibility.patch
 mv_compress.patch
diff --git a/debian/rules b/debian/rules
index f23070a..118177b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,8 @@ MV_COMP:=$(DESTDIR)/usr/bin/Metview/mv_compress
 override_dh_auto_clean:
 	dh_clean
 	rm -rf obj-*
-	rm -f share/metview/icons/make.dep config/CONFIG.site \
-		share/metview/app-defaults/MvVersionDetails  \
-		include/macro_api.h etc/ConfigDef
+	rm -f share/metview/icons/make.dep \
+		share/metview/app-defaults/MvVersionDetails  
 	find . -type l -delete
 	find . -name '*.db' -delete
 
@@ -33,8 +32,6 @@ override_dh_auto_clean:
 # Also -fPIC, for some reason.
 
 override_dh_auto_configure:
-	mkdir -p config
-	cp debian/CONFIG.site config/CONFIG.site
 	chmod +x ./scripts/*.mv
 	dh_auto_configure -- \
 		-DMETVIEW_SITE=debian  \
@@ -49,6 +46,8 @@ override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
 
 override_dh_auto_install:
+	# override CONFIG.site to make reproducible, set METVIEW_BIN_DIR
+	cp debian/CONFIG.site obj-*/scripts
 	dh_auto_install
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)

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