[metview] 07/13: * qt5.patch now merged upstream. * B-D on magics >= 2.26.2-1 * Enable parallel builds
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Feb 11 19:24:29 UTC 2016
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 05dbff402043f3bc9d07f020c1a21f55542b007f
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sun Jan 10 09:28:18 2016 +0000
* qt5.patch now merged upstream.
* B-D on magics >= 2.26.2-1
* Enable parallel builds
---
debian/changelog | 3 ++
debian/control | 2 +-
debian/patches/fix-scripts.patch | 58 ++++++++++++++++++++++-----------
debian/patches/reproducible-build.patch | 18 ++--------
debian/rules | 6 ++--
5 files changed, 49 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ccd6750..61d65b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
metview (4.6.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * qt5.patch now merged upstream.
+ * B-D on magics >= 2.26.2-1
+ * Enable parallel builds
-- Alastair McKinstry <mckinstry at debian.org> Mon, 04 Jan 2016 17:36:31 +0000
diff --git a/debian/control b/debian/control
index d889eea..564de99 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
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.24.7-7),
+ libmagics++-metview-dev, libmagics++-dev (>= 2.26.2-1),
libmotif-dev, libxmu-dev, libgdbm-dev, libcurl4-gnutls-dev,
libcairo2-dev, pkg-config, swig, libexpat1-dev,
libterralib-dev, ksh, libproj-dev,
diff --git a/debian/patches/fix-scripts.patch b/debian/patches/fix-scripts.patch
index 8d1bfbb..f53581d 100644
--- a/debian/patches/fix-scripts.patch
+++ b/debian/patches/fix-scripts.patch
@@ -3,66 +3,86 @@ Description: Ensure all scripts have a correct start line
Forwarded: not-needed
Last-Updated: 2014-06-21
-Index: metview-4.4.7+dfsg.1/scripts/document_macros.pl
+Index: metview-4.6.1/scripts/document_macros.pl
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/document_macros.pl
-+++ metview-4.4.7+dfsg.1/scripts/document_macros.pl
+--- metview-4.6.1.orig/scripts/document_macros.pl
++++ metview-4.6.1/scripts/document_macros.pl
@@ -1,4 +1,4 @@
-
+#!/usr/bin/perl
# **************************** LICENSE START ***********************************
#
# Copyright 2012 ECMWF and INPE. This software is distributed under the terms
-Index: metview-4.4.7+dfsg.1/scripts/metview_help
+Index: metview-4.6.1/scripts/metview_help
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/metview_help
-+++ metview-4.4.7+dfsg.1/scripts/metview_help
+--- metview-4.6.1.orig/scripts/metview_help
++++ metview-4.6.1/scripts/metview_help
@@ -1,4 +1,4 @@
-
+#!/bin/sh
# **************************** LICENSE START ***********************************
#
# Copyright 2014 ECMWF and INPE. This software is distributed under the terms
-Index: metview-4.4.7+dfsg.1/scripts/mv_flextra_prep.mv
+Index: metview-4.6.1/scripts/mv_flextra_prep.mv
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/mv_flextra_prep.mv
-+++ metview-4.4.7+dfsg.1/scripts/mv_flextra_prep.mv
+--- metview-4.6.1.orig/scripts/mv_flextra_prep.mv
++++ metview-4.6.1/scripts/mv_flextra_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
-Index: metview-4.4.7+dfsg.1/scripts/mv_mars_catalog.py
+Index: metview-4.6.1/scripts/mv_mars_catalog.py
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/mv_mars_catalog.py
-+++ metview-4.4.7+dfsg.1/scripts/mv_mars_catalog.py
+--- metview-4.6.1.orig/scripts/mv_mars_catalog.py
++++ metview-4.6.1/scripts/mv_mars_catalog.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# Copyright 2012 ECMWF and INPE. This software is distributed under the terms
# of the Apache License version 2.0. In applying this license, ECMWF does not
# waive the privileges and immunities granted to it by virtue of its status as
-Index: metview-4.4.7+dfsg.1/scripts/mv_scm_vis.mv
+Index: metview-4.6.1/scripts/mv_scm_vis.mv
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/mv_scm_vis.mv
-+++ metview-4.4.7+dfsg.1/scripts/mv_scm_vis.mv
+--- metview-4.6.1.orig/scripts/mv_scm_vis.mv
++++ metview-4.6.1/scripts/mv_scm_vis.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
-Index: metview-4.4.7+dfsg.1/scripts/mv_vapor_prep.mv
+Index: metview-4.6.1/scripts/mv_vapor_prep.mv
===================================================================
---- metview-4.4.7+dfsg.1.orig/scripts/mv_vapor_prep.mv
-+++ metview-4.4.7+dfsg.1/scripts/mv_vapor_prep.mv
+--- metview-4.6.1.orig/scripts/mv_vapor_prep.mv
++++ metview-4.6.1/scripts/mv_vapor_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/magml
# Metview Macro
# **************************** LICENSE START ***********************************
-@@ -930,4 +931,4 @@ function listToString(lst)
+@@ -947,4 +948,4 @@ function listToString(lst)
return s
-end listToString
\ No newline at end of file
+end listToString
+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,13 +17,14 @@ set -ea
+ # THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
+ #
+ WMO_SITE_NR=@SITE_WMO_CODE@
++METVIEW_BIN=@MULTIARCH_LIB_DIR@
+ ##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=@CMAKE_BINARY_DIR@
++METVIEW_DIR_DEV=/usr
+ METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
+ METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
+ MV_ENVIRON=@MV_ENVIRON@
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index aff92d2..6e86d3f 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -14,12 +14,6 @@ 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
-@@ -1,4 +1,4 @@
--#!/bin/ksh
-+
-
- # **************************** LICENSE START ***********************************
- #
@@ -14,8 +14,6 @@
#
set -ea
@@ -27,17 +21,9 @@ Index: metview-4.6.1/scripts/metview_base.in
-# THIS FILE IS GENERATED BY cmake on @TODAYS_DATE@
-#
WMO_SITE_NR=@SITE_WMO_CODE@
+ METVIEW_BIN=@DEB_HOST_MULTIARCH@
##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@
+@@ -41,7 +39,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@
diff --git a/debian/rules b/debian/rules
index 5d64eaa..f2c7877 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ endif
# magic debhelper rule
%:
- dh $@ --buildsystem=cmake --builddirectory=$(METVIEW_DIR_DEV)
+ dh $@ --parallel --buildsystem=cmake --builddirectory=$(METVIEW_DIR_DEV)
override_dh_auto_clean:
dh_clean
@@ -47,9 +47,11 @@ override_dh_auto_configure:
chmod +x ./scripts/*.mv
dh_auto_configure -- \
-DMETVIEW_SITE=debian \
- -DCMAKE_BUILD_TYPE=Debug \
+ -DCMAKE_BUILD_TYPE=Release \
-DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64' \
-DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+ -DMAGICS_HAVE_METVIEW=True \
+ -DMAGICS_HAVE_NETCDF=True \
-DMAGICS_PATH=/usr \
-DBUILD_SHARED_LIBS=On \
-DENABLE_RPATHS=Off \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git
More information about the debian-science-commits
mailing list