[metview] 76/97: Merge tag 'upstream/4.5.6' into debian/master
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Sep 1 09:18:56 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository metview.
commit 7937eb1cec6ba73ac32f2591b631fc540e9af8ff
Merge: 4f4cde6 bab4707
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jul 20 02:17:42 2015 +0100
Merge tag 'upstream/4.5.6' into debian/master
CMakeLists.txt | 40 +-
VERSION.cmake | 2 +-
cmake/VERSION.cmake | 4 +-
cmake/contrib/FindFFTW.cmake | 124 +
cmake/ecbuild_add_library.cmake | 7 -
cmake/ecbuild_add_option.cmake | 1 +
cmake/ecbuild_add_test.cmake | 53 +-
cmake/ecbuild_check_compiler.cmake | 16 +
cmake/ecbuild_declare_project.cmake | 38 +-
cmake/ecbuild_define_options.cmake | 2 +-
cmake/ecbuild_get_test_data.cmake | 160 +-
cmake/ecbuild_install_package.cmake | 2 +-
cmake/ecbuild_list_macros.cmake | 57 +-
cmake/ecbuild_system.cmake | 2 +-
cmake/ecbuild_use_package.cmake | 5 +-
cmake/project-config.cmake.in | 9 +
contrib/CMakeLists.txt | 17 +-
contrib/ExampleDataAccess/CMakeLists.txt | 41 +-
debian/changelog | 6 +
scripts/CMakeLists.txt | 50 +-
scripts/CONFIG.site.in | 2 +-
scripts/metview_base | 30 +-
scripts/metview_help | 2 +-
scripts/mv_scm_run | 5 +
.../Drawers/Data Access/.EcRegrid Mars Retrieval | 5 -
.../Drawers/Data Access/EcRegrid Mars Retrieval | 3 -
.../Drawers/Filters/.EcRegrid GRIB Filter | 5 -
.../Drawers/Filters/EcRegrid GRIB Filter | 2 -
share/metview/etc/CMakeLists.txt | 3 +-
share/metview/etc/ContRules | 2 +
share/metview/etc/MARS_webapi | 6 +-
share/metview/etc/MBOXPLOTDef | 205 ++
share/metview/etc/MBOXPLOTRules | 96 +
share/metview/etc/MCONTDef | 5 +
share/metview/etc/MCONTRules | 5 +-
share/metview/etc/MLEGENDDef | 6 +
share/metview/etc/MLEGENDRules | 3 +
share/metview/etc/MarsRules | 5 +-
share/metview/etc/ObjectList | 68 +-
share/metview/etc/PageFrameDef | 4 +-
share/metview/etc/PageFrameRules | 9 +
share/metview/etc/StationDef | 6 +
share/metview/etc/ecmwf.def | 34 +-
share/metview/etc/mars.chk | 5 +-
share/metview/etc/marsdb.webapi.cfg | 14 +
share/metview/etc/obsgroups.def | 2 +-
share/metview/etc/reportypes.def | 4 +
share/metview/etc/rt_by_obsgroup.chk | 8 +-
share/metview/etc/tigge.def | 27 +
share/metview/etc/uPlotTable | 102 +-
share/metview/icons/CMakeLists.txt | 2 +-
share/metview/icons/MBOXPLOT.xpm | 204 ++
share/metview/icons/MTHERMOGRID.xpm | 41 -
share/metview/icons_mv5/CMakeLists.txt | 2 +-
share/metview/icons_mv5/MBOXPLOT.svg | 528 ++++
share/metview/icons_mv5/MTHERMOGRID.xpm | 41 -
src/DebugTools/MvProcNode.cc | 2 +-
src/Desktop/MvQRequestPanelWidget.cc | 12 +-
src/Desktop/RequestPanel.cc | 14 +
src/Macro/compute.cc | 6 +-
src/Macro/value.cc | 25 +-
src/Reprojection/ReprojectService.cc | 175 +-
src/Stations/Station.cc | 176 +-
src/Stations/stat.fmt | 2925 ++++++++++----------
src/StdAppManager/InputVisualiserDef | 7 +
src/StdAppManager/InputVisualiserRules | 18 +
src/StdAppManager/NetcdfPlusDef | 6 +
src/StdAppManager/ObjectSpec.StdAppManager | 2 +-
src/XSection/Average.cc | 6 +-
src/XSection/Average.h | 2 +-
src/XSection/CrossS.cc | 51 +-
src/XSection/CrossS.h | 2 +-
src/XSection/MXSectionCommonDef | 6 +
src/XSection/MXSectionViewDef | 4 +-
src/XSection/MvXsectFrame.cc | 97 +-
src/XSection/MvXsectFrame.h | 24 +-
src/XSection/Vprofile.cc | 2 +-
src/XSection/Vprofile.h | 2 +-
src/XSection/Xsect.cc | 11 +-
src/XSection/Xsect.h | 4 +-
src/libMars/CMakeLists.txt | 6 +-
src/libMars/MARS/cachebase.c | 815 ------
src/libMars/MARS/cacheserver.c | 32 -
src/libMars/MARS/event.c | 1206 --------
src/libMars/MARS/llmatrix.c | 274 --
src/libMars/MARS/marssvc.c | 312 ---
src/libMars/MARS/odb-iain.cc | 294 --
src/libMars/MARS/webbase.c | 613 ----
src/libMars/MARS/xdropsvc.c | 60 -
src/libMars/account.c | 1 -
src/libMars/api.c | 1 -
src/libMars/api.h | 1 -
src/libMars/apibase.c | 1 -
src/libMars/archive.c | 1 -
src/libMars/authenticate.c | 1 -
src/libMars/base.c | 1 -
src/libMars/base.h | 1 -
src/libMars/bufr.c | 1 -
src/libMars/bufr.h | 1 -
src/libMars/calc.c | 1 -
src/libMars/check.c | 1 -
src/libMars/control.c | 1 -
src/libMars/control.h | 1 -
src/libMars/cos.c | 1 -
src/libMars/cos.h | 1 -
src/libMars/dhsbase.c | 1 -
src/libMars/ecaccess.c | 1 -
src/libMars/ecaccess.h | 1 -
src/libMars/environ.c | 1 -
src/libMars/expand.c | 1 -
src/libMars/externf.c | 1 -
src/libMars/field.c | 1 -
src/libMars/field.h | 1 -
src/libMars/filebase.c | 1 -
src/libMars/files.c | 1 -
src/libMars/flatfilebase.c | 1 -
src/libMars/free.c | 1 -
src/libMars/globals.h | 1 -
src/libMars/grib.c | 1 -
src/libMars/grib.h | 1 -
src/libMars/gribbase.c | 1 -
src/libMars/guess.c | 1 -
src/libMars/handler.c | 1 -
src/libMars/hash.c | 1 -
src/libMars/hidden.c | 1 -
src/libMars/hypercube.c | 1 -
src/libMars/hypercube.h | 1 -
src/libMars/ibmblk.c | 1 -
src/libMars/ibmblk.h | 1 -
src/libMars/index.c | 1 -
src/libMars/index.h | 1 -
src/libMars/json.c | 1 -
src/libMars/json.h | 1 -
src/libMars/lang.h | 1 -
src/libMars/langl.l | 1 -
src/libMars/langy.y | 1 -
src/libMars/list.c | 1 -
src/libMars/lock.c | 1 -
src/libMars/logfile.c | 1 -
src/libMars/macro_api.c | 3 +-
src/libMars/mars.h | 1 -
src/libMars/mcs.h | 1 -
src/libMars/memory.c | 1 -
src/libMars/metadata.c | 1 -
src/libMars/multibase.c | 1 -
src/libMars/netbase.c | 1 -
src/libMars/netbase.h | 1 -
src/libMars/nfdbbase.c | 1 -
src/libMars/nullbase.c | 1 -
src/libMars/odb.cc | 1 -
src/libMars/odb.h | 1 -
src/libMars/odbbase.c | 1 -
src/libMars/options.c | 1 -
src/libMars/pproc.c | 1 -
src/libMars/proto.h | 1 -
src/libMars/queue.c | 1 -
src/libMars/queue.h | 1 -
src/libMars/remove.c | 1 -
src/libMars/request.c | 1 -
src/libMars/restricted.c | 1 -
src/libMars/restricted.h | 1 -
src/libMars/retrieve.c | 1 -
src/libMars/rpcmars.x | 1 -
src/libMars/schedule.c | 1 -
src/libMars/server.c | 1 -
src/libMars/service.c | 1 -
src/libMars/sh2ll.c | 1 -
src/libMars/statistics.c | 1 -
src/libMars/stream.c | 1 -
src/libMars/target.c | 1 -
src/libMars/tcp.c | 1 -
src/libMars/time.c | 1 -
src/libMars/timer.c | 1 -
src/libMars/tools.c | 1 -
src/libMars/tools.h | 1 -
src/libMars/udp.c | 1 -
src/libMars/variable.c | 1 -
src/libMars/variable.h | 1 -
src/libMars/version.c | 1 -
src/libMars/wind.c | 1 -
src/libMars/xservice.c | 1 -
src/{libMars/MARS => libMarsClient}/account.c | 0
src/{libMars/MARS => libMarsClient}/api.c | 0
src/{libMars/MARS => libMarsClient}/api.h | 0
src/{libMars/MARS => libMarsClient}/apibase.c | 2 +-
src/{libMars/MARS => libMarsClient}/archive.c | 0
src/{libMars/MARS => libMarsClient}/authenticate.c | 0
src/{libMars/MARS => libMarsClient}/base.c | 0
src/{libMars/MARS => libMarsClient}/base.h | 0
src/{libMars/MARS => libMarsClient}/bufr.c | 0
src/{libMars/MARS => libMarsClient}/bufr.h | 0
src/{libMars/MARS => libMarsClient}/calc.c | 0
src/{libMars/MARS => libMarsClient}/check.c | 0
src/{libMars/MARS => libMarsClient}/control.c | 0
src/{libMars/MARS => libMarsClient}/control.h | 0
src/{libMars/MARS => libMarsClient}/cos.c | 0
src/{libMars/MARS => libMarsClient}/cos.h | 0
src/{libMars/MARS => libMarsClient}/dhsbase.c | 119 +-
src/{libMars/MARS => libMarsClient}/ecaccess.c | 0
src/{libMars/MARS => libMarsClient}/ecaccess.h | 0
src/{libMars/MARS => libMarsClient}/environ.c | 2 +-
src/{libMars/MARS => libMarsClient}/expand.c | 0
src/{libMars/MARS => libMarsClient}/externf.c | 0
src/{libMars/MARS => libMarsClient}/field.c | 16 +-
src/{libMars/MARS => libMarsClient}/field.h | 2 +-
src/{libMars/MARS => libMarsClient}/filebase.c | 0
src/{libMars/MARS => libMarsClient}/files.c | 0
src/{libMars/MARS => libMarsClient}/flatfilebase.c | 2 +-
src/{libMars/MARS => libMarsClient}/free.c | 0
src/{libMars/MARS => libMarsClient}/globals.h | 3 +
src/{libMars/MARS => libMarsClient}/grib.c | 0
src/{libMars/MARS => libMarsClient}/grib.h | 4 +-
src/{libMars/MARS => libMarsClient}/gribbase.c | 0
src/{libMars/MARS => libMarsClient}/guess.c | 0
src/{libMars/MARS => libMarsClient}/handler.c | 1 +
src/{libMars/MARS => libMarsClient}/hash.c | 0
src/{libMars/MARS => libMarsClient}/hidden.c | 0
src/{libMars/MARS => libMarsClient}/hypercube.c | 0
src/{libMars/MARS => libMarsClient}/hypercube.h | 0
src/{libMars/MARS => libMarsClient}/ibmblk.c | 0
src/{libMars/MARS => libMarsClient}/ibmblk.h | 0
src/{libMars/MARS => libMarsClient}/index.c | 2 +-
src/{libMars/MARS => libMarsClient}/index.h | 2 +-
src/{libMars/MARS => libMarsClient}/json.c | 0
src/{libMars/MARS => libMarsClient}/json.h | 0
src/{libMars/MARS => libMarsClient}/lang.h | 0
src/{libMars/MARS => libMarsClient}/langl.l | 0
src/{libMars/MARS => libMarsClient}/langy.y | 0
src/{libMars/MARS => libMarsClient}/list.c | 0
src/{libMars/MARS => libMarsClient}/lock.c | 0
src/{libMars/MARS => libMarsClient}/logfile.c | 12 +-
src/{libMars/MARS => libMarsClient}/mars.h | 76 +-
src/{libMars/MARS => libMarsClient}/mcs.h | 0
src/{libMars/MARS => libMarsClient}/memory.c | 0
src/{libMars/MARS => libMarsClient}/metadata.c | 0
src/{libMars/MARS => libMarsClient}/multibase.c | 0
src/{libMars/MARS => libMarsClient}/netbase.c | 0
src/{libMars/MARS => libMarsClient}/netbase.h | 0
src/{libMars/MARS => libMarsClient}/nfdbbase.c | 3 +-
src/{libMars/MARS => libMarsClient}/nullbase.c | 0
src/{libMars/MARS => libMarsClient}/odb.cc | 0
src/{libMars/MARS => libMarsClient}/odb.h | 0
src/{libMars/MARS => libMarsClient}/odbbase.c | 0
src/{libMars/MARS => libMarsClient}/options.c | 10 +-
src/{libMars/MARS => libMarsClient}/pproc.c | 2 +-
src/{libMars/MARS => libMarsClient}/proto.h | 4 +-
src/{libMars/MARS => libMarsClient}/queue.c | 0
src/{libMars/MARS => libMarsClient}/queue.h | 0
src/{libMars/MARS => libMarsClient}/remove.c | 0
src/{libMars/MARS => libMarsClient}/request.c | 2 +-
src/{libMars/MARS => libMarsClient}/restricted.c | 0
src/{libMars/MARS => libMarsClient}/restricted.h | 0
src/{libMars/MARS => libMarsClient}/retrieve.c | 47 +-
src/{libMars/MARS => libMarsClient}/rpcmars.x | 0
src/{libMars/MARS => libMarsClient}/schedule.c | 0
src/{libMars/MARS => libMarsClient}/server.c | 0
src/{libMars/MARS => libMarsClient}/service.c | 0
src/{libMars/MARS => libMarsClient}/sh2ll.c | 0
src/{libMars/MARS => libMarsClient}/statistics.c | 0
src/{libMars/MARS => libMarsClient}/stream.c | 0
src/{libMars/MARS => libMarsClient}/target.c | 6 +-
src/{libMars/MARS => libMarsClient}/tcp.c | 0
src/{libMars/MARS => libMarsClient}/time.c | 0
src/{libMars/MARS => libMarsClient}/timer.c | 0
src/{libMars/MARS => libMarsClient}/tools.c | 11 +-
src/{libMars/MARS => libMarsClient}/tools.h | 0
src/{libMars/MARS => libMarsClient}/udp.c | 0
src/{libMars/MARS => libMarsClient}/variable.c | 0
src/{libMars/MARS => libMarsClient}/variable.h | 0
src/{libMars/MARS => libMarsClient}/version.c | 6 +-
src/{libMars/MARS => libMarsClient}/wind.c | 0
src/{libMars/MARS => libMarsClient}/xservice.c | 0
src/libMetview/MvGrid.cc | 209 +-
src/libMetview/MvGrid.h | 4 +
src/libMetview/MvPrepBufrPrep.cc | 2 +-
src/libMetview/MvProtocol.cc | 1 +
src/libMetview/MvService.cc | 10 +-
src/libMvQtGui/MvQProfileView.cc | 23 +-
src/libMvQtGui/MvQProfileView.h | 6 +-
src/libMvQtGui/MvQService.cc | 3 +-
src/libUtil/GribMetaData.cc | 22 +-
src/libUtil/MvOdb.cc | 4 -
src/libUtil/MvProfileData.h | 6 +-
src/libUtil/MvScm.cc | 27 +-
src/libUtil/MvScm.h | 4 +-
src/libUtil/proj_braz.cc | 4 +-
src/uPlot/BufrDecoder.h | 2 +-
src/uPlot/CMakeLists.txt | 4 +-
src/uPlot/CartesianView.cc | 2 +-
src/uPlot/CommonXSectView.cc | 2 +-
src/uPlot/CreateAction.cc | 17 +-
src/uPlot/DataBuilder.cc | 2 +-
src/uPlot/GeoView.cc | 2 +-
src/uPlot/GeopointsDecoder.h | 2 +-
src/uPlot/MagicsTranslator.cc | 59 +-
src/uPlot/MagicsTranslator.h | 18 +
src/uPlot/MapView.cc | 184 +-
src/uPlot/MapView.h | 23 +-
src/uPlot/{Decoder.cc => MvDecoder.cc} | 2 +-
src/uPlot/{Decoder.h => MvDecoder.h} | 4 +-
src/uPlot/MvGribDecoder.h | 2 +-
src/uPlot/MvIconDataBase.cc | 55 +-
src/uPlot/ObjectList.cc | 12 +-
src/uPlot/ObjectList.h | 2 +
src/uPlot/OutputFormatAction.cc | 48 +-
src/uPlot/Page.cc | 54 +-
src/uPlot/Page.h | 3 +
src/uPlot/PlotPageBuilder.cc | 14 +-
src/uPlot/Presentable.cc | 2 +-
src/uPlot/Root.cc | 2 +-
src/uPlot/SimpleDecoder.h | 2 +-
src/uPlot/SuperPage.cc | 4 +-
src/uPlot/uPlotBase.cc | 2 +-
src/uPlot/uPlotManager.cc | 7 +
test/data/t1000_LL_1x1.grb | Bin 0 -> 65280 bytes
test/data/t1000_LL_1x1_subarea.grb | Bin 0 -> 14880 bytes
test/data/t1000_LL_2x2.grb | Bin 0 -> 16560 bytes
test/macros/CMakeLists.txt | 16 +-
test/macros/grib_nearest_gridpoint.mv | 142 +
test/macros/inline_c.mv | 63 +
test/macros/inline_fortran.mv | 58 +
test/macros/interpolation_gg_to_subarea.mv | 8 +-
test/macros/interpolation_rgg_to_ll.mv | 8 +-
test/macros/interpolation_sh_to_ll.mv | 8 +-
test/macros/interpolation_sh_to_rgg.mv | 8 +-
test/macros/plot_coast_order.mv | 1 +
test/macros/station.mv | 36 +
327 files changed, 4842 insertions(+), 6109 deletions(-)
diff --cc debian/changelog
index a082597,0000000..003f77e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,83 -1,0 +1,89 @@@
++metview (4.5.6-1) UNRELEASED; urgency=medium
++
++ * New upstream release.
++
++ -- Alastair McKinstry <mckinstry at debian.org> Mon, 20 Jul 2015 02:17:23 +0100
++
+metview (4.5.3-1) experimental; urgency=medium
+
+ * New upstream release.
+ * Move to cmake-based build
+ * fix-colors.patch: Fixed upstream.
+ * syserrlist.patch temporarily disabled
+ * no-m32 patch temporarily disabled.
+ * Need to build-depend on libgrib-api-tools
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 02 May 2015 13:34:23 +0100
+
+metview (4.4.8+dfsg.1-8) unstable; urgency=medium
+
+ * Add Build-conflicts on openjpeg-dev. Closes: #767746.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 03 Nov 2014 11:58:27 +0000
+
+metview (4.4.8+dfsg.1-7) unstable; urgency=medium
+
+ * Depend on libmagics++-dev >= 2.22.7.dfsg.1-3 to get header files
+ which went missing. Closes: 765130.
+ * Remove scm dependencies on arm64, ppc64 archs for which it is
+ not currently available.
+ * Patch socklen-fix to fix missing type conversion on alphas.
+ * Standards-Version: 3.9.6, no changes required.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sat, 18 Oct 2014 15:32:06 +0100
+
+metview (4.4.8+dfsg.1-6) unstable; urgency=medium
+
+ * Fix for FTBFS on kFreeBSD systems (sys_errlist).
+ * Acknowledge closed bug: Closes: #760520.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 18:43:48 +0100
+
+metview (4.4.8+dfsg.1-5) unstable; urgency=medium
+
+ * Don't delete ConfigDef in clean target;
+ * make find . also conditional on arch-only buildds.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 15:33:20 +0100
+
+metview (4.4.8+dfsg.1-4) unstable; urgency=medium
+
+ * Make chown in debian/rules conditional so it won't break on
+ arch-only buildd's.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 10 Sep 2014 12:12:06 +0100
+
+metview (4.4.8+dfsg.1-3) unstable; urgency=medium
+
+ * Add patch to convert color in GRIB.xpm that 'convert' now complains
+ is undefined.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 08 Sep 2014 20:38:01 +0100
+
+metview (4.4.8+dfsg.1-2) unstable; urgency=medium
+
+ * Set $HOME in debian/rules to tmp directory; scripts run during install
+ fail under sbuild if its not set.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Thu, 04 Sep 2014 15:01:34 +0100
+
+metview (4.4.8+dfsg.1-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Also need libqtwebkit-dev, libxmu-dev Closes: #760028.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Mon, 01 Sep 2014 09:09:29 +0100
+
+metview (4.4.7+dfsg.1-2) unstable; urgency=medium
+
+ * Add libtqt4-dev to Build-Depends to configure qmake correctly.
+ Closes: #760028.
+ * no-m32.patch for configure.ac: don't compile everything !amd64 as '-m32'.
+
+ -- Alastair McKinstry <mckinstry at debian.org> Sun, 31 Aug 2014 12:54:05 +0100
+
+metview (4.4.7+dfsg.1-1) unstable; urgency=low
+
+ * Initial release. (Closes: #693834)
+
+ -- Alastair McKinstry <mckinstry at debian.org> Fri, 20 Jun 2014 10:04:29 +0100
--
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