[metview] 12/13: Prep for upload

[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 2ec9d83852d48cab0b0613b4ca90a1590c4eb256
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Jan 10 14:46:04 2016 +0000

    Prep for upload
---
 debian/changelog                 |  6 ++++--
 debian/control                   |  6 +++---
 debian/patches/cmake-fixes.patch | 21 +++++++++++++++++++++
 debian/rules                     |  4 ++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ff2dad2..3dec2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-metview (4.6.1-1) UNRELEASED; urgency=medium
+metview (4.6.1-1) unstable; urgency=medium
 
   * New upstream release.
     * qt5.patch now merged upstream.
   * B-D on magics >= 2.26.2-1
+  * metview explicitly depends on ksh. Closes: #808815.
+  * Fix path in metview script. Closes: #808816.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Mon, 04 Jan 2016 17:36:31 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 11 Jan 2016 07:36:31 +0000
 
 metview (4.5.7-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 564de99..4cc842b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,16 @@ Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: debhelper (>= 9), 
-  flex, bison, libhdf5-dev, libpango1.0-dev, chrpath,
+  flex, bison, libhdf5-dev, libpango1.0-dev, chrpath, ksh,
   libqt5webkit5-dev, qtbase5-dev, libqt5xmlpatterns5-dev,
   libgrib-api-dev, libgrib-api-tools,
   libemos-dev (>= 2:4.1.1-2), libboost-dev,
-  libmagics++-metview-dev, libmagics++-dev (>= 2.26.2-1),
+  libmagics++-metview-dev, libmagics++-dev (>= 2.26.2),
   libmotif-dev, libxmu-dev, libgdbm-dev, libcurl4-gnutls-dev,
   libcairo2-dev, pkg-config, swig, libexpat1-dev,
   libterralib-dev, ksh, libproj-dev,
   libgd-dev, imagemagick, libnetcdf-dev, libnetcdf-cxx-legacy-dev,
-  libopenjpeg-dev, cmake, flextra, gfortran
+  libopenjpeg-dev, cmake, flextra, gfortran, libgeotiff-dev
 Build-Conflicts: lesstif2-dev
 Standards-Version: 3.9.6
 Homepage: https://software.ecmwf.int/wiki/display/METV/Metview
diff --git a/debian/patches/cmake-fixes.patch b/debian/patches/cmake-fixes.patch
index 2927117..db2ec9e 100644
--- a/debian/patches/cmake-fixes.patch
+++ b/debian/patches/cmake-fixes.patch
@@ -42,3 +42,24 @@ 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
+===================================================================
+--- metview-4.6.1.orig/scripts/metview_base.in
++++ metview-4.6.1/scripts/metview_base.in
+@@ -17,14 +17,14 @@ set -ea
+ # THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
+ #
+ WMO_SITE_NR=@SITE_WMO_CODE@
+-METVIEW_BIN=/usr/lib/@DEB_HOST_MULTIARCH@/metview
++METVIEW_DIR_DEV=${METVIEW_DIR_DEV:-/usr}
++METVIEW_BIN=${METVIEW_BIN:-/usr/lib/@DEB_HOST_MULTIARCH@/metview}
+ ##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@
+ MARS_HOME=@MARS_HOME@
+-METVIEW_DIR_DEV=/usr
+ METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
+ METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
+ MV_ENVIRON=@MV_ENVIRON@
diff --git a/debian/rules b/debian/rules
index 96a5076..90327b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -94,5 +94,5 @@ override_dh_fixperms:
 	# 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
+	gzip -n debian/metview-data/usr/share/metview/app-defaults/Sample_Drawers.tar
+	gzip -n debian/metview-data/usr/share/metview/app-defaults/User_Dir_Frame.tar

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