[magics] 62/63: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Mar 24 10:41:55 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 6cc1907471fe1d15e5a38bcd1edb41ba60581fe8
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Feb 21 12:09:19 2017 +0000
refresh patches
---
debian/patches/cmake-config.patch | 6 +-
debian/patches/numpy-fixes.patch | 12 +--
debian/patches/pkgconfig-fix.patch | 14 +--
debian/patches/python3.patch | 187 +++++++++++++++++------------------
debian/patches/reproducibility.patch | 12 +--
debian/patches/rm-ksh.patch | 18 ++--
debian/patches/soname-version.patch | 20 ++--
debian/patches/terralib.patch | 6 +-
debian/patches/unique-ptr.patch | 93 ++++++++---------
9 files changed, 174 insertions(+), 194 deletions(-)
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index fdc2708..5fb8530 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.30.0/cmake/project-config.cmake.in
+Index: magics++-2.31.0/cmake/project-config.cmake.in
===================================================================
---- magics++-2.30.0.orig/cmake/project-config.cmake.in
-+++ magics++-2.30.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
@@ -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 29ed977..0627e45 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.30.0/python/numpy.i
+Index: magics++-2.31.0/python/numpy.i
===================================================================
---- magics++-2.30.0.orig/python/numpy.i
-+++ magics++-2.30.0/python/numpy.i
+--- magics++-2.31.0.orig/python/numpy.i
++++ magics++-2.31.0/python/numpy.i
@@ -1,11 +1,46 @@
/* -*- C -*- (not really, but good for syntax highlighting) */
+
@@ -2482,10 +2482,10 @@ Index: magics++-2.30.0/python/numpy.i
+#endif
#endif /* SWIGPYTHON */
-Index: magics++-2.30.0/python/Magics.i.in
+Index: magics++-2.31.0/python/Magics.i.in
===================================================================
---- magics++-2.30.0.orig/python/Magics.i.in
-+++ magics++-2.30.0/python/Magics.i.in
+--- magics++-2.31.0.orig/python/Magics.i.in
++++ magics++-2.31.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 6cacf1e..98a2830 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.30.0/cmake/ecbuild_pkgconfig.cmake
+Index: magics++-2.31.0/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- magics++-2.30.0.orig/cmake/ecbuild_pkgconfig.cmake
-+++ magics++-2.30.0/cmake/ecbuild_pkgconfig.cmake
+--- magics++-2.31.0.orig/cmake/ecbuild_pkgconfig.cmake
++++ magics++-2.31.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.30.0/cmake/ecbuild_pkgconfig.cmake
foreach( _lib ${_libraries})
unset( _location )
-Index: magics++-2.30.0/CMakeLists.txt
+Index: magics++-2.31.0/CMakeLists.txt
===================================================================
---- magics++-2.30.0.orig/CMakeLists.txt
-+++ magics++-2.30.0/CMakeLists.txt
-@@ -337,7 +337,12 @@ ecbuild_add_resources( TARGET internal
+--- magics++-2.31.0.orig/CMakeLists.txt
++++ magics++-2.31.0/CMakeLists.txt
+@@ -348,7 +348,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 89f9459..5c38e32 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.30.0/tools/axis2doc.py
+Index: magics++-2.31.0/tools/axis2doc.py
===================================================================
---- magics++-2.30.0.orig/tools/axis2doc.py
-+++ magics++-2.30.0/tools/axis2doc.py
+--- magics++-2.31.0.orig/tools/axis2doc.py
++++ magics++-2.31.0/tools/axis2doc.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -260,10 +260,10 @@ Index: magics++-2.30.0/tools/axis2doc.py
-createAction("wind", "Wind", ["wind.xml"])
+createAction("wind", "Wind", ["wind.xml"])
-Index: magics++-2.30.0/tools/beau.py
+Index: magics++-2.31.0/tools/beau.py
===================================================================
---- magics++-2.30.0.orig/tools/beau.py
-+++ magics++-2.30.0/tools/beau.py
+--- magics++-2.31.0.orig/tools/beau.py
++++ magics++-2.31.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.30.0/tools/beau.py
+print (pretty_xml_as_string)
-Index: magics++-2.30.0/tools/xml2doc.py
+Index: magics++-2.31.0/tools/xml2doc.py
===================================================================
---- magics++-2.30.0.orig/tools/xml2doc.py
-+++ magics++-2.30.0/tools/xml2doc.py
+--- magics++-2.31.0.orig/tools/xml2doc.py
++++ magics++-2.31.0/tools/xml2doc.py
@@ -1,20 +1,17 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -408,10 +408,10 @@ Index: magics++-2.30.0/tools/xml2doc.py
s = self.types[param["type"]](self, param)
definition.write(s)
definition.write( "</font></tbody>\n")
-Index: magics++-2.30.0/tools/xml2html.py
+Index: magics++-2.31.0/tools/xml2html.py
===================================================================
---- magics++-2.30.0.orig/tools/xml2html.py
-+++ magics++-2.30.0/tools/xml2html.py
+--- magics++-2.31.0.orig/tools/xml2html.py
++++ magics++-2.31.0/tools/xml2html.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -610,10 +610,10 @@ Index: magics++-2.30.0/tools/xml2html.py
f = open('coast.json', "w")
f.write(json.dumps(magics, indent=1))
-
-Index: magics++-2.30.0/tools/xml2odt.py
+Index: magics++-2.31.0/tools/xml2odt.py
===================================================================
---- magics++-2.30.0.orig/tools/xml2odt.py
-+++ magics++-2.30.0/tools/xml2odt.py
+--- magics++-2.31.0.orig/tools/xml2odt.py
++++ magics++-2.31.0/tools/xml2odt.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -682,10 +682,10 @@ Index: magics++-2.30.0/tools/xml2odt.py
object = ObjectHandler()
-Index: magics++-2.30.0/tools/xml2split.py
+Index: magics++-2.31.0/tools/xml2split.py
===================================================================
---- magics++-2.30.0.orig/tools/xml2split.py
-+++ magics++-2.30.0/tools/xml2split.py
+--- magics++-2.31.0.orig/tools/xml2split.py
++++ magics++-2.31.0/tools/xml2split.py
@@ -7,7 +7,7 @@
# does it submit to any jurisdiction.
@@ -720,10 +720,10 @@ Index: magics++-2.30.0/tools/xml2split.py
if ( self.open_file == 0):
return
-Index: magics++-2.30.0/tools/xml2mv.py
+Index: magics++-2.31.0/tools/xml2mv.py
===================================================================
---- magics++-2.30.0.orig/tools/xml2mv.py
-+++ magics++-2.30.0/tools/xml2mv.py
+--- magics++-2.31.0.orig/tools/xml2mv.py
++++ magics++-2.31.0/tools/xml2mv.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -976,10 +976,10 @@ Index: magics++-2.30.0/tools/xml2mv.py
saxparser.parse(datasource)
-print "DONE"
+print ("DONE")
-Index: magics++-2.30.0/python/Magics/macro.py
+Index: magics++-2.31.0/python/Magics/macro.py
===================================================================
---- magics++-2.30.0.orig/python/Magics/macro.py
-+++ magics++-2.30.0/python/Magics/macro.py
+--- magics++-2.31.0.orig/python/Magics/macro.py
++++ magics++-2.31.0/python/Magics/macro.py
@@ -1,3 +1,4 @@
+
# (C) Copyright 1996-2016 ECMWF.
@@ -1104,7 +1104,7 @@ Index: magics++-2.30.0/python/Magics/macro.py
-@@ -210,9 +220,9 @@ class Action(object):
+@@ -210,18 +220,18 @@ class Action(object):
def tofortran(self, f):
if self.action == Magics.new_page :
@@ -1117,9 +1117,24 @@ Index: magics++-2.30.0/python/Magics/macro.py
if isinstance(self.args[key], str):
if key == 'odb_data':
Magics.setc('odb_filename', self.args[key])
-@@ -240,7 +250,7 @@ class Action(object):
+ else:
+- print >> f, '\tcall psetc("%s", "%s")'%(key, self.args[key])
++ print ('\tcall psetc("%s", "%s")'%(key, self.args[key]), file=f)
+ elif isinstance(self.args[key], int):
+- print >>f, '\tcall pseti("%s", %d)'%(key, self.args[key])
++ print ('\tcall pseti("%s", %d)'%(key, self.args[key]), file=f)
+ elif isinstance(self.args[key], float):
+- print >> f, '\tcall psetr("%s", %0.2f)'%(key, self.args[key])
++ print ('\tcall psetr("%s", %0.2f)'%(key, self.args[key]), file=f)
+ elif isinstance(self.args[key], list) :
+ if isinstance (self.args[key][0], str):
+ nb = 0
+@@ -238,9 +248,9 @@ class Action(object):
+ sep = ",&\n\t\t"
+ newline = newline + 70
val += "/)"
- print >>f, '\tcall pset1c("%s", %s, %d)'%(key, val, len(self.args[key]))
+- print >>f, '\tcall pset1c("%s", %s, %d)'%(key, val, len(self.args[key]))
++ print ('\tcall pset1c("%s", %s, %d)'%(key, val, len(self.args[key])), file=f)
elif isinstance(self.args[key][0], int):
- print "pset1i"
+ print ("pset1i")
@@ -1149,9 +1164,12 @@ Index: magics++-2.30.0/python/Magics/macro.py
else :
val = "(/"
sep = ""
-@@ -269,18 +279,18 @@ class Action(object):
+@@ -267,20 +277,20 @@ class Action(object):
+ val += sep + ("%0.2f" % v)
+ sep = ", "
val += "/)"
- print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
+- print >>f, '\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key]))
++ print ('\tcall pset1r("%s", %s, %d)'%(key, val, len(self.args[key])), file=f)
elif isinstance(self.args[key][0], int):
- print "pset1r"
+ print ("pset1r" )
@@ -1160,10 +1178,11 @@ Index: magics++-2.30.0/python/Magics/macro.py
+ print ("type???->", key)
if self.action != None and actions[self.verb] != "" and actions[self.verb] != "pinput":
- print >>f, "\tcall %s\n"%actions[self.verb]
+- print >>f, "\tcall %s\n"%actions[self.verb]
- for key in self.args.keys():
- print >>f, "\tcall preset('%s')"%key
- print >>f, ""
++ print ("\tcall %s\n"%actions[self.verb] , file=f)
+ for key in list(self.args.keys()):
+ print ("\tcall preset('%s')"%key , file=f)
+ print ("", file=f)
@@ -1251,7 +1270,7 @@ Index: magics++-2.30.0/python/Magics/macro.py
@@ -490,19 +500,19 @@ class odb_filter(object):
odb = "%s.odb" % file
context.tmp.append(odb)
- cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -f newodb -o " + odb
+ cmd = "odb sql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -f newodb -o " + odb
- print cmd
+ print (cmd )
if (os.system(cmd)) :
@@ -1260,7 +1279,7 @@ Index: magics++-2.30.0/python/Magics/macro.py
os.abort();
Magics.setc('odb_filename', odb)
def inspect(self):
- cmd = "odbsql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -o data.ascii"
+ cmd = "odb sql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -o data.ascii"
if (os.system(cmd)) :
- print "Error in filtering ODB data... Aborting"
+ print ("Error in filtering ODB data... Aborting")
@@ -1272,10 +1291,10 @@ Index: magics++-2.30.0/python/Magics/macro.py
os.abort();
-Index: magics++-2.30.0/python/Magics/metgram.py
+Index: magics++-2.31.0/python/Magics/metgram.py
===================================================================
---- magics++-2.30.0.orig/python/Magics/metgram.py
-+++ magics++-2.30.0/python/Magics/metgram.py
+--- magics++-2.31.0.orig/python/Magics/metgram.py
++++ magics++-2.31.0/python/Magics/metgram.py
@@ -1,11 +1,12 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -1716,10 +1735,10 @@ Index: magics++-2.30.0/python/Magics/metgram.py
msl = msl()
wind = wind()
-
-Index: magics++-2.30.0/test/cairo.py
+Index: magics++-2.31.0/test/cairo.py
===================================================================
---- magics++-2.30.0.orig/test/cairo.py
-+++ magics++-2.30.0/test/cairo.py
+--- magics++-2.31.0.orig/test/cairo.py
++++ magics++-2.31.0/test/cairo.py
@@ -8,6 +8,8 @@
# importing Magics module
@@ -1738,10 +1757,10 @@ Index: magics++-2.30.0/test/cairo.py
plot( output, europe, coast, )
tofortran(ref, output, europe, coast, )
-Index: magics++-2.30.0/test/bufr.py
+Index: magics++-2.31.0/test/bufr.py
===================================================================
---- magics++-2.30.0.orig/test/bufr.py
-+++ magics++-2.30.0/test/bufr.py
+--- magics++-2.31.0.orig/test/bufr.py
++++ magics++-2.31.0/test/bufr.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1759,10 +1778,10 @@ Index: magics++-2.30.0/test/bufr.py
plot( output, europe, obs, coast, )
tofortran(ref, output, europe, obs, coast, )
-Index: magics++-2.30.0/test/coast.py
+Index: magics++-2.31.0/test/coast.py
===================================================================
---- magics++-2.30.0.orig/test/coast.py
-+++ magics++-2.30.0/test/coast.py
+--- magics++-2.31.0.orig/test/coast.py
++++ magics++-2.31.0/test/coast.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1771,10 +1790,10 @@ Index: magics++-2.30.0/test/coast.py
from Magics.macro import *
-Index: magics++-2.30.0/test/grib.py
+Index: magics++-2.31.0/test/grib.py
===================================================================
---- magics++-2.30.0.orig/test/grib.py
-+++ magics++-2.30.0/test/grib.py
+--- magics++-2.31.0.orig/test/grib.py
++++ magics++-2.31.0/test/grib.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1792,10 +1811,10 @@ Index: magics++-2.30.0/test/grib.py
plot( output, europe, data, cont, coast, title)
-Index: magics++-2.30.0/python/Magics.i.in
+Index: magics++-2.31.0/python/Magics.i.in
===================================================================
---- magics++-2.30.0.orig/python/Magics.i.in
-+++ magics++-2.30.0/python/Magics.i.in
+--- magics++-2.31.0.orig/python/Magics.i.in
++++ magics++-2.31.0/python/Magics.i.in
@@ -22,6 +22,18 @@
int i = 0;
$1 = (char **) malloc((size+1)*sizeof(char *));
@@ -1823,61 +1842,31 @@ Index: magics++-2.30.0/python/Magics.i.in
$1[i] = 0;
}
else
-Index: magics++-2.30.0/python/Magics/toolbox.py
+Index: magics++-2.31.0/python/Magics/toolbox.py
===================================================================
---- magics++-2.30.0.orig/python/Magics/toolbox.py
-+++ magics++-2.30.0/python/Magics/toolbox.py
-@@ -1,39 +1,36 @@
+--- magics++-2.31.0.orig/python/Magics/toolbox.py
++++ magics++-2.31.0/python/Magics/toolbox.py
+@@ -1,14 +1,12 @@
+-
+-import macro
+from __future__ import print_function
-+
+from . import macro
--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
-
-+ print(out)
++ out[key] = user[key]
++ print (out)
return out
--
--
- def xyplot(data, contour=None, output=None):
-
--
- default = {
-- "contour" : { }
-+ "contour": {}
- }
-
-- #Setting the cartesian view
-- projection = macro.mmap(subpage_map_projection = 'cartesian',
-+ # Setting the cartesian view
-+ projection = macro.mmap(subpage_map_projection='cartesian',
- subpage_x_automatic = 'on',
- subpage_y_automatic = 'on',
- )
-- #Vertical axis
-+ # Vertical axis
- vertical = macro.maxis(axis_orientation = "vertical",
- axis_grid = "on",
- axis_grid_colour = "grey",
- axis_grid_thickness = 1,
- axis_grid_line_style = "dot")
-
-- #Horizontal axis
-+ # Horizontal axis
- horizontal = macro.maxis(axis_orientation = "horizontal",
- axis_grid = "on",
- axis_grid_colour = "grey",
-@@ -159,7 +156,7 @@ defaults = { "eps" :
+@@ -196,7 +194,7 @@ defaults = { "eps" :
def epsgram(parameter, input, **args):
@@ -1886,7 +1875,7 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
actions = []
-@@ -185,11 +182,11 @@ def epsgram(parameter, input, **args):
+@@ -222,11 +220,11 @@ def epsgram(parameter, input, **args):
actions.append(vertical)
actions.append(horizontal)
@@ -1901,7 +1890,7 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
wrepjson_family = "eps",
wrepjson_keyword = "clim",
wrepjson_input_filename = input,
-@@ -205,9 +202,7 @@ def epsgram(parameter, input, **args):
+@@ -242,9 +240,7 @@ def epsgram(parameter, input, **args):
actions.append(shade)
actions.append(data)
@@ -1912,7 +1901,7 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
text = macro.mtext(
text_colour = "navy",
text_font_size = font_size*2,
-@@ -217,32 +212,23 @@ def epsgram(parameter, input, **args):
+@@ -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'/>",]
@@ -1953,10 +1942,10 @@ Index: magics++-2.30.0/python/Magics/toolbox.py
return epsgram(**args)
-Index: magics++-2.30.0/utils/epsgrams.py
+Index: magics++-2.31.0/utils/epsgrams.py
===================================================================
---- magics++-2.30.0.orig/utils/epsgrams.py
-+++ magics++-2.30.0/utils/epsgrams.py
+--- magics++-2.31.0.orig/utils/epsgrams.py
++++ magics++-2.31.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.
@@ -1997,10 +1986,10 @@ Index: magics++-2.30.0/utils/epsgrams.py
return 1
-Index: magics++-2.30.0/utils/plumes.py
+Index: magics++-2.31.0/utils/plumes.py
===================================================================
---- magics++-2.30.0.orig/utils/plumes.py
-+++ magics++-2.30.0/utils/plumes.py
+--- magics++-2.31.0.orig/utils/plumes.py
++++ magics++-2.31.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 3745315..636e5a7 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.30.0/tools/xml2cc.pl
+Index: magics++-2.31.0/tools/xml2cc.pl
===================================================================
---- magics++-2.30.0.orig/tools/xml2cc.pl
-+++ magics++-2.30.0/tools/xml2cc.pl
+--- magics++-2.31.0.orig/tools/xml2cc.pl
++++ magics++-2.31.0/tools/xml2cc.pl
@@ -10,6 +10,11 @@
use XML::Parser;
@@ -32,10 +32,10 @@ Index: magics++-2.30.0/tools/xml2cc.pl
{
print "#include \"$i.h\"\n";
}
-Index: magics++-2.30.0/tools/xml2mv.pl
+Index: magics++-2.31.0/tools/xml2mv.pl
===================================================================
---- magics++-2.30.0.orig/tools/xml2mv.pl
-+++ magics++-2.30.0/tools/xml2mv.pl
+--- magics++-2.31.0.orig/tools/xml2mv.pl
++++ magics++-2.31.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 eeebfa5..8f5fc8a 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.30.0/apps/MagMLInterpretor/magjson-script.in
+Index: magics++-2.31.0/apps/MagMLInterpretor/magjson-script.in
===================================================================
---- magics++-2.30.0.orig/apps/MagMLInterpretor/magjson-script.in
-+++ magics++-2.30.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
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.30.0/apps/MagMLInterpretor/magml-script.in
+Index: magics++-2.31.0/apps/MagMLInterpretor/magml-script.in
===================================================================
---- magics++-2.30.0.orig/apps/MagMLInterpretor/magml-script.in
-+++ magics++-2.30.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
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.30.0/apps/metgram/metgram-script.in
+Index: magics++-2.31.0/apps/metgram/metgram-script.in
===================================================================
---- magics++-2.30.0.orig/apps/metgram/metgram-script.in
-+++ magics++-2.30.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
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
diff --git a/debian/patches/soname-version.patch b/debian/patches/soname-version.patch
index 9d3b0b8..e322fd6 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.30.0/src/CMakeLists.txt
+Index: magics++-2.31.0/src/CMakeLists.txt
===================================================================
---- magics++-2.30.0.orig/src/CMakeLists.txt
-+++ magics++-2.30.0/src/CMakeLists.txt
+--- magics++-2.31.0.orig/src/CMakeLists.txt
++++ magics++-2.31.0/src/CMakeLists.txt
@@ -122,6 +122,9 @@ ecbuild_add_library( TARGET MagPlus
${common_templates}
DEFINITIONS
@@ -36,16 +36,16 @@ Index: magics++-2.30.0/src/CMakeLists.txt
TYPE SHARED )
if ( BUILD_SHARED_LIBS STREQUAL "BOTH" )
-Index: magics++-2.30.0/cmake/ecbuild_add_library.cmake
+Index: magics++-2.31.0/cmake/ecbuild_add_library.cmake
===================================================================
---- magics++-2.30.0.orig/cmake/ecbuild_add_library.cmake
-+++ magics++-2.30.0/cmake/ecbuild_add_library.cmake
-@@ -148,7 +148,7 @@
+--- magics++-2.31.0.orig/cmake/ecbuild_add_library.cmake
++++ magics++-2.31.0/cmake/ecbuild_add_library.cmake
+@@ -155,7 +155,7 @@
function( ecbuild_add_library_impl )
- set( options NOINSTALL AUTO_VERSION )
-- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME )
-+ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION OUTPUT_NAME SONAME SOVERSION)
+ set( options NOINSTALL AUTO_VERSION AUTO_SOVERSION )
+- set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SOVERSION OUTPUT_NAME )
++ set( single_value_args TARGET TYPE COMPONENT INSTALL_HEADERS INSTALL_HEADERS_REGEX LINKER_LANGUAGE HEADER_DESTINATION VERSION SOVERSION OUTPUT_NAME SONAME SOVERSION )
set( multi_value_args SOURCES SOURCES_GLOB SOURCES_EXCLUDE_REGEX OBJECTS TEMPLATES LIBS INCLUDES PRIVATE_INCLUDES PUBLIC_INCLUDES DEPENDS PERSISTENT DEFINITIONS INSTALL_HEADERS_LIST CFLAGS CXXFLAGS FFLAGS GENERATED CONDITION )
cmake_parse_arguments( _PAR "${options}" "${single_value_args}" "${multi_value_args}" ${_FIRST_ARG} ${ARGN} )
diff --git a/debian/patches/terralib.patch b/debian/patches/terralib.patch
index 755f0ec..ac86b16 100644
--- a/debian/patches/terralib.patch
+++ b/debian/patches/terralib.patch
@@ -3,10 +3,10 @@ Description: Add Debians libterralib, rather than built-in version
Last-Updated: 2016-07-08
Forwarded: not-needed
-Index: magics++-2.30.0/src/CMakeLists.txt
+Index: magics++-2.31.0/src/CMakeLists.txt
===================================================================
---- magics++-2.30.0.orig/src/CMakeLists.txt
-+++ magics++-2.30.0/src/CMakeLists.txt
+--- magics++-2.31.0.orig/src/CMakeLists.txt
++++ magics++-2.31.0/src/CMakeLists.txt
@@ -92,7 +92,6 @@ add_subdirectory( web )
add_subdirectory( visualisers )
add_subdirectory( drivers )
diff --git a/debian/patches/unique-ptr.patch b/debian/patches/unique-ptr.patch
index 1f1c765..62128df 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.30.0/src/basic/ParameterSettings.cc
+Index: magics++-2.31.0/src/basic/ParameterSettings.cc
===================================================================
---- magics++-2.30.0.orig/src/basic/ParameterSettings.cc
-+++ magics++-2.30.0/src/basic/ParameterSettings.cc
+--- magics++-2.31.0.orig/src/basic/ParameterSettings.cc
++++ magics++-2.31.0/src/basic/ParameterSettings.cc
@@ -51,7 +51,7 @@ void setAttribute(const vector<string>&
}
}
@@ -26,10 +26,10 @@ Index: magics++-2.30.0/src/basic/ParameterSettings.cc
}
}
-Index: magics++-2.30.0/src/basic/ParameterSettings.h
+Index: magics++-2.31.0/src/basic/ParameterSettings.h
===================================================================
---- magics++-2.30.0.orig/src/basic/ParameterSettings.h
-+++ magics++-2.30.0/src/basic/ParameterSettings.h
+--- magics++-2.31.0.orig/src/basic/ParameterSettings.h
++++ magics++-2.31.0/src/basic/ParameterSettings.h
@@ -24,10 +24,10 @@
#include <Colour.h>
@@ -79,10 +79,10 @@ Index: magics++-2.30.0/src/basic/ParameterSettings.h
MagLog::debug() << "Parameter [" << name << "] set to " << val->second << endl;
}
catch (...) {
-Index: magics++-2.30.0/src/decoders/GribDecoder.cc
+Index: magics++-2.31.0/src/decoders/GribDecoder.cc
===================================================================
---- magics++-2.30.0.orig/src/decoders/GribDecoder.cc
-+++ magics++-2.30.0/src/decoders/GribDecoder.cc
+--- magics++-2.31.0.orig/src/decoders/GribDecoder.cc
++++ magics++-2.31.0/src/decoders/GribDecoder.cc
@@ -90,7 +90,7 @@ void GribDecoder::set(const GribLoop& lo
index_ = loop.uniqueId_;
interpolation_method_ = loop.interpolation_method_;
@@ -101,10 +101,10 @@ Index: magics++-2.30.0/src/decoders/GribDecoder.cc
interpretor_->scaling(*this, scaling, offset,oriUnits,derivedUnits);
if(scaling==1 && offset == 0)
{
-Index: magics++-2.30.0/src/decoders/TitleTemplate.cc
+Index: magics++-2.31.0/src/decoders/TitleTemplate.cc
===================================================================
---- magics++-2.30.0.orig/src/decoders/TitleTemplate.cc
-+++ magics++-2.30.0/src/decoders/TitleTemplate.cc
+--- magics++-2.31.0.orig/src/decoders/TitleTemplate.cc
++++ magics++-2.31.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.30.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.30.0/src/decoders/TitleTemplate.h
+Index: magics++-2.31.0/src/decoders/TitleTemplate.h
===================================================================
---- magics++-2.30.0.orig/src/decoders/TitleTemplate.h
-+++ magics++-2.30.0/src/decoders/TitleTemplate.h
+--- magics++-2.31.0.orig/src/decoders/TitleTemplate.h
++++ magics++-2.31.0/src/decoders/TitleTemplate.h
@@ -122,7 +122,7 @@ public:
#ifdef MAGICS_EXCEPTION
try
@@ -127,10 +127,10 @@ Index: magics++-2.30.0/src/decoders/TitleTemplate.h
(*object)(*(*entry), lines, data);
}
catch (NoFactoryException& e)
-Index: magics++-2.30.0/src/libMagWrapper/MagPlus.cc
+Index: magics++-2.31.0/src/libMagWrapper/MagPlus.cc
===================================================================
---- magics++-2.30.0.orig/src/libMagWrapper/MagPlus.cc
-+++ magics++-2.30.0/src/libMagWrapper/MagPlus.cc
+--- magics++-2.31.0.orig/src/libMagWrapper/MagPlus.cc
++++ magics++-2.31.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.30.0/src/libMagWrapper/MagPlus.cc
node->getReady();
//top()->legend(node);
if ( geographical_ ) {
-Index: magics++-2.30.0/src/magics.h
+Index: magics++-2.31.0/src/magics.h
===================================================================
---- magics++-2.30.0.orig/src/magics.h
-+++ magics++-2.30.0/src/magics.h
+--- magics++-2.31.0.orig/src/magics.h
++++ magics++-2.31.0/src/magics.h
@@ -106,7 +106,7 @@ using std::pair;
//using std::list;
using std::map;
@@ -171,20 +171,11 @@ Index: magics++-2.30.0/src/magics.h
#include <exception>
-Index: magics++-2.30.0/src/visualisers/AutomaticContourMethod.h
+Index: magics++-2.31.0/src/visualisers/AutomaticContourMethod.h
===================================================================
---- magics++-2.30.0.orig/src/visualisers/AutomaticContourMethod.h
-+++ magics++-2.30.0/src/visualisers/AutomaticContourMethod.h
-@@ -228,7 +228,7 @@ public:
- //SampleContourMethod *am = static_cast < SampleContourMethod *> (MagTranslator<string, ContourMethod >()("sampling"));
- SampleContourMethod *am =new SampleContourMethod();
-
-- auto_ptr<SampleContourMethod > pSampleContourMethod(am);
-+ unique_ptr<SampleContourMethod > pSampleContourMethod(am);
-
- pSampleContourMethod->setX (nSampleX);
- pSampleContourMethod->setY (nSampleY);
-@@ -245,7 +245,7 @@ public:
+--- magics++-2.31.0.orig/src/visualisers/AutomaticContourMethod.h
++++ magics++-2.31.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)) {
ContourMethod* cm = MagTranslator<string, ContourMethod >()("linear");
@@ -193,7 +184,7 @@ Index: magics++-2.30.0/src/visualisers/AutomaticContourMethod.h
pMatrixHandler = pContourMethod->handler(matrix, owner);
-@@ -255,7 +255,7 @@ public:
+@@ -215,7 +215,7 @@ public:
data.hasMissingValues())
{
ContourMethod* cm = MagTranslator<string, ContourMethod >()("linear");
@@ -202,7 +193,7 @@ Index: magics++-2.30.0/src/visualisers/AutomaticContourMethod.h
pMatrixHandler = pContourMethod->handler(matrix, owner);
-@@ -266,7 +266,7 @@ public:
+@@ -226,7 +226,7 @@ public:
else
{
Akima760Method *am = static_cast < Akima760Method *> (MagTranslator<string, ContourMethod >()("akima760"));
@@ -211,10 +202,10 @@ Index: magics++-2.30.0/src/visualisers/AutomaticContourMethod.h
pAkima760Method->resolutionX_ = (fContourResolutionX);
pAkima760Method->resolutionY_ = (fContourResolutionY);
-Index: magics++-2.30.0/src/visualisers/CalculateColourTechnique.cc
+Index: magics++-2.31.0/src/visualisers/CalculateColourTechnique.cc
===================================================================
---- magics++-2.30.0.orig/src/visualisers/CalculateColourTechnique.cc
-+++ magics++-2.30.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
void CalculateColourTechnique::set(const ColourTechniqueInterface& attributes)
@@ -226,10 +217,10 @@ Index: magics++-2.30.0/src/visualisers/CalculateColourTechnique.cc
direction_ = attributes.getDirection();
}
-Index: magics++-2.30.0/src/visualisers/LabelPlotting.cc
+Index: magics++-2.31.0/src/visualisers/LabelPlotting.cc
===================================================================
---- magics++-2.30.0.orig/src/visualisers/LabelPlotting.cc
-+++ magics++-2.30.0/src/visualisers/LabelPlotting.cc
+--- magics++-2.31.0.orig/src/visualisers/LabelPlotting.cc
++++ magics++-2.31.0/src/visualisers/LabelPlotting.cc
@@ -41,7 +41,7 @@ void LabelPlotting::prepare(NoGridPlotti
if ( *colour_ == "UNDEFINED" ) {
@@ -239,10 +230,10 @@ Index: magics++-2.30.0/src/visualisers/LabelPlotting.cc
}
if ( longitudes_.empty() )
-Index: magics++-2.30.0/tools/xml2cc.pl
+Index: magics++-2.31.0/tools/xml2cc.pl
===================================================================
---- magics++-2.30.0.orig/tools/xml2cc.pl
-+++ magics++-2.30.0/tools/xml2cc.pl
+--- magics++-2.31.0.orig/tools/xml2cc.pl
++++ magics++-2.31.0/tools/xml2cc.pl
@@ -298,7 +298,7 @@ EOF
}
else
@@ -261,10 +252,10 @@ Index: magics++-2.30.0/tools/xml2cc.pl
}
print "";
-Index: magics++-2.30.0/tools/xml2cc.pl.workshop
+Index: magics++-2.31.0/tools/xml2cc.pl.workshop
===================================================================
---- magics++-2.30.0.orig/tools/xml2cc.pl.workshop
-+++ magics++-2.30.0/tools/xml2cc.pl.workshop
+--- magics++-2.31.0.orig/tools/xml2cc.pl.workshop
++++ magics++-2.31.0/tools/xml2cc.pl.workshop
@@ -315,7 +315,7 @@ EOF
{
print <<EOF;
@@ -283,10 +274,10 @@ Index: magics++-2.30.0/tools/xml2cc.pl.workshop
}
}
-Index: magics++-2.30.0/tools/xml2mv.pl
+Index: magics++-2.31.0/tools/xml2mv.pl
===================================================================
---- magics++-2.30.0.orig/tools/xml2mv.pl
-+++ magics++-2.30.0/tools/xml2mv.pl
+--- magics++-2.31.0.orig/tools/xml2mv.pl
++++ magics++-2.31.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