[magics] 03/07: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jun 23 13:34:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/2.33.0-1
in repository magics.
commit 180bff7ee7a246fe75de9c72cfa61d2a3c274389
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu May 25 11:56:51 2017 +0100
refresh patches
---
debian/patches/cmake-config.patch | 6 +-
debian/patches/fix-warnings.patch | 6 +-
debian/patches/numpy-fixes.patch | 12 +-
debian/patches/pkgconfig-fix.patch | 12 +-
debian/patches/python3.patch | 234 +++++++++--------------------------
debian/patches/reproducibility.patch | 12 +-
debian/patches/rm-ksh.patch | 18 +--
debian/patches/soname-version.patch | 27 +---
debian/patches/terralib.patch | 6 +-
debian/patches/unique-ptr.patch | 80 ++++++------
10 files changed, 137 insertions(+), 276 deletions(-)
diff --git a/debian/patches/cmake-config.patch b/debian/patches/cmake-config.patch
index c6a8509..abfb3e0 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.32.0/cmake/project-config.cmake.in
+Index: magics++-2.33.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
+--- magics++-2.33.0.orig/cmake/project-config.cmake.in
++++ magics++-2.33.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/fix-warnings.patch b/debian/patches/fix-warnings.patch
index 415eb64..c732d31 100644
--- a/debian/patches/fix-warnings.patch
+++ b/debian/patches/fix-warnings.patch
@@ -1,7 +1,7 @@
-Index: magics++-2.32.0/src/magics_config.h.in
+Index: magics++-2.33.0/src/magics_config.h.in
===================================================================
---- magics++-2.32.0.orig/src/magics_config.h.in
-+++ magics++-2.32.0/src/magics_config.h.in
+--- magics++-2.33.0.orig/src/magics_config.h.in
++++ magics++-2.33.0/src/magics_config.h.in
@@ -80,7 +80,9 @@
#cmakedefine MAGICS_COPYRIGHT_PERIOD
diff --git a/debian/patches/numpy-fixes.patch b/debian/patches/numpy-fixes.patch
index eca5a23..ad29e71 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.32.0/python/numpy.i
+Index: magics++-2.33.0/python/numpy.i
===================================================================
---- magics++-2.32.0.orig/python/numpy.i
-+++ magics++-2.32.0/python/numpy.i
+--- magics++-2.33.0.orig/python/numpy.i
++++ magics++-2.33.0/python/numpy.i
@@ -1,11 +1,46 @@
/* -*- C -*- (not really, but good for syntax highlighting) */
+
@@ -2482,10 +2482,10 @@ Index: magics++-2.32.0/python/numpy.i
+#endif
#endif /* SWIGPYTHON */
-Index: magics++-2.32.0/python/Magics.i.in
+Index: magics++-2.33.0/python/Magics.i.in
===================================================================
---- magics++-2.32.0.orig/python/Magics.i.in
-+++ magics++-2.32.0/python/Magics.i.in
+--- magics++-2.33.0.orig/python/Magics.i.in
++++ magics++-2.33.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 4e4c797..207e556 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.32.0/cmake/ecbuild_pkgconfig.cmake
+Index: magics++-2.33.0/cmake/ecbuild_pkgconfig.cmake
===================================================================
---- magics++-2.32.0.orig/cmake/ecbuild_pkgconfig.cmake
-+++ magics++-2.32.0/cmake/ecbuild_pkgconfig.cmake
+--- magics++-2.33.0.orig/cmake/ecbuild_pkgconfig.cmake
++++ magics++-2.33.0/cmake/ecbuild_pkgconfig.cmake
@@ -12,8 +12,11 @@
# to CMake variable ${dependencies}
function( ecbuild_library_dependencies dependencies libraries )
@@ -19,10 +19,10 @@ Index: magics++-2.32.0/cmake/ecbuild_pkgconfig.cmake
foreach( _lib ${_libraries})
unset( _location )
-Index: magics++-2.32.0/CMakeLists.txt
+Index: magics++-2.33.0/CMakeLists.txt
===================================================================
---- magics++-2.32.0.orig/CMakeLists.txt
-+++ magics++-2.32.0/CMakeLists.txt
+--- magics++-2.33.0.orig/CMakeLists.txt
++++ magics++-2.33.0/CMakeLists.txt
@@ -346,7 +346,12 @@ ecbuild_add_resources( TARGET internal
set( MAGICS_DESCRIPTION "Multi-platform meteorological graphics library" )
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 9ed7d95..9992dce 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.32.0/tools/axis2doc.py
+Index: magics++-2.33.0/tools/axis2doc.py
===================================================================
---- magics++-2.32.0.orig/tools/axis2doc.py
-+++ magics++-2.32.0/tools/axis2doc.py
+--- magics++-2.33.0.orig/tools/axis2doc.py
++++ magics++-2.33.0/tools/axis2doc.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -260,10 +260,10 @@ Index: magics++-2.32.0/tools/axis2doc.py
-createAction("wind", "Wind", ["wind.xml"])
+createAction("wind", "Wind", ["wind.xml"])
-Index: magics++-2.32.0/tools/beau.py
+Index: magics++-2.33.0/tools/beau.py
===================================================================
---- magics++-2.32.0.orig/tools/beau.py
-+++ magics++-2.32.0/tools/beau.py
+--- magics++-2.33.0.orig/tools/beau.py
++++ magics++-2.33.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.32.0/tools/beau.py
+print (pretty_xml_as_string)
-Index: magics++-2.32.0/tools/xml2doc.py
+Index: magics++-2.33.0/tools/xml2doc.py
===================================================================
---- magics++-2.32.0.orig/tools/xml2doc.py
-+++ magics++-2.32.0/tools/xml2doc.py
+--- magics++-2.33.0.orig/tools/xml2doc.py
++++ magics++-2.33.0/tools/xml2doc.py
@@ -1,20 +1,17 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -408,10 +408,10 @@ Index: magics++-2.32.0/tools/xml2doc.py
s = self.types[param["type"]](self, param)
definition.write(s)
definition.write( "</font></tbody>\n")
-Index: magics++-2.32.0/tools/xml2html.py
+Index: magics++-2.33.0/tools/xml2html.py
===================================================================
---- magics++-2.32.0.orig/tools/xml2html.py
-+++ magics++-2.32.0/tools/xml2html.py
+--- magics++-2.33.0.orig/tools/xml2html.py
++++ magics++-2.33.0/tools/xml2html.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -610,10 +610,10 @@ Index: magics++-2.32.0/tools/xml2html.py
f = open('coast.json', "w")
f.write(json.dumps(magics, indent=1))
-
-Index: magics++-2.32.0/tools/xml2odt.py
+Index: magics++-2.33.0/tools/xml2odt.py
===================================================================
---- magics++-2.32.0.orig/tools/xml2odt.py
-+++ magics++-2.32.0/tools/xml2odt.py
+--- magics++-2.33.0.orig/tools/xml2odt.py
++++ magics++-2.33.0/tools/xml2odt.py
@@ -1,12 +1,12 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -682,10 +682,10 @@ Index: magics++-2.32.0/tools/xml2odt.py
object = ObjectHandler()
-Index: magics++-2.32.0/tools/xml2split.py
+Index: magics++-2.33.0/tools/xml2split.py
===================================================================
---- magics++-2.32.0.orig/tools/xml2split.py
-+++ magics++-2.32.0/tools/xml2split.py
+--- magics++-2.33.0.orig/tools/xml2split.py
++++ magics++-2.33.0/tools/xml2split.py
@@ -7,7 +7,7 @@
# does it submit to any jurisdiction.
@@ -720,10 +720,10 @@ Index: magics++-2.32.0/tools/xml2split.py
if ( self.open_file == 0):
return
-Index: magics++-2.32.0/tools/xml2mv.py
+Index: magics++-2.33.0/tools/xml2mv.py
===================================================================
---- magics++-2.32.0.orig/tools/xml2mv.py
-+++ magics++-2.32.0/tools/xml2mv.py
+--- magics++-2.33.0.orig/tools/xml2mv.py
++++ magics++-2.33.0/tools/xml2mv.py
@@ -1,12 +1,13 @@
#!/usr/bin/env python
# (C) Copyright 1996-2016 ECMWF.
@@ -741,17 +741,6 @@ Index: magics++-2.32.0/tools/xml2mv.py
from xml.sax.handler import ContentHandler
from xml.sax import make_parser
from types import *
-@@ -15,8 +16,8 @@ import sys
-
-
- if(len(sys.argv) != 6) :
-- print "\n\tYou need to give 4 input parameters:"
-- print "\n\t %s source.xml targetDef CLASS_NAME rulesDef\n" % sys.argv[0]
-+ print ("\n\tYou need to give 4 input parameters:")
-+ print ("\n\t %s source.xml targetDef CLASS_NAME rulesDef\n" % sys.argv[0])
- sys.exit()
-
-
@@ -81,7 +82,7 @@ class ObjectHandler(ContentHandler):
def default(self, attrs):
@@ -818,15 +807,6 @@ Index: magics++-2.32.0/tools/xml2mv.py
# does this rule unset something that is needed in the optionalparams3 rules?
unsetparams2 = self.optionalparams2[conditions2]
newtuple3 = (conditions2, unsetparams2)
-@@ -382,7 +383,7 @@ class ObjectHandler(ContentHandler):
-
- # we now know that the clause should go into position 'position' in the new tuple
- if self.debug:
-- print "put into position " + str(position)
-+ print ("put into position " + str(position))
- if position == 0:
- firstpart = ()
- secondpart = (newtuple3,)
@@ -403,7 +404,7 @@ class ObjectHandler(ContentHandler):
@@ -836,76 +816,6 @@ Index: magics++-2.32.0/tools/xml2mv.py
self.classes[c] = {"inherits_reqs_from": set(), # 'inherits_params_from' is an empty set
"inherits_params_from": set()}
#print "newClass " + c
-@@ -445,7 +446,7 @@ class ObjectHandler(ContentHandler):
- params = self.classes[c].get("params", ())
- for p in params:
- x = reqs
-- if x <> ():
-+ if x != ():
- self.addOptionalParam(p, x)
- #self.addOptionalParam(p, (x,))
-
-@@ -463,11 +464,11 @@ class ObjectHandler(ContentHandler):
- #print spaces + "enter rec, class = " + classname
- for parent in i:
- #print parent
-- if parent <> None:
-+ if parent != None:
- reqs = self.addRecursiveInheritedClassRequirements(parent, reclevel+1)
- #print spaces + "reqs: "
- #print reqs
-- if reqs <> None:
-+ if reqs != None:
- for req in reqs:
- #print "ADDING REQ FROM RECURSIVE"
- self.addRequirementToClass(req[0], req[1], classname)
-@@ -489,11 +490,11 @@ class ObjectHandler(ContentHandler):
- #print spaces + "enter rec, class = " + classname
- for parent in i:
- #print parent
-- if parent <> None:
-+ if parent != None:
- params = self.addRecursiveInheritedClassParams(parent, reclevel+1)
- #print spaces + "reqs: "
- #print reqs
-- if params <> None:
-+ if params != None:
- for params in params:
- #print "ADDING REQ FROM RECURSIVE"
- self.addParamsFromOneClassToAnother(parent, classname)
-@@ -540,7 +541,7 @@ class ObjectHandler(ContentHandler):
- try:
- file = open(fname, "r")
- if (self.debug):
-- print "Opened (start class)" + fname
-+ print ("Opened (start class)" + fname)
- self.filehistory.append(fname)
- object = ObjectHandler()
- object.myoptions = []
-@@ -576,17 +577,17 @@ class ObjectHandler(ContentHandler):
- return
- if (attrs.get("inherit_parent_reqs") != 'no'):
- docclass = attrs.get("doc_class", None)
-- if docclass <> None:
-+ if docclass != None:
- paramclass = docclass
- else:
- paramclass = self.classname
- self.addParameterToClass(self.param, paramclass)
-- type = attrs.get("to")
-+ typ = attrs.get("to")
- metview_type = attrs.get("metview_interface")
-- if metview_type <> None:
-- type = metview_type
-- if (self.types.has_key(type)):
-- f = self.types[type]
-+ if metview_type != None:
-+ typ = metview_type
-+ if typ in self.types:
-+ f = self.types[typ]
- self.newparam(self.param, f(self, attrs), self.default(attrs))
- else:
- self.last = self.last + self.options(attrs)
@@ -613,7 +614,7 @@ class ObjectHandler(ContentHandler):
# self.classes[attrs.get("name")]["inherits_reqs_from"].add(self.classname)
# print "YClass " + attrs.get("name") + " inherits_reqs_from " + self.classname
@@ -915,32 +825,6 @@ Index: magics++-2.32.0/tools/xml2mv.py
fname = "/%s.xml" % attrs.get("xmlfile")
else:
fname = "%s/%s.xml" % (sys.argv[1], attrs.get("name"))
-@@ -622,7 +623,7 @@ class ObjectHandler(ContentHandler):
- file = open(fname, "r")
- self.filehistory.append(fname)
- if (self.debug):
-- print "Opened (start option) " + fname
-+ print ("Opened (start option) " + fname)
- object = ObjectHandler()
- object.myoptions = []
- object.myrules = {}
-@@ -675,13 +676,13 @@ class ObjectHandler(ContentHandler):
- self.last = self.last + "\t} = %s\n" % self.defparam
- self.newparam(self.param, self.last, self.defparam)
- if (self.debug) :
-- print " endparam: " + self.param
-- print " endparam SL: \n" + self.last
-+ print (" endparam: " + self.param)
-+ print (" endparam SL: \n" + self.last)
- self.last = ""
- for option in self.myoptions:
- for p in option:
- #print " adding newparam from option: " + p[0]
-- self.newparam(p[0], p[1], p[2])
-+ self.newparam(p[0], p[1], p[2])
- self.myoptions = []
- for rules in self.myrules:
- current = rules
@@ -694,7 +695,7 @@ class ObjectHandler(ContentHandler):
except:
pass
@@ -970,16 +854,10 @@ Index: magics++-2.32.0/tools/xml2mv.py
rules.write("\n%if")
first = True
prevparam = ""
-@@ -853,4 +854,4 @@ saxparser.setContentHandler(object)
-
- datasource = open(sys.argv[1] +"/" + sys.argv[2], "r")
- saxparser.parse(datasource)
--print "DONE"
-+print ("DONE")
-Index: magics++-2.32.0/python/Magics/macro.py
+Index: magics++-2.33.0/python/Magics/macro.py
===================================================================
---- magics++-2.32.0.orig/python/Magics/macro.py
-+++ magics++-2.32.0/python/Magics/macro.py
+--- magics++-2.33.0.orig/python/Magics/macro.py
++++ magics++-2.33.0/python/Magics/macro.py
@@ -1,3 +1,4 @@
+
# (C) Copyright 1996-2016 ECMWF.
@@ -1241,7 +1119,7 @@ Index: magics++-2.32.0/python/Magics/macro.py
odb_xypoints = make_action("odb_xypoints", Magics.odb, "Odbviewer")
odb_xyvectors = make_action("odb_xyvectors", Magics.odb, "Odbviewer")
pmap = make_action("pmap", None, "Subpage")
-@@ -458,20 +468,20 @@ def _plot(*args):
+@@ -459,20 +469,20 @@ def _plot(*args):
def tofortran(file, *args):
f = open(file+".f90",'w')
@@ -1268,7 +1146,7 @@ Index: magics++-2.32.0/python/Magics/macro.py
def tomv4(file, *args):
f = open(file+".mv4",'w')
-@@ -490,19 +500,19 @@ class odb_filter(object):
+@@ -491,19 +501,19 @@ class odb_filter(object):
odb = "%s.odb" % file
context.tmp.append(odb)
cmd = "odb sql -q \"" + self.args["query"] + "\" -i " + self.args["path"] + " -f newodb -o " + odb
@@ -1292,10 +1170,10 @@ Index: magics++-2.32.0/python/Magics/macro.py
os.abort();
-Index: magics++-2.32.0/python/Magics/metgram.py
+Index: magics++-2.33.0/python/Magics/metgram.py
===================================================================
---- magics++-2.32.0.orig/python/Magics/metgram.py
-+++ magics++-2.32.0/python/Magics/metgram.py
+--- magics++-2.33.0.orig/python/Magics/metgram.py
++++ magics++-2.33.0/python/Magics/metgram.py
@@ -1,11 +1,12 @@
# (C) Copyright 1996-2016 ECMWF.
-#
@@ -1736,10 +1614,10 @@ Index: magics++-2.32.0/python/Magics/metgram.py
msl = msl()
wind = wind()
-
-Index: magics++-2.32.0/test/cairo.py
+Index: magics++-2.33.0/test/cairo.py
===================================================================
---- magics++-2.32.0.orig/test/cairo.py
-+++ magics++-2.32.0/test/cairo.py
+--- magics++-2.33.0.orig/test/cairo.py
++++ magics++-2.33.0/test/cairo.py
@@ -8,6 +8,8 @@
# importing Magics module
@@ -1758,10 +1636,10 @@ Index: magics++-2.32.0/test/cairo.py
plot( output, europe, coast, )
tofortran(ref, output, europe, coast, )
-Index: magics++-2.32.0/test/bufr.py
+Index: magics++-2.33.0/test/bufr.py
===================================================================
---- magics++-2.32.0.orig/test/bufr.py
-+++ magics++-2.32.0/test/bufr.py
+--- magics++-2.33.0.orig/test/bufr.py
++++ magics++-2.33.0/test/bufr.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1779,10 +1657,10 @@ Index: magics++-2.32.0/test/bufr.py
plot( output, europe, obs, coast, )
tofortran(ref, output, europe, obs, coast, )
-Index: magics++-2.32.0/test/coast.py
+Index: magics++-2.33.0/test/coast.py
===================================================================
---- magics++-2.32.0.orig/test/coast.py
-+++ magics++-2.32.0/test/coast.py
+--- magics++-2.33.0.orig/test/coast.py
++++ magics++-2.33.0/test/coast.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1791,10 +1669,10 @@ Index: magics++-2.32.0/test/coast.py
from Magics.macro import *
-Index: magics++-2.32.0/test/grib.py
+Index: magics++-2.33.0/test/grib.py
===================================================================
---- magics++-2.32.0.orig/test/grib.py
-+++ magics++-2.32.0/test/grib.py
+--- magics++-2.33.0.orig/test/grib.py
++++ magics++-2.33.0/test/grib.py
@@ -8,6 +8,7 @@
# importing Magics module
@@ -1812,10 +1690,10 @@ Index: magics++-2.32.0/test/grib.py
plot( output, europe, data, cont, coast, title)
-Index: magics++-2.32.0/python/Magics.i.in
+Index: magics++-2.33.0/python/Magics.i.in
===================================================================
---- magics++-2.32.0.orig/python/Magics.i.in
-+++ magics++-2.32.0/python/Magics.i.in
+--- magics++-2.33.0.orig/python/Magics.i.in
++++ magics++-2.33.0/python/Magics.i.in
@@ -22,6 +22,18 @@
int i = 0;
$1 = (char **) malloc((size+1)*sizeof(char *));
@@ -1843,10 +1721,10 @@ Index: magics++-2.32.0/python/Magics.i.in
$1[i] = 0;
}
else
-Index: magics++-2.32.0/python/Magics/toolbox.py
+Index: magics++-2.33.0/python/Magics/toolbox.py
===================================================================
---- magics++-2.32.0.orig/python/Magics/toolbox.py
-+++ magics++-2.32.0/python/Magics/toolbox.py
+--- magics++-2.33.0.orig/python/Magics/toolbox.py
++++ magics++-2.33.0/python/Magics/toolbox.py
@@ -1,13 +1,11 @@
-
-import macro
@@ -1910,10 +1788,10 @@ Index: magics++-2.32.0/python/Magics/toolbox.py
actions
)
-Index: magics++-2.32.0/utils/epsgrams.py
+Index: magics++-2.33.0/utils/epsgrams.py
===================================================================
---- magics++-2.32.0.orig/utils/epsgrams.py
-+++ magics++-2.32.0/utils/epsgrams.py
+--- magics++-2.33.0.orig/utils/epsgrams.py
++++ magics++-2.33.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.
@@ -1954,10 +1832,10 @@ Index: magics++-2.32.0/utils/epsgrams.py
return 1
-Index: magics++-2.32.0/utils/plumes.py
+Index: magics++-2.33.0/utils/plumes.py
===================================================================
---- magics++-2.32.0.orig/utils/plumes.py
-+++ magics++-2.32.0/utils/plumes.py
+--- magics++-2.33.0.orig/utils/plumes.py
++++ magics++-2.33.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.
@@ -2015,10 +1893,10 @@ Index: magics++-2.32.0/utils/plumes.py
return 1
-Index: magics++-2.32.0/python/Magics/__init__.py
+Index: magics++-2.33.0/python/Magics/__init__.py
===================================================================
---- magics++-2.32.0.orig/python/Magics/__init__.py
-+++ magics++-2.32.0/python/Magics/__init__.py
+--- magics++-2.33.0.orig/python/Magics/__init__.py
++++ magics++-2.33.0/python/Magics/__init__.py
@@ -1 +1 @@
-from Magics import *
+from .Magics import *
diff --git a/debian/patches/reproducibility.patch b/debian/patches/reproducibility.patch
index 9d96adc..a13ac1b 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.32.0/tools/xml2cc.pl
+Index: magics++-2.33.0/tools/xml2cc.pl
===================================================================
---- magics++-2.32.0.orig/tools/xml2cc.pl
-+++ magics++-2.32.0/tools/xml2cc.pl
+--- magics++-2.33.0.orig/tools/xml2cc.pl
++++ magics++-2.33.0/tools/xml2cc.pl
@@ -10,6 +10,11 @@
use XML::Parser;
@@ -32,10 +32,10 @@ Index: magics++-2.32.0/tools/xml2cc.pl
{
print "#include \"$i.h\"\n";
}
-Index: magics++-2.32.0/tools/xml2mv.pl
+Index: magics++-2.33.0/tools/xml2mv.pl
===================================================================
---- magics++-2.32.0.orig/tools/xml2mv.pl
-+++ magics++-2.32.0/tools/xml2mv.pl
+--- magics++-2.33.0.orig/tools/xml2mv.pl
++++ magics++-2.33.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 39b4089..fac7a08 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.32.0/apps/MagMLInterpretor/magjson-script.in
+Index: magics++-2.33.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
+--- magics++-2.33.0.orig/apps/MagMLInterpretor/magjson-script.in
++++ magics++-2.33.0/apps/MagMLInterpretor/magjson-script.in
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.32.0/apps/MagMLInterpretor/magml-script.in
+Index: magics++-2.33.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
+--- magics++-2.33.0.orig/apps/MagMLInterpretor/magml-script.in
++++ magics++-2.33.0/apps/MagMLInterpretor/magml-script.in
@@ -1,4 +1,4 @@
-#!/bin/ksh
+#!/bin/sh
#set -x
# Platform dependent variables
-Index: magics++-2.32.0/apps/metgram/metgram-script.in
+Index: magics++-2.33.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
+--- magics++-2.33.0.orig/apps/metgram/metgram-script.in
++++ magics++-2.33.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 b63c147..094a942 100644
--- a/debian/patches/soname-version.patch
+++ b/debian/patches/soname-version.patch
@@ -3,26 +3,24 @@ Description: Add versioned soname for Debian.
Forwarded: no
Last-Updated: 2015-06-19
-Index: magics++-2.32.0/src/CMakeLists.txt
+Index: magics++-2.33.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
+--- magics++-2.33.0.orig/src/CMakeLists.txt
++++ magics++-2.33.0/src/CMakeLists.txt
+@@ -122,6 +122,8 @@ ecbuild_add_library( TARGET MagPlus
${common_templates}
DEFINITIONS
${MAGICS_EXTRA_DEFINITIONS} MAGICS_EXCEPTION=on
+ VERSION 3.0.0
-+ SONAME libMagPlus.so.3
+ SOVERSION 3
LIBS
${MAGICS_EXTRA_LIBRARIES}
TYPE SHARED )
-@@ -129,11 +132,18 @@ ecbuild_add_library( TARGET MagPlus
+@@ -129,11 +131,15 @@ ecbuild_add_library( TARGET MagPlus
ecbuild_add_library( TARGET MagPlusSingle
SOURCES MagicsSingle.cc
LIBS MagPlus
+ VERSION 3.0.0
-+ SONAME libMagPlusSingle.so.3
+ SOVERSION 3
TYPE SHARED )
@@ -30,22 +28,7 @@ Index: magics++-2.32.0/src/CMakeLists.txt
SOURCES MagicsDouble.cc
LIBS MagPlus
+ VERSION 3.0.0
-+ SONAME libMagPlusDouble.so.3
+ SOVERSION 3
-+
TYPE SHARED )
if ( BUILD_SHARED_LIBS STREQUAL "BOTH" )
-Index: magics++-2.32.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 )
-
- 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 ac86b16..7b5f0ee 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.31.0/src/CMakeLists.txt
+Index: magics++-2.33.0/src/CMakeLists.txt
===================================================================
---- magics++-2.31.0.orig/src/CMakeLists.txt
-+++ magics++-2.31.0/src/CMakeLists.txt
+--- magics++-2.33.0.orig/src/CMakeLists.txt
++++ magics++-2.33.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 f5cf6ce..7e2f1aa 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.32.0/src/basic/ParameterSettings.cc
+Index: magics++-2.33.0/src/basic/ParameterSettings.cc
===================================================================
---- magics++-2.32.0.orig/src/basic/ParameterSettings.cc
-+++ magics++-2.32.0/src/basic/ParameterSettings.cc
+--- magics++-2.33.0.orig/src/basic/ParameterSettings.cc
++++ magics++-2.33.0/src/basic/ParameterSettings.cc
@@ -51,7 +51,7 @@ void setAttribute(const vector<string>&
}
}
@@ -26,10 +26,10 @@ Index: magics++-2.32.0/src/basic/ParameterSettings.cc
}
}
-Index: magics++-2.32.0/src/basic/ParameterSettings.h
+Index: magics++-2.33.0/src/basic/ParameterSettings.h
===================================================================
---- magics++-2.32.0.orig/src/basic/ParameterSettings.h
-+++ magics++-2.32.0/src/basic/ParameterSettings.h
+--- magics++-2.33.0.orig/src/basic/ParameterSettings.h
++++ magics++-2.33.0/src/basic/ParameterSettings.h
@@ -24,10 +24,10 @@
#include <Colour.h>
@@ -79,10 +79,10 @@ Index: magics++-2.32.0/src/basic/ParameterSettings.h
MagLog::debug() << "Parameter [" << name << "] set to " << val->second << endl;
}
catch (...) {
-Index: magics++-2.32.0/src/decoders/GribDecoder.cc
+Index: magics++-2.33.0/src/decoders/GribDecoder.cc
===================================================================
---- magics++-2.32.0.orig/src/decoders/GribDecoder.cc
-+++ magics++-2.32.0/src/decoders/GribDecoder.cc
+--- magics++-2.33.0.orig/src/decoders/GribDecoder.cc
++++ magics++-2.33.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.32.0/src/decoders/GribDecoder.cc
internalIndex_ = index;
}
-@@ -1592,7 +1592,7 @@ void GribDecoder::visit(MetaDataCollecto
+@@ -1595,7 +1595,7 @@ void GribDecoder::visit(MetaDataCollecto
string representation = getString("typeOfGrid");
try
{
@@ -101,10 +101,10 @@ Index: magics++-2.32.0/src/decoders/GribDecoder.cc
interpretor_->scaling(*this, scaling, offset,oriUnits,derivedUnits);
if(scaling==1 && offset == 0)
{
-Index: magics++-2.32.0/src/decoders/TitleTemplate.cc
+Index: magics++-2.33.0/src/decoders/TitleTemplate.cc
===================================================================
---- magics++-2.32.0.orig/src/decoders/TitleTemplate.cc
-+++ magics++-2.32.0/src/decoders/TitleTemplate.cc
+--- magics++-2.33.0.orig/src/decoders/TitleTemplate.cc
++++ magics++-2.33.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.32.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.32.0/src/decoders/TitleTemplate.h
+Index: magics++-2.33.0/src/decoders/TitleTemplate.h
===================================================================
---- magics++-2.32.0.orig/src/decoders/TitleTemplate.h
-+++ magics++-2.32.0/src/decoders/TitleTemplate.h
+--- magics++-2.33.0.orig/src/decoders/TitleTemplate.h
++++ magics++-2.33.0/src/decoders/TitleTemplate.h
@@ -122,7 +122,7 @@ public:
#ifdef MAGICS_EXCEPTION
try
@@ -127,10 +127,10 @@ Index: magics++-2.32.0/src/decoders/TitleTemplate.h
(*object)(*(*entry), lines, data);
}
catch (NoFactoryException& e)
-Index: magics++-2.32.0/src/libMagWrapper/MagPlus.cc
+Index: magics++-2.33.0/src/libMagWrapper/MagPlus.cc
===================================================================
---- magics++-2.32.0.orig/src/libMagWrapper/MagPlus.cc
-+++ magics++-2.32.0/src/libMagWrapper/MagPlus.cc
+--- magics++-2.33.0.orig/src/libMagWrapper/MagPlus.cc
++++ magics++-2.33.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.32.0/src/libMagWrapper/MagPlus.cc
node->getReady();
//top()->legend(node);
if ( geographical_ ) {
-Index: magics++-2.32.0/src/magics.h
+Index: magics++-2.33.0/src/magics.h
===================================================================
---- magics++-2.32.0.orig/src/magics.h
-+++ magics++-2.32.0/src/magics.h
+--- magics++-2.33.0.orig/src/magics.h
++++ magics++-2.33.0/src/magics.h
@@ -106,7 +106,7 @@ using std::pair;
//using std::list;
using std::map;
@@ -171,10 +171,10 @@ Index: magics++-2.32.0/src/magics.h
#include <exception>
-Index: magics++-2.32.0/src/visualisers/AutomaticContourMethod.h
+Index: magics++-2.33.0/src/visualisers/AutomaticContourMethod.h
===================================================================
---- magics++-2.32.0.orig/src/visualisers/AutomaticContourMethod.h
-+++ magics++-2.32.0/src/visualisers/AutomaticContourMethod.h
+--- magics++-2.33.0.orig/src/visualisers/AutomaticContourMethod.h
++++ magics++-2.33.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,10 +202,10 @@ Index: magics++-2.32.0/src/visualisers/AutomaticContourMethod.h
pAkima760Method->resolutionX_ = (fContourResolutionX);
pAkima760Method->resolutionY_ = (fContourResolutionY);
-Index: magics++-2.32.0/src/visualisers/CalculateColourTechnique.cc
+Index: magics++-2.33.0/src/visualisers/CalculateColourTechnique.cc
===================================================================
---- magics++-2.32.0.orig/src/visualisers/CalculateColourTechnique.cc
-+++ magics++-2.32.0/src/visualisers/CalculateColourTechnique.cc
+--- magics++-2.33.0.orig/src/visualisers/CalculateColourTechnique.cc
++++ magics++-2.33.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.32.0/src/visualisers/CalculateColourTechnique.cc
direction_ = attributes.getDirection();
}
-Index: magics++-2.32.0/src/visualisers/LabelPlotting.cc
+Index: magics++-2.33.0/src/visualisers/LabelPlotting.cc
===================================================================
---- magics++-2.32.0.orig/src/visualisers/LabelPlotting.cc
-+++ magics++-2.32.0/src/visualisers/LabelPlotting.cc
+--- magics++-2.33.0.orig/src/visualisers/LabelPlotting.cc
++++ magics++-2.33.0/src/visualisers/LabelPlotting.cc
@@ -41,7 +41,7 @@ void LabelPlotting::prepare(NoGridPlotti
if ( *colour_ == "UNDEFINED" ) {
@@ -230,10 +230,10 @@ Index: magics++-2.32.0/src/visualisers/LabelPlotting.cc
}
if ( longitudes_.empty() )
-Index: magics++-2.32.0/tools/xml2cc.pl
+Index: magics++-2.33.0/tools/xml2cc.pl
===================================================================
---- magics++-2.32.0.orig/tools/xml2cc.pl
-+++ magics++-2.32.0/tools/xml2cc.pl
+--- magics++-2.33.0.orig/tools/xml2cc.pl
++++ magics++-2.33.0/tools/xml2cc.pl
@@ -298,7 +298,7 @@ EOF
}
else
@@ -252,10 +252,10 @@ Index: magics++-2.32.0/tools/xml2cc.pl
}
print "";
-Index: magics++-2.32.0/tools/xml2cc.pl.workshop
+Index: magics++-2.33.0/tools/xml2cc.pl.workshop
===================================================================
---- magics++-2.32.0.orig/tools/xml2cc.pl.workshop
-+++ magics++-2.32.0/tools/xml2cc.pl.workshop
+--- magics++-2.33.0.orig/tools/xml2cc.pl.workshop
++++ magics++-2.33.0/tools/xml2cc.pl.workshop
@@ -315,7 +315,7 @@ EOF
{
print <<EOF;
@@ -274,10 +274,10 @@ Index: magics++-2.32.0/tools/xml2cc.pl.workshop
}
}
-Index: magics++-2.32.0/tools/xml2mv.pl
+Index: magics++-2.33.0/tools/xml2mv.pl
===================================================================
---- magics++-2.32.0.orig/tools/xml2mv.pl
-+++ magics++-2.32.0/tools/xml2mv.pl
+--- magics++-2.33.0.orig/tools/xml2mv.pl
++++ magics++-2.33.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