[metview] 77/97: * Depend on g++ >= 4:4.5.0 for transition. Closes: #778004. * Depend on magics upgrade for new release. Closes: #793176. * Update homepage URL. Closes: #769180.

[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 f17c2e4f5d5e78308620379ad7f9518325e11bcd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 22 20:05:37 2015 +0100

    * Depend on g++ >= 4:4.5.0 for transition. Closes: #778004.
    * Depend on magics upgrade for new release. Closes: #793176.
    * Update homepage URL. Closes: #769180.
---
 debian/changelog                 |  7 +++++--
 debian/control                   |  7 ++++---
 debian/metview.install           |  2 +-
 debian/patches/mv_compress.patch | 13 +++++++++++++
 debian/patches/series            |  5 +----
 debian/rules                     | 10 +++++-----
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 18eb57a..575a7ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,17 @@
-metview (4.5.3-1) UNRELEASED; urgency=medium
+metview (4.5.3-1) unstable; urgency=medium
 
   * New upstream release.
   * Move to cmake-based build
+  * Depend on g++ >= 4:4.5.0 for transition. Closes: #778004.
+  * Depend on magics upgrade for new release. Closes: #793176.
+  * Update homepage URL. Closes: #769180.
   * fix-colors.patch: Fixed upstream.
   * syserrlist.patch temporarily disabled
   * no-m32 patch temporarily disabled.
   * Need to build-depend on libgrib-api-tools
   * Now B-D on openjpeg-dev. 
 
- -- Alastair McKinstry <mckinstry at debian.org>  Sat, 02 May 2015 13:34:23 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Wed, 22 Jul 2015 19:39:15 +0100
 
 metview (4.4.8+dfsg.1-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8746455..d55700c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,12 @@ Source: metview
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 9), gfortran,
+Build-Depends: debhelper (>= 9), 
+  gfortran (>= 4:4.5.0), g++ (>= 4:4.5.0 ),
   qt4-dev-tools, libqt4-dev, libqtwebkit-dev,
   libgrib-api-dev, libgrib-api-tools,
   libemos-dev, libboost1.55-dev,
-  libmagics++-metview-dev, libmagics++-dev (>= 2.22.7.dfsg.1-3),
+  libmagics++-metview-dev, libmagics++-dev (>= 2.24.7-2)
   libmotif-dev, libxmu-dev, libgdbm-dev, libcurl4-gnutls-dev,
   libcairo2-dev, pkg-config, swig, libexpat1-dev,
   libterralib-dev, ksh, libproj-dev,
@@ -14,7 +15,7 @@ Build-Depends: debhelper (>= 9), gfortran,
   scm [!arm64 !ppc64], cmake
 Build-Conflicts: lesstif2-dev
 Standards-Version: 3.9.6
-Homepage: https://software.ecmwf.int/wiki/display/METV/Home
+Homepage: https://software.ecmwf.int/wiki/display/METV/Metview
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/metview.git
 
 Package: metview
diff --git a/debian/metview.install b/debian/metview.install
index c16330c..749333c 100644
--- a/debian/metview.install
+++ b/debian/metview.install
@@ -1,3 +1,3 @@
 usr/bin/metview
-usr/bin/Metview/*	/usr/lib/metview
+usr/bin/metview_bin/*	/usr/lib/metview
 usr/share/applications/metview.desktop
diff --git a/debian/patches/mv_compress.patch b/debian/patches/mv_compress.patch
new file mode 100644
index 0000000..d7146f5
--- /dev/null
+++ b/debian/patches/mv_compress.patch
@@ -0,0 +1,13 @@
+Index: metview-4.5.6/scripts/mv_compress
+===================================================================
+--- metview-4.5.6.orig/scripts/mv_compress
++++ metview-4.5.6/scripts/mv_compress
+@@ -25,7 +25,7 @@ text_ERR="ERROR: script `basename $0` FA
+ 
+ #The original version of this function was taken from: 
+ #http://stackoverflow.com/questions/12340846/bash-shell-script-to-find-the-closest-parent-directory-of-several-files
+-function findCommonPath()
++findCommonPath()
+ {
+   	var1=$1
+   	var2=$2
diff --git a/debian/patches/series b/debian/patches/series
index d3de448..75dcc5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-# syserrlist.patch
 fix-paths.patch
 fix-scripts.patch
-# no-m32.patch
-# fix-colors.patch
-# socklen-fix.patch
 cmake-fixes.patch
+mv_compress.patch
diff --git a/debian/rules b/debian/rules
index 48a1478..4f7ded7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,7 @@ MV_COMP:=$(DESTDIR)/usr/bin/Metview/mv_compress
 
 override_dh_auto_clean:
 	dh_clean
+	rm -r obj-*
 	rm -f share/metview/icons/make.dep config/CONFIG.site \
 		share/metview/app-defaults/MvVersionDetails  \
 		include/macro_api.h etc/ConfigDef
@@ -38,9 +39,11 @@ override_dh_auto_configure:
 	dh_auto_configure -- \
 		-DMETVIEW_SITE=debian  \
 		-DCMAKE_BUILD_TYPE=Debug \
-		-DMETVIEW_EXTRA_LIBRARIES='terralib m' \
+		-DMETVIEW_EXTRA_LIBRARIES='terralib' \
 		-DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
-		-DMARS_SOURCE_PATH=$(CURDIR)/src/libMars/MARS
+		-DMAGICS_PATH=/usr \
+		-DBUILD_SHARED_LIBS=On \
+		-DENABLE_RPATHS=Off
 
 override_dh_auto_test:
 	@echo "Checks disabled for the moment due to syntax errors in tests" 
@@ -49,9 +52,6 @@ override_dh_auto_install:
 	dh_auto_install
 	mkdir -p debian/libmetview-dev/$(LIBDIR)
 	cp debian/tmp/usr/lib*/*.a debian/libmetview-dev/$(LIBDIR)
-	sed -e 's%function findCommonPath()%findCommonpath()%'  \
-		< $(MV_COMP) >  $(MV_COMP).tmp
-	mv $(MV_COMP).tmp  $(MV_COMP)
 
 override_dh_fixperms:
 	dh_fixperms

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