[metview] 11/13: Fix timestamp'd gzip issue

[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 47e83a73839f4f0c32ee20c51f0a27a62afd597a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 10 14:16:42 2016 +0000

    Fix timestamp'd gzip issue
---
 debian/patches/cmake-fixes.patch | 18 ++++++++++++++++++
 debian/rules                     |  8 ++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index 1581d25..2927117 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -15,6 +15,24 @@ Index: metview-4.6.1/share/metview/etc/CMakeLists.txt
 ===================================================================
 --- metview-4.6.1.orig/share/metview/etc/CMakeLists.txt
 +++ metview-4.6.1/share/metview/etc/CMakeLists.txt
+@@ -148,7 +148,7 @@ set(extra_install_files macro_built_in_f
+ 
+ ADD_CUSTOM_COMMAND(
+     OUTPUT  ${CMAKE_BINARY_DIR}/share/metview/etc/macro_built_in_functions.txt
+-    COMMAND ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_list_of_macro_functions.mv ${CMAKE_BINARY_DIR}/share/metview/etc/macro_built_in_functions.txt
++    COMMAND ksh ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_list_of_macro_functions.mv ${CMAKE_BINARY_DIR}/share/metview/etc/macro_built_in_functions.txt
+     DEPENDS ${FULL_STARTUP_SCRIPT_PATH} ${metview_core_targets}
+ )
+ 
+@@ -158,7 +158,7 @@ set (dict_file "${CMAKE_BINARY_DIR}/shar
+ 
+ ADD_CUSTOM_COMMAND(
+     OUTPUT  ${dict_file}
+-    COMMAND ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_dictionary.mv ${dict_file}
++    COMMAND ksh ${FULL_STARTUP_SCRIPT_PATH} -b ${CMAKE_CURRENT_SOURCE_DIR}/../../../scripts/generate_dictionary.mv ${dict_file}
+     DEPENDS ${FULL_STARTUP_SCRIPT_PATH} ${metview_core_targets}
+ )
+ 
 @@ -171,7 +171,7 @@ ADD_CUSTOM_COMMAND(
  
  ADD_CUSTOM_COMMAND(
diff --git a/debian/rules b/debian/rules
index 24a2b71..96a5076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ override_dh_auto_clean:
 	dh_clean
 	rm -rf $(METVIEW_DIR_DEV)
 	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
+	[ ! -f scripts/metview_base.in.bak ] || \
+		( mv scripts/metview_base.in.bak scripts/metview_base.in )
 
 # magics++ upstream ships with a copy of terralib, which is not used in Debian. 
 # Instead we use # a shared terralib library, and so need to include terralib.
@@ -46,6 +48,7 @@ override_dh_auto_clean:
 override_dh_auto_configure:
 	chmod +x ./scripts/*.mv
 	# Hack. how to do this via ecbuild?
+	cp scripts/metview_base.in scripts/metview_base.in.bak
 	sed -e 's%@DEB_HOST_MULTIARCH@%${DEB_HOST_MULTIARCH}%g' < scripts/metview_base.in \
 		> scripts/tmpx && mv scripts/tmpx scripts/metview_base.in
 	dh_auto_configure -- \
@@ -88,3 +91,8 @@ override_dh_fixperms:
 	[ ! -d debian/metview-data/usr/share/metview ] || (  \
 		chmod -R -x debian/metview-data/usr/share/metview/* ; \
 		find debian/metview-data/usr/share/metview -type d -exec chmod 755 {} \;  )
+	# Hack. Why weren't these already compressed -n ?
+	gunzip debian/metview-data/usr/share/metview/app-defaults/Sample_Drawers.tar.gz
+	gunzip debian/metview-data/usr/share/metview/app-defaults/User_Dir_Frame.tar.gz
+	gzip -n debian/metview-data/usr/share/metview/app-defaults/Sample_Drawers.tar.gz
+	gzip -n debian/metview-data/usr/share/metview/app-defaults/User_Dir_Frame.tar.gz

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