[magics] 04/04: prep release to experimental
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 20 14:06:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository magics.
commit c1b3cb8af6a5007e6805a79d39ad5cfc64666a78
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Mar 25 09:02:40 2017 +0000
prep release to experimental
---
debian/changelog | 2 +-
debian/patches/cmake-config.patch | 6 +-
debian/patches/numpy-fixes.patch | 12 +--
debian/patches/pkgconfig-fix.patch | 14 +--
debian/patches/python3.patch | 184 +++++++++++------------------------
debian/patches/reproducibility.patch | 12 +--
debian/patches/rm-ksh.patch | 18 ++--
debian/patches/soname-version.patch | 12 +--
debian/patches/unique-ptr.patch | 82 ++++++++--------
9 files changed, 137 insertions(+), 205 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1264c28..9a3df6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-magics++ (2.32.0-1) UNRELEASED; urgency=medium
+magics++ (2.32.0-1) experimental; urgency=medium
* New upstream release
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index 5fb8530..c6a8509 100644
--- a/debian/patches/cmake-config.patch
+++ b/debian/patches/cmake-config.patch
@@ -3,10 +3,10 @@ Description: Ensure /usr/include/magics on include path in Metview
Last-Updated: 2016-01-09
Forwarded: not-needed
-Index: magics++-2.31.0/cmake/project-config.cmake.in
+Index: magics++-2.32.0/cmake/project-config.cmake.in
===================================================================
---- magics++-2.31.0.orig/cmake/project-config.cmake.in
-+++ magics++-2.31.0/cmake/project-config.cmake.in
+--- magics++-2.32.0.orig/cmake/project-config.cmake.in
++++ magics++-2.32.0/cmake/project-config.cmake.in
@@ -19,7 +19,7 @@
get_filename_component(@PNAME at _CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index 0627e45..eca5a23 100644
--- a/debian/patches/numpy-fixes.patch
+++ b/debian/patches/numpy-fixes.patch
@@ -4,10 +4,10 @@ Description: Update the numpy.i from a copy in numpy.git to add
Last-Updated: 2016-10-29
Forwarded: no
-Index: magics++-2.31.0/python/numpy.i
+Index: magics++-2.32.0/python/numpy.i
===================================================================
---- magics++-2.31.0.orig/python/numpy.i
-+++ magics++-2.31.0/python/numpy.i
+--- magics++-2.32.0.orig/python/numpy.i
++++ magics++-2.32.0/python/numpy.i
@@ -1,11 +1,46 @@
/* -*- C -*- (not really, but good for syntax highlighting) */
+
@@ -2482,10 +2482,10 @@ Index: magics++-2.31.0/python/numpy.i
+#endif
#endif /* SWIGPYTHON */
-Index: magics++-2.31.0/python/Magics.i.in
+Index: magics++-2.32.0/python/Magics.i.in
===================================================================
---- magics++-2.31.0.orig/python/Magics.i.in
-+++ magics++-2.31.0/python/Magics.i.in
+--- magics++-2.32.0.orig/python/Magics.i.in
++++ magics++-2.32.0/python/Magics.i.in
@@ -22,7 +22,7 @@
int i = 0;
$1 = (char **) malloc((size+1)*sizeof(char *));
diff --git a/debian/patches/pkgconfig-fix.patch b/debian/patches/pkgconfig-fix.patch
index 98a2830..4e4c797 100644
--- a/debian/patches/pkgconfig-fix.patch
+++ b/debian/patches/pkgconfig-fix.patch
@@ -3,10 +3,10 @@ Description: Need args for ecbuild_pkgconfig() to work
Last-Updated: 2016-01-09
Forwarded: no
-Index: magics++-2.31.0/cmake/ecbuild_pkgconfig.cmake
+Index: magics++-2.32.0/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- magics++-2.31.0.orig/cmake/ecbuild_pkgconfig.cmake
-+++ magics++-2.31.0/cmake/ecbuild_pkgconfig.cmake
+--- magics++-2.32.0.orig/cmake/ecbuild_pkgconfig.cmake
++++ magics++-2.32.0/cmake/ecbuild_pkgconfig.cmake
@@ -12,8 +12,11 @@
# to CMake variable ${dependencies}
function( ecbuild_library_dependencies dependencies libraries )
@@ -19,11 +19,11 @@ Index: magics++-2.31.0/cmake/ecbuild_pkgconfig.cmake
foreach( _lib ${_libraries})
unset( _location )
-Index: magics++-2.31.0/CMakeLists.txt
+Index: magics++-2.32.0/CMakeLists.txt
===================================================================
---- magics++-2.31.0.orig/CMakeLists.txt
-+++ magics++-2.31.0/CMakeLists.txt
-@@ -348,7 +348,12 @@ ecbuild_add_resources( TARGET internal
+--- magics++-2.32.0.orig/CMakeLists.txt
++++ magics++-2.32.0/CMakeLists.txt
+@@ -346,7 +346,12 @@ ecbuild_add_resources( TARGET internal
set( MAGICS_DESCRIPTION "Multi-platform meteorological graphics library" )
set( MAGICS_URL "https://software.ecmwf.int/wiki/display/MAGP/Magics" )
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 5c38e32..58ed874 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,10 +3,10 @@ Description: python2,3 compatability code
Last-Updated: 2016-12-07
Forwarded: no
-Index: magics++-2.31.0/tools/axis2doc.py
+Index: magics++-2.32.0/tools/axis2doc.py
===================================================================
---- magics++-2.31.0.orig/tools/axis2doc.py
-+++ magics++-2.31.0/tools/axis2doc.py
+--- magics++-2.32.0.orig/tools/axis2doc.py
++++ magics++-2.32.0/tools/axis2doc.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -260,10 +260,10 @@ Index: magics++-2.31.0/tools/axis2doc.py
-createAction("wind", "Wind", ["wind.xml"])
+createAction("wind", "Wind", ["wind.xml"])
-Index: magics++-2.31.0/tools/beau.py
+Index: magics++-2.32.0/tools/beau.py
===================================================================
---- magics++-2.31.0.orig/tools/beau.py
-+++ magics++-2.31.0/tools/beau.py
+--- magics++-2.32.0.orig/tools/beau.py
++++ magics++-2.32.0/tools/beau.py
@@ -6,13 +6,13 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
@@ -280,10 +280,10 @@ Index: magics++-2.31.0/tools/beau.py
+print (pretty_xml_as_string)
-Index: magics++-2.31.0/tools/xml2doc.py
+Index: magics++-2.32.0/tools/xml2doc.py
===================================================================
---- magics++-2.31.0.orig/tools/xml2doc.py
-+++ magics++-2.31.0/tools/xml2doc.py
+--- magics++-2.32.0.orig/tools/xml2doc.py
++++ magics++-2.32.0/tools/xml2doc.py
@@ -1,20 +1,17 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -408,10 +408,10 @@ Index: magics++-2.31.0/tools/xml2doc.py
s = self.types[param["type"]](self, param)
definition.write(s)
definition.write( "</font></tbody>\n")
-Index: magics++-2.31.0/tools/xml2html.py
+Index: magics++-2.32.0/tools/xml2html.py
===================================================================
---- magics++-2.31.0.orig/tools/xml2html.py
-+++ magics++-2.31.0/tools/xml2html.py
+--- magics++-2.32.0.orig/tools/xml2html.py
++++ magics++-2.32.0/tools/xml2html.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -610,10 +610,10 @@ Index: magics++-2.31.0/tools/xml2html.py
f = open('coast.json', "w")
f.write(json.dumps(magics, indent=1))
-
-Index: magics++-2.31.0/tools/xml2odt.py
+Index: magics++-2.32.0/tools/xml2odt.py
===================================================================
---- magics++-2.31.0.orig/tools/xml2odt.py
-+++ magics++-2.31.0/tools/xml2odt.py
+--- magics++-2.32.0.orig/tools/xml2odt.py
++++ magics++-2.32.0/tools/xml2odt.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -682,10 +682,10 @@ Index: magics++-2.31.0/tools/xml2odt.py
object = ObjectHandler()
-Index: magics++-2.31.0/tools/xml2split.py
+Index: magics++-2.32.0/tools/xml2split.py
===================================================================
---- magics++-2.31.0.orig/tools/xml2split.py
-+++ magics++-2.31.0/tools/xml2split.py
+--- magics++-2.32.0.orig/tools/xml2split.py
++++ magics++-2.32.0/tools/xml2split.py
@@ -7,7 +7,7 @@
# does it submit to any jurisdiction.
@@ -720,10 +720,10 @@ Index: magics++-2.31.0/tools/xml2split.py
if ( self.open_file == 0):
return
-Index: magics++-2.31.0/tools/xml2mv.py
+Index: magics++-2.32.0/tools/xml2mv.py
===================================================================
---- magics++-2.31.0.orig/tools/xml2mv.py
-+++ magics++-2.31.0/tools/xml2mv.py
+--- magics++-2.32.0.orig/tools/xml2mv.py
++++ magics++-2.32.0/tools/xml2mv.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -976,10 +976,10 @@ Index: magics++-2.31.0/tools/xml2mv.py
saxparser.parse(datasource)
-print "DONE"
+print ("DONE")
-Index: magics++-2.31.0/python/Magics/macro.py
+Index: magics++-2.32.0/python/Magics/macro.py
===================================================================
---- magics++-2.31.0.orig/python/Magics/macro.py
-+++ magics++-2.31.0/python/Magics/macro.py
+--- magics++-2.32.0.orig/python/Magics/macro.py
++++ magics++-2.32.0/python/Magics/macro.py
@@ -1,3 +1,4 @@
+
# (C) Copyright 1996-2016 ECMWF.
@@ -1291,10 +1291,10 @@ Index: magics++-2.31.0/python/Magics/macro.py
os.abort();
-Index: magics++-2.31.0/python/Magics/metgram.py
+Index: magics++-2.32.0/python/Magics/metgram.py
===================================================================
---- magics++-2.31.0.orig/python/Magics/metgram.py
-+++ magics++-2.31.0/python/Magics/metgram.py
+--- magics++-2.32.0.orig/python/Magics/metgram.py
++++ magics++-2.32.0/python/Magics/metgram.py
@@ -1,11 +1,12 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -1735,10 +1735,10 @@ Index: magics++-2.31.0/python/Magics/metgram.py
msl = msl()
wind = wind()
-
-Index: magics++-2.31.0/test/cairo.py
+Index: magics++-2.32.0/test/cairo.py
===================================================================
---- magics++-2.31.0.orig/test/cairo.py
-+++ magics++-2.31.0/test/cairo.py
+--- magics++-2.32.0.orig/test/cairo.py
++++ magics++-2.32.0/test/cairo.py
@@ -8,6 +8,8 @@
# importing Magics module
@@ -1757,10 +1757,10 @@ Index: magics++-2.31.0/test/cairo.py
plot( output, europe, coast, )
tofortran(ref, output, europe, coast, )
-Index: magics++-2.31.0/test/bufr.py
+Index: magics++-2.32.0/test/bufr.py
===================================================================
---- magics++-2.31.0.orig/test/bufr.py
-+++ magics++-2.31.0/test/bufr.py
+--- magics++-2.32.0.orig/test/bufr.py
++++ magics++-2.32.0/test/bufr.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1778,10 +1778,10 @@ Index: magics++-2.31.0/test/bufr.py
plot( output, europe, obs, coast, )
tofortran(ref, output, europe, obs, coast, )
-Index: magics++-2.31.0/test/coast.py
+Index: magics++-2.32.0/test/coast.py
===================================================================
---- magics++-2.31.0.orig/test/coast.py
-+++ magics++-2.31.0/test/coast.py
+--- magics++-2.32.0.orig/test/coast.py
++++ magics++-2.32.0/test/coast.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1790,10 +1790,10 @@ Index: magics++-2.31.0/test/coast.py
from Magics.macro import *
-Index: magics++-2.31.0/test/grib.py
+Index: magics++-2.32.0/test/grib.py
===================================================================
---- magics++-2.31.0.orig/test/grib.py
-+++ magics++-2.31.0/test/grib.py
+--- magics++-2.32.0.orig/test/grib.py
++++ magics++-2.32.0/test/grib.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1811,10 +1811,10 @@ Index: magics++-2.31.0/test/grib.py
plot( output, europe, data, cont, coast, title)
-Index: magics++-2.31.0/python/Magics.i.in
+Index: magics++-2.32.0/python/Magics.i.in
===================================================================
---- magics++-2.31.0.orig/python/Magics.i.in
-+++ magics++-2.31.0/python/Magics.i.in
+--- magics++-2.32.0.orig/python/Magics.i.in
++++ magics++-2.32.0/python/Magics.i.in
@@ -22,6 +22,18 @@
int i = 0;
$1 = (char **) malloc((size+1)*sizeof(char *));
@@ -1842,55 +1842,28 @@ Index: magics++-2.31.0/python/Magics.i.in
$1[i] = 0;
}
else
-Index: magics++-2.31.0/python/Magics/toolbox.py
+Index: magics++-2.32.0/python/Magics/toolbox.py
===================================================================
---- magics++-2.31.0.orig/python/Magics/toolbox.py
-+++ magics++-2.31.0/python/Magics/toolbox.py
-@@ -1,14 +1,12 @@
+--- magics++-2.32.0.orig/python/Magics/toolbox.py
++++ magics++-2.32.0/python/Magics/toolbox.py
+@@ -1,13 +1,11 @@
-
-import macro
-+from __future__ import print_function
-+from . import macro
++from __future__ import print function
++from , import macro
def substitute(default, user):
out = default
- if user != None:
+ if user is not None:
for key in user:
-- out[key] = user[key]
+ out[key] = user[key]
-
-- print out
--
-+ out[key] = user[key]
-+ print (out)
- return out
-
+-
-@@ -196,7 +194,7 @@ defaults = { "eps" :
+ return out
- def epsgram(parameter, input, **args):
-
-- print parameter, input, "ARGS--->", args
-+ print (parameter, input, "ARGS--->", args)
-
- actions = []
-
-@@ -222,11 +220,11 @@ def epsgram(parameter, input, **args):
- actions.append(vertical)
- actions.append(horizontal)
-
-- print "DATA", input
-+ print ("DATA", input)
-
- if "clim" in args :
-- print "FILE--->", data
-- clim = macro.mwrepjson(
-+ print ("FILE--->", data)
-+ clim = macro.mwrepjson(
- wrepjson_family = "eps",
- wrepjson_keyword = "clim",
- wrepjson_input_filename = input,
-@@ -242,9 +240,7 @@ def epsgram(parameter, input, **args):
+@@ -426,9 +424,7 @@ def epsgraph(parameter, input, **args):
actions.append(shade)
actions.append(data)
@@ -1901,51 +1874,10 @@ Index: magics++-2.31.0/python/Magics/toolbox.py
text = macro.mtext(
text_colour = "navy",
text_font_size = font_size*2,
-@@ -254,32 +250,23 @@ def epsgram(parameter, input, **args):
- "<json_info key='product_info'/><json_info key='date'/>",
- "<font size='0.5' colour='white'>.</font>",
- "<json_info key='parameter_info'/>",]
--
- )
--
- actions.append(text)
-
- if "output" in args != "" :
-- #Setting of the output file name
-- png = macro.output(output_formats = ['png'],
-- output_name_first_page_number = "off",
-- output_name = args["output"])
--
-- return macro._plot(
-- png,
-- actions
-- )
--
-- return macro.plot(
-- actions
-- )
-+ # Setting of the output file name
-+ png = macro.output(output_formats = ['png'],
-+ output_name_first_page_number = "off",
-+ output_name = args["output"])
-+ return macro._plot(png,actions)
-+ return macro.plot(actions)
-
- def epsclimgram(**kw):
-
-- print kw
-+ print (kw)
- args = {"clim" :True }
- args.update(kw)
-- print args
-+ print (args)
-
- return epsgram(**args)
-
-Index: magics++-2.31.0/utils/epsgrams.py
+Index: magics++-2.32.0/utils/epsgrams.py
===================================================================
---- magics++-2.31.0.orig/utils/epsgrams.py
-+++ magics++-2.31.0/utils/epsgrams.py
+--- magics++-2.32.0.orig/utils/epsgrams.py
++++ magics++-2.32.0/utils/epsgrams.py
@@ -6,6 +6,7 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
@@ -1986,10 +1918,10 @@ Index: magics++-2.31.0/utils/epsgrams.py
return 1
-Index: magics++-2.31.0/utils/plumes.py
+Index: magics++-2.32.0/utils/plumes.py
===================================================================
---- magics++-2.31.0.orig/utils/plumes.py
-+++ magics++-2.31.0/utils/plumes.py
+--- magics++-2.32.0.orig/utils/plumes.py
++++ magics++-2.32.0/utils/plumes.py
@@ -6,6 +6,7 @@
# granted to it by virtue of its status as an intergovernmental organisation nor
# does it submit to any jurisdiction.
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index 636e5a7..9d96adc 100644
--- a/debian/patches/reproducibility.patch
+++ b/debian/patches/reproducibility.patch
@@ -7,10 +7,10 @@ Bugs-Debian: https://bugs.debian.org/792824
Last-Updated: 2016-01-07
Forwarded: no
-Index: magics++-2.31.0/tools/xml2cc.pl
+Index: magics++-2.32.0/tools/xml2cc.pl
===================================================================
---- magics++-2.31.0.orig/tools/xml2cc.pl
-+++ magics++-2.31.0/tools/xml2cc.pl
+--- magics++-2.32.0.orig/tools/xml2cc.pl
++++ magics++-2.32.0/tools/xml2cc.pl
@@ -10,6 +10,11 @@
use XML::Parser;
@@ -32,10 +32,10 @@ Index: magics++-2.31.0/tools/xml2cc.pl
{
print "#include \"$i.h\"\n";
}
-Index: magics++-2.31.0/tools/xml2mv.pl
+Index: magics++-2.32.0/tools/xml2mv.pl
===================================================================
---- magics++-2.31.0.orig/tools/xml2mv.pl
-+++ magics++-2.31.0/tools/xml2mv.pl
+--- magics++-2.32.0.orig/tools/xml2mv.pl
++++ magics++-2.32.0/tools/xml2mv.pl
@@ -11,9 +11,12 @@
use XML::Parser;
diff --git a/debian/patches/rm-ksh.patch b/debian/patches/rm-ksh.patch
index 8f5fc8a..39b4089 100644
--- a/debian/patches/rm-ksh.patch
+++ b/debian/patches/rm-ksh.patch
@@ -3,30 +3,30 @@ Description: Remove ksh, as unsupported in Debian right now
Last-Updated: 2016-11-13
Forwarded: not-needed
-Index: magics++-2.31.0/apps/MagMLInterpretor/magjson-script.in
+Index: magics++-2.32.0/apps/MagMLInterpretor/magjson-script.in
===================================================================
---- magics++-2.31.0.orig/apps/MagMLInterpretor/magjson-script.in
-+++ magics++-2.31.0/apps/MagMLInterpretor/magjson-script.in
+--- magics++-2.32.0.orig/apps/MagMLInterpretor/magjson-script.in
++++ magics++-2.32.0/apps/MagMLInterpretor/magjson-script.in
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.31.0/apps/MagMLInterpretor/magml-script.in
+Index: magics++-2.32.0/apps/MagMLInterpretor/magml-script.in
===================================================================
---- magics++-2.31.0.orig/apps/MagMLInterpretor/magml-script.in
-+++ magics++-2.31.0/apps/MagMLInterpretor/magml-script.in
+--- magics++-2.32.0.orig/apps/MagMLInterpretor/magml-script.in
++++ magics++-2.32.0/apps/MagMLInterpretor/magml-script.in
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.31.0/apps/metgram/metgram-script.in
+Index: magics++-2.32.0/apps/metgram/metgram-script.in
===================================================================
---- magics++-2.31.0.orig/apps/metgram/metgram-script.in
-+++ magics++-2.31.0/apps/metgram/metgram-script.in
+--- magics++-2.32.0.orig/apps/metgram/metgram-script.in
++++ magics++-2.32.0/apps/metgram/metgram-script.in
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index e322fd6..b63c147 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -3,10 +3,10 @@ Description: Add versioned soname for Debian.
Forwarded: no
Last-Updated: 2015-06-19
-Index: magics++-2.31.0/src/CMakeLists.txt
+Index: magics++-2.32.0/src/CMakeLists.txt
===================================================================
---- magics++-2.31.0.orig/src/CMakeLists.txt
-+++ magics++-2.31.0/src/CMakeLists.txt
+--- magics++-2.32.0.orig/src/CMakeLists.txt
++++ magics++-2.32.0/src/CMakeLists.txt
@@ -122,6 +122,9 @@ ecbuild_add_library( TARGET MagPlus
${common_templates}
DEFINITIONS
@@ -36,10 +36,10 @@ Index: magics++-2.31.0/src/CMakeLists.txt
TYPE SHARED )
if ( BUILD_SHARED_LIBS STREQUAL "BOTH" )
-Index: magics++-2.31.0/cmake/ecbuild_add_library.cmake
+Index: magics++-2.32.0/cmake/ecbuild_add_library.cmake
===================================================================
---- magics++-2.31.0.orig/cmake/ecbuild_add_library.cmake
-+++ magics++-2.31.0/cmake/ecbuild_add_library.cmake
+--- magics++-2.32.0.orig/cmake/ecbuild_add_library.cmake
++++ magics++-2.32.0/cmake/ecbuild_add_library.cmake
@@ -155,7 +155,7 @@
function( ecbuild_add_library_impl )
diff --git a/debian/patches/unique-ptr.patch b/debian/patches/unique-ptr.patch
index 62128df..f5cf6ce 100644
--- a/debian/patches/unique-ptr.patch
+++ b/debian/patches/unique-ptr.patch
@@ -4,10 +4,10 @@ Description: For G++ 6, we move to c++14, auto_ptr is deprecated.
Last-Updated: 2016-11-01
Forwarded: no
-Index: magics++-2.31.0/src/basic/ParameterSettings.cc
+Index: magics++-2.32.0/src/basic/ParameterSettings.cc
===================================================================
---- magics++-2.31.0.orig/src/basic/ParameterSettings.cc
-+++ magics++-2.31.0/src/basic/ParameterSettings.cc
+--- magics++-2.32.0.orig/src/basic/ParameterSettings.cc
++++ magics++-2.32.0/src/basic/ParameterSettings.cc
@@ -51,7 +51,7 @@ void setAttribute(const vector<string>&
}
}
@@ -26,10 +26,10 @@ Index: magics++-2.31.0/src/basic/ParameterSettings.cc
}
}
-Index: magics++-2.31.0/src/basic/ParameterSettings.h
+Index: magics++-2.32.0/src/basic/ParameterSettings.h
===================================================================
---- magics++-2.31.0.orig/src/basic/ParameterSettings.h
-+++ magics++-2.31.0/src/basic/ParameterSettings.h
+--- magics++-2.32.0.orig/src/basic/ParameterSettings.h
++++ magics++-2.32.0/src/basic/ParameterSettings.h
@@ -24,10 +24,10 @@
#include <Colour.h>
@@ -79,10 +79,10 @@ Index: magics++-2.31.0/src/basic/ParameterSettings.h
MagLog::debug() << "Parameter [" << name << "] set to " << val->second << endl;
}
catch (...) {
-Index: magics++-2.31.0/src/decoders/GribDecoder.cc
+Index: magics++-2.32.0/src/decoders/GribDecoder.cc
===================================================================
---- magics++-2.31.0.orig/src/decoders/GribDecoder.cc
-+++ magics++-2.31.0/src/decoders/GribDecoder.cc
+--- magics++-2.32.0.orig/src/decoders/GribDecoder.cc
++++ magics++-2.32.0/src/decoders/GribDecoder.cc
@@ -90,7 +90,7 @@ void GribDecoder::set(const GribLoop& lo
index_ = loop.uniqueId_;
interpolation_method_ = loop.interpolation_method_;
@@ -92,7 +92,7 @@ Index: magics++-2.31.0/src/decoders/GribDecoder.cc
internalIndex_ = index;
}
-@@ -1584,7 +1584,7 @@ void GribDecoder::visit(MetaDataCollecto
+@@ -1592,7 +1592,7 @@ void GribDecoder::visit(MetaDataCollecto
string representation = getString("typeOfGrid");
try
{
@@ -101,10 +101,10 @@ Index: magics++-2.31.0/src/decoders/GribDecoder.cc
interpretor_->scaling(*this, scaling, offset,oriUnits,derivedUnits);
if(scaling==1 && offset == 0)
{
-Index: magics++-2.31.0/src/decoders/TitleTemplate.cc
+Index: magics++-2.32.0/src/decoders/TitleTemplate.cc
===================================================================
---- magics++-2.31.0.orig/src/decoders/TitleTemplate.cc
-+++ magics++-2.31.0/src/decoders/TitleTemplate.cc
+--- magics++-2.32.0.orig/src/decoders/TitleTemplate.cc
++++ magics++-2.32.0/src/decoders/TitleTemplate.cc
@@ -171,7 +171,7 @@ bool TitleTemplate::verify(const GribDec
//#ifdef MAGICS_EXCEPTION
try{
@@ -114,10 +114,10 @@ Index: magics++-2.31.0/src/decoders/TitleTemplate.cc
MagLog::debug() << "Found the MatchCriteria for " << criter->first << "\n";
if (!(*object).verify(data, criter->first, criter->second)) return false;
}
-Index: magics++-2.31.0/src/decoders/TitleTemplate.h
+Index: magics++-2.32.0/src/decoders/TitleTemplate.h
===================================================================
---- magics++-2.31.0.orig/src/decoders/TitleTemplate.h
-+++ magics++-2.31.0/src/decoders/TitleTemplate.h
+--- magics++-2.32.0.orig/src/decoders/TitleTemplate.h
++++ magics++-2.32.0/src/decoders/TitleTemplate.h
@@ -122,7 +122,7 @@ public:
#ifdef MAGICS_EXCEPTION
try
@@ -127,10 +127,10 @@ Index: magics++-2.31.0/src/decoders/TitleTemplate.h
(*object)(*(*entry), lines, data);
}
catch (NoFactoryException& e)
-Index: magics++-2.31.0/src/libMagWrapper/MagPlus.cc
+Index: magics++-2.32.0/src/libMagWrapper/MagPlus.cc
===================================================================
---- magics++-2.31.0.orig/src/libMagWrapper/MagPlus.cc
-+++ magics++-2.31.0/src/libMagWrapper/MagPlus.cc
+--- magics++-2.32.0.orig/src/libMagWrapper/MagPlus.cc
++++ magics++-2.32.0/src/libMagWrapper/MagPlus.cc
@@ -558,7 +558,7 @@ bool MagPlus::cartesianGrid(magics::MagR
haxis->icon("Horizontal Axis", "MAXIS");
haxis->label_type_ = xtype;
@@ -158,10 +158,10 @@ Index: magics++-2.31.0/src/libMagWrapper/MagPlus.cc
node->getReady();
//top()->legend(node);
if ( geographical_ ) {
-Index: magics++-2.31.0/src/magics.h
+Index: magics++-2.32.0/src/magics.h
===================================================================
---- magics++-2.31.0.orig/src/magics.h
-+++ magics++-2.31.0/src/magics.h
+--- magics++-2.32.0.orig/src/magics.h
++++ magics++-2.32.0/src/magics.h
@@ -106,7 +106,7 @@ using std::pair;
//using std::list;
using std::map;
@@ -171,10 +171,10 @@ Index: magics++-2.31.0/src/magics.h
#include <exception>
-Index: magics++-2.31.0/src/visualisers/AutomaticContourMethod.h
+Index: magics++-2.32.0/src/visualisers/AutomaticContourMethod.h
===================================================================
---- magics++-2.31.0.orig/src/visualisers/AutomaticContourMethod.h
-+++ magics++-2.31.0/src/visualisers/AutomaticContourMethod.h
+--- magics++-2.32.0.orig/src/visualisers/AutomaticContourMethod.h
++++ magics++-2.32.0/src/visualisers/AutomaticContourMethod.h
@@ -205,7 +205,7 @@ public:
// data, because the sub-sampling method (above) uses no interpolation.
if ((nSampleX > 1) && (nSampleY > 1)) {
@@ -202,11 +202,11 @@ Index: magics++-2.31.0/src/visualisers/AutomaticContourMethod.h
pAkima760Method->resolutionX_ = (fContourResolutionX);
pAkima760Method->resolutionY_ = (fContourResolutionY);
-Index: magics++-2.31.0/src/visualisers/CalculateColourTechnique.cc
+Index: magics++-2.32.0/src/visualisers/CalculateColourTechnique.cc
===================================================================
---- magics++-2.31.0.orig/src/visualisers/CalculateColourTechnique.cc
-+++ magics++-2.31.0/src/visualisers/CalculateColourTechnique.cc
-@@ -52,8 +52,8 @@ void CalculateColourTechnique::print(ost
+--- magics++-2.32.0.orig/src/visualisers/CalculateColourTechnique.cc
++++ magics++-2.32.0/src/visualisers/CalculateColourTechnique.cc
+@@ -51,8 +51,8 @@ void CalculateColourTechnique::print(ost
void CalculateColourTechnique::set(const ColourTechniqueInterface& attributes)
{
@@ -217,10 +217,10 @@ Index: magics++-2.31.0/src/visualisers/CalculateColourTechnique.cc
direction_ = attributes.getDirection();
}
-Index: magics++-2.31.0/src/visualisers/LabelPlotting.cc
+Index: magics++-2.32.0/src/visualisers/LabelPlotting.cc
===================================================================
---- magics++-2.31.0.orig/src/visualisers/LabelPlotting.cc
-+++ magics++-2.31.0/src/visualisers/LabelPlotting.cc
+--- magics++-2.32.0.orig/src/visualisers/LabelPlotting.cc
++++ magics++-2.32.0/src/visualisers/LabelPlotting.cc
@@ -41,7 +41,7 @@ void LabelPlotting::prepare(NoGridPlotti
if ( *colour_ == "UNDEFINED" ) {
@@ -230,10 +230,10 @@ Index: magics++-2.31.0/src/visualisers/LabelPlotting.cc
}
if ( longitudes_.empty() )
-Index: magics++-2.31.0/tools/xml2cc.pl
+Index: magics++-2.32.0/tools/xml2cc.pl
===================================================================
---- magics++-2.31.0.orig/tools/xml2cc.pl
-+++ magics++-2.31.0/tools/xml2cc.pl
+--- magics++-2.32.0.orig/tools/xml2cc.pl
++++ magics++-2.32.0/tools/xml2cc.pl
@@ -298,7 +298,7 @@ EOF
}
else
@@ -252,10 +252,10 @@ Index: magics++-2.31.0/tools/xml2cc.pl
}
print "";
-Index: magics++-2.31.0/tools/xml2cc.pl.workshop
+Index: magics++-2.32.0/tools/xml2cc.pl.workshop
===================================================================
---- magics++-2.31.0.orig/tools/xml2cc.pl.workshop
-+++ magics++-2.31.0/tools/xml2cc.pl.workshop
+--- magics++-2.32.0.orig/tools/xml2cc.pl.workshop
++++ magics++-2.32.0/tools/xml2cc.pl.workshop
@@ -315,7 +315,7 @@ EOF
{
print <<EOF;
@@ -274,10 +274,10 @@ Index: magics++-2.31.0/tools/xml2cc.pl.workshop
}
}
-Index: magics++-2.31.0/tools/xml2mv.pl
+Index: magics++-2.32.0/tools/xml2mv.pl
===================================================================
---- magics++-2.31.0.orig/tools/xml2mv.pl
-+++ magics++-2.31.0/tools/xml2mv.pl
+--- magics++-2.32.0.orig/tools/xml2mv.pl
++++ magics++-2.32.0/tools/xml2mv.pl
@@ -447,7 +447,7 @@ EOF
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git
More information about the debian-science-commits
mailing list