[odb-api] 04/05: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Dec 31 11:34:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/0.17.6-1
in repository odb-api.
commit 3f34458d181751e36cb32a3e894fc7d5af7bac5b
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Dec 27 10:13:19 2017 +0000
refresh patches
---
debian/patches/py3-port.patch | 12 +--
debian/patches/python-multiarch.patch | 6 +-
debian/patches/python3.patch | 125 ++++++++++++----------------
debian/patches/shared_lib.patch | 94 ++++++++++-----------
debian/patches/size_t_32bit.patch | 12 +--
debian/patches/swap_decl.patch | 6 +-
debian/patches/unsigned-long-on-32bit.patch | 6 +-
7 files changed, 121 insertions(+), 140 deletions(-)
diff --git a/debian/patches/py3-port.patch b/debian/patches/py3-port.patch
index 0cd1c5a..9a21227 100644
--- a/debian/patches/py3-port.patch
+++ b/debian/patches/py3-port.patch
@@ -3,11 +3,11 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-08-30
Forwarded: no
-Index: odb-api-0.17.3/odb_api/src/odb_api/IteratorProxy.h
+Index: odb-api-0.17.6/odb_api/src/odb_api/IteratorProxy.h
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/IteratorProxy.h
-+++ odb-api-0.17.3/odb_api/src/odb_api/IteratorProxy.h
-@@ -187,7 +187,7 @@ public:
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/IteratorProxy.h
++++ odb-api-0.17.6/odb_api/src/odb_api/IteratorProxy.h
+@@ -189,7 +189,7 @@ public:
size_t j = 0;
for (; j < sizeof(double) && s[j]; ++j)
;
@@ -16,7 +16,7 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/IteratorProxy.h
}
case INTEGER: return PyLong_FromDouble(d);
case BITFIELD:
-@@ -205,7 +205,7 @@ public:
+@@ -207,7 +207,7 @@ public:
mask >>= 1;
}
buf[sizeof(B)] = 0;
@@ -25,7 +25,7 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/IteratorProxy.h
}
default: return PyFloat_FromDouble(d);
}
-@@ -236,22 +236,22 @@ public:
+@@ -238,22 +238,22 @@ public:
}
return l;
}
diff --git a/debian/patches/python-multiarch.patch b/debian/patches/python-multiarch.patch
index 723307d..3eb3f5f 100644
--- a/debian/patches/python-multiarch.patch
+++ b/debian/patches/python-multiarch.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-11-04
Forwarded: not-needed
-Index: odb-api-0.17.4/odb_api/src/python/odb/odbql.py
+Index: odb-api-0.17.6/odb_api/src/python/odb/odbql.py
===================================================================
---- odb-api-0.17.4.orig/odb_api/src/python/odb/odbql.py
-+++ odb-api-0.17.4/odb_api/src/python/odb/odbql.py
+--- odb-api-0.17.6.orig/odb_api/src/python/odb/odbql.py
++++ odb-api-0.17.6/odb_api/src/python/odb/odbql.py
@@ -58,8 +58,20 @@ def connect(file_name):
"""
return Connection(file_name)
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 72c89c9..219f29e 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,29 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Update: 2017-08-29
Forwarded: no
-Index: odb-api-0.17.3/odb-tools/src/migrator/pyodbdump_example.py
+Index: odb-api-0.17.6/odb_api/src/api/odbql_python_example.py
===================================================================
---- odb-api-0.17.3.orig/odb-tools/src/migrator/pyodbdump_example.py
-+++ odb-api-0.17.3/odb-tools/src/migrator/pyodbdump_example.py
-@@ -1,3 +1,4 @@
-+from __future__ import print_function
- import pyodbdump
- db = '/tmp/new_migrator/ECMA.conv'
- sql = open('/tmp/new_migrator/ECMA.conv/bigger_query.sql').read()
-@@ -6,7 +7,7 @@ sql = open('/tmp/new_migrator/ECMA.conv/
-
- def columns(db, sql):
- for r in pyodbdump.ODBReader(db, sql):
-- print dir(r)
-+ print (dir(r))
- return r
-
--print columns(db, sql)
-+print (columns(db, sql))
-Index: odb-api-0.17.3/odb_api/src/api/odbql_python_example.py
-===================================================================
---- odb-api-0.17.3.orig/odb_api/src/api/odbql_python_example.py
-+++ odb-api-0.17.3/odb_api/src/api/odbql_python_example.py
+--- odb-api-0.17.6.orig/odb_api/src/api/odbql_python_example.py
++++ odb-api-0.17.6/odb_api/src/api/odbql_python_example.py
@@ -14,7 +14,7 @@ Examples of usage of ODB API Python inte
@author Piotr Kuchta, ECMWF, August 2016
@@ -70,10 +51,10 @@ Index: odb-api-0.17.3/odb_api/src/api/odbql_python_example.py
-print "That's all, folks!"
+print ("That's all, folks!")
-Index: odb-api-0.17.3/odb_api/src/odb_api/fwrap.py
+Index: odb-api-0.17.6/odb_api/src/odb_api/fwrap.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/fwrap.py
-+++ odb-api-0.17.3/odb_api/src/odb_api/fwrap.py
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/fwrap.py
++++ odb-api-0.17.6/odb_api/src/odb_api/fwrap.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -126,10 +107,10 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/fwrap.py
global status_handling_code
return_type, function_name, params = signature
-Index: odb-api-0.17.3/odb_api/src/odb_api/test.py
+Index: odb-api-0.17.6/odb_api/src/odb_api/test.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/test.py
-+++ odb-api-0.17.3/odb_api/src/odb_api/test.py
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/test.py
++++ odb-api-0.17.6/odb_api/src/odb_api/test.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -155,10 +136,10 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/test.py
break
if __name__ == '__main__':
-Index: odb-api-0.17.3/odb_api/src/python/legacy_odb_api_python_examples.py
+Index: odb-api-0.17.6/odb_api/src/python/legacy_odb_api_python_examples.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/legacy_odb_api_python_examples.py
-+++ odb-api-0.17.3/odb_api/src/python/legacy_odb_api_python_examples.py
+--- odb-api-0.17.6.orig/odb_api/src/python/legacy_odb_api_python_examples.py
++++ odb-api-0.17.6/odb_api/src/python/legacy_odb_api_python_examples.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -193,10 +174,10 @@ Index: odb-api-0.17.3/odb_api/src/python/legacy_odb_api_python_examples.py
break
def reading_metadata_of_result_set(file_name = test_file):
-Index: odb-api-0.17.3/odb_api/src/python/legacy_test_python_odb_api.py
+Index: odb-api-0.17.6/odb_api/src/python/legacy_test_python_odb_api.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/legacy_test_python_odb_api.py
-+++ odb-api-0.17.3/odb_api/src/python/legacy_test_python_odb_api.py
+--- odb-api-0.17.6.orig/odb_api/src/python/legacy_test_python_odb_api.py
++++ odb-api-0.17.6/odb_api/src/python/legacy_test_python_odb_api.py
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -207,18 +188,18 @@ Index: odb-api-0.17.3/odb_api/src/python/legacy_test_python_odb_api.py
import odb
import unittest
-Index: odb-api-0.17.3/odb_api/src/python/odb/__init__.py
+Index: odb-api-0.17.6/odb_api/src/python/odb/__init__.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/odb/__init__.py
-+++ odb-api-0.17.3/odb_api/src/python/odb/__init__.py
+--- odb-api-0.17.6.orig/odb_api/src/python/odb/__init__.py
++++ odb-api-0.17.6/odb_api/src/python/odb/__init__.py
@@ -1,2 +1,2 @@
-from odb import *
+from .odb import *
-Index: odb-api-0.17.3/odb_api/src/python/odb/odb.py
+Index: odb-api-0.17.6/odb_api/src/python/odb/odb.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/odb/odb.py
-+++ odb-api-0.17.3/odb_api/src/python/odb/odb.py
+--- odb-api-0.17.6.orig/odb_api/src/python/odb/odb.py
++++ odb-api-0.17.6/odb_api/src/python/odb/odb.py
@@ -17,7 +17,7 @@ Functions sql and open are a legacy, uns
"""
@@ -228,11 +209,11 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odb.py
# Disable SWIG based interface for now
'''
-Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
+Index: odb-api-0.17.6/odb_api/src/python/odb/odbql.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/odb/odbql.py
-+++ odb-api-0.17.3/odb_api/src/python/odb/odbql.py
-@@ -144,8 +144,7 @@ class fetchall_generator(object):
+--- odb-api-0.17.6.orig/odb_api/src/python/odb/odbql.py
++++ odb-api-0.17.6/odb_api/src/python/odb/odbql.py
+@@ -160,8 +160,7 @@ class fetchall_generator(object):
def __init__(self, cursor):
self.cursor = cursor
def __iter__(self): return self
@@ -242,7 +223,7 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
v = self.cursor.fetchone()
if not v:
raise StopIteration()
-@@ -190,7 +189,7 @@ class Cursor:
+@@ -206,7 +205,7 @@ class Cursor:
operation = self.__add_semicolon_if_needed(operation)
rc = odbql_prepare_v2(db, operation, -1, byref(self.stmt), byref(tail))
@@ -251,7 +232,7 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
err_msg = odbql_errmsg(db).strip()
#print 'execute: odbql_prepare_v2 failed with error message: "%s"' % err_msg
if err_msg == "syntax error":
-@@ -208,14 +207,14 @@ class Cursor:
+@@ -224,14 +223,14 @@ class Cursor:
self.number_of_columns = odbql_column_count(self.stmt)
self.names = [odbql_column_name(self.stmt, i) for i in range(self.number_of_columns)]
self.types = [odbql_column_type(self.stmt, i) for i in range(self.number_of_columns)]
@@ -268,7 +249,7 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
r = self.fetchone()
if r:
return r
-@@ -286,12 +285,16 @@ class Cursor:
+@@ -302,12 +301,16 @@ class Cursor:
def __marsify(self, procname, keyword_parameters):
def marslist(l):
@@ -288,7 +269,7 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
return r
-@@ -326,8 +329,7 @@ class Cursor:
+@@ -342,8 +345,7 @@ class Cursor:
class __new_sql_generator:
def __init__(self, cursor): self.cursor = cursor
def __iter__(self): return self
@@ -298,10 +279,10 @@ Index: odb-api-0.17.3/odb_api/src/python/odb/odbql.py
v = self.cursor.fetchone()
if not v:
raise StopIteration()
-Index: odb-api-0.17.3/odb_api/src/python/odb269.py
+Index: odb-api-0.17.6/odb_api/src/python/odb269.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/odb269.py
-+++ odb-api-0.17.3/odb_api/src/python/odb269.py
+--- odb-api-0.17.6.orig/odb_api/src/python/odb269.py
++++ odb-api-0.17.6/odb_api/src/python/odb269.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -318,10 +299,10 @@ Index: odb-api-0.17.3/odb_api/src/python/odb269.py
- print row[0]
+ print (row[0])
c.close()
-Index: odb-api-0.17.3/odb_api/src/python/odbless.py
+Index: odb-api-0.17.6/odb_api/src/python/odbless.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/odbless.py
-+++ odb-api-0.17.3/odb_api/src/python/odbless.py
+--- odb-api-0.17.6.orig/odb_api/src/python/odbless.py
++++ odb-api-0.17.6/odb_api/src/python/odbless.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys
@@ -355,10 +336,10 @@ Index: odb-api-0.17.3/odb_api/src/python/odbless.py
else:
for fn in sys.argv[1:]:
printStats(fn)
-Index: odb-api-0.17.3/odb_api/src/python/psql.py
+Index: odb-api-0.17.6/odb_api/src/python/psql.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/psql.py
-+++ odb-api-0.17.3/odb_api/src/python/psql.py
+--- odb-api-0.17.6.orig/odb_api/src/python/psql.py
++++ odb-api-0.17.6/odb_api/src/python/psql.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os, subprocess, multiprocessing
@@ -388,10 +369,10 @@ Index: odb-api-0.17.3/odb_api/src/python/psql.py
subprocess.call(l)
return outputFile
-Index: odb-api-0.17.3/odb_api/src/python/test_python_odb_api.py
+Index: odb-api-0.17.6/odb_api/src/python/test_python_odb_api.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/test_python_odb_api.py
-+++ odb-api-0.17.3/odb_api/src/python/test_python_odb_api.py
+--- odb-api-0.17.6.orig/odb_api/src/python/test_python_odb_api.py
++++ odb-api-0.17.6/odb_api/src/python/test_python_odb_api.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -509,10 +490,10 @@ Index: odb-api-0.17.3/odb_api/src/python/test_python_odb_api.py
c.executemany('INSERT INTO test_sql_variables (varno,obsvalue) VALUES (?,?);', data)
conn.commit()
-Index: odb-api-0.17.3/odb_api/src/python/to_sqlite.py
+Index: odb-api-0.17.6/odb_api/src/python/to_sqlite.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/python/to_sqlite.py
-+++ odb-api-0.17.3/odb_api/src/python/to_sqlite.py
+--- odb-api-0.17.6.orig/odb_api/src/python/to_sqlite.py
++++ odb-api-0.17.6/odb_api/src/python/to_sqlite.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys, os
@@ -539,10 +520,10 @@ Index: odb-api-0.17.3/odb_api/src/python/to_sqlite.py
c.executemany('INSERT INTO ' + tableName + ' VALUES (' + ','.join('?' for c in columns) + ')', rows())
conn.commit()
-Index: odb-api-0.17.3/odb_api/tests/dhshome/scripts/prestage.py
+Index: odb-api-0.17.6/odb_api/tests/dhshome/scripts/prestage.py
===================================================================
---- odb-api-0.17.3.orig/odb_api/tests/dhshome/scripts/prestage.py
-+++ odb-api-0.17.3/odb_api/tests/dhshome/scripts/prestage.py
+--- odb-api-0.17.6.orig/odb_api/tests/dhshome/scripts/prestage.py
++++ odb-api-0.17.6/odb_api/tests/dhshome/scripts/prestage.py
@@ -1,10 +1,14 @@
#!/usr/bin/env python
@@ -620,10 +601,10 @@ Index: odb-api-0.17.3/odb_api/tests/dhshome/scripts/prestage.py
ecfs = encodeFileName(d, emosBackup)
- print fn, '=> (', d, ')', ecfs
+ print (fn, '=> (', d, ')', ecfs)
-Index: odb-api-0.17.3/pkgpy.py
+Index: odb-api-0.17.6/pkgpy.py
===================================================================
---- odb-api-0.17.3.orig/pkgpy.py
-+++ odb-api-0.17.3/pkgpy.py
+--- odb-api-0.17.6.orig/pkgpy.py
++++ odb-api-0.17.6/pkgpy.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys, json, re
@@ -653,10 +634,10 @@ Index: odb-api-0.17.3/pkgpy.py
if not fileHasMain(input):
- print input
+ print (input )
-Index: odb-api-0.17.3/python_package/pkgpy.py
+Index: odb-api-0.17.6/python_package/pkgpy.py
===================================================================
---- odb-api-0.17.3.orig/python_package/pkgpy.py
-+++ odb-api-0.17.3/python_package/pkgpy.py
+--- odb-api-0.17.6.orig/python_package/pkgpy.py
++++ odb-api-0.17.6/python_package/pkgpy.py
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# http://clang.llvm.org/docs/JSONCompilationDatabase.html
diff --git a/debian/patches/shared_lib.patch b/debian/patches/shared_lib.patch
index ec41f5a..e055517 100644
--- a/debian/patches/shared_lib.patch
+++ b/debian/patches/shared_lib.patch
@@ -3,10 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-08-29
Forwarded: no
-Index: odb-api-0.17.3/odb_api/src/ecml/CMakeLists.txt
+Index: odb-api-0.17.6/odb_api/src/ecml/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/ecml/CMakeLists.txt
-+++ odb-api-0.17.3/odb_api/src/ecml/CMakeLists.txt
+--- odb-api-0.17.6.orig/odb_api/src/ecml/CMakeLists.txt
++++ odb-api-0.17.6/odb_api/src/ecml/CMakeLists.txt
@@ -135,6 +135,7 @@ ecbuild_add_library( TARGET
INSTALL_HEADERS LISTED
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/ecml
@@ -15,10 +15,10 @@ Index: odb-api-0.17.3/odb_api/src/ecml/CMakeLists.txt
LIBS eckit
eckit_cmd # for UserInput
metkit
-Index: odb-api-0.17.3/eckit/src/eckit/cmd/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/cmd/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/cmd/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/cmd/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/cmd/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/cmd/CMakeLists.txt
@@ -74,5 +74,6 @@ ecbuild_add_library( TARGET
INSTALL_HEADERS LISTED
SOURCES ${eckit_cmd_srcs}
@@ -26,10 +26,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/cmd/CMakeLists.txt
+ VERSION 0d
INCLUDES ${CURSES_INCLUDE_DIR}
LIBS eckit ${CURSES_LIBRARIES} )
-Index: odb-api-0.17.3/eckit/src/eckit/geometry/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/geometry/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/geometry/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/geometry/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/geometry/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/geometry/CMakeLists.txt
@@ -11,7 +11,8 @@ ecbuild_add_library(TARGET eckit_geometr
HEADER_DESTINATION
${INSTALL_INCLUDE_DIR}/eckit/geometry
@@ -40,10 +40,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/geometry/CMakeLists.txt
LIBS
eckit )
-Index: odb-api-0.17.3/eckit/src/eckit/linalg/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/linalg/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/linalg/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/linalg/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/linalg/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/linalg/CMakeLists.txt
@@ -27,6 +27,7 @@ ecbuild_add_library( TARGET
INSTALL_HEADERS ALL
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/linalg
@@ -52,10 +52,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/linalg/CMakeLists.txt
INCLUDES "${ARMADILLO_INCLUDE_DIRS}"
"${CUDA_INCLUDE_DIRS}"
"${MKL_INCLUDE_DIRS}"
-Index: odb-api-0.17.3/eckit/src/eckit/maths/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/maths/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/maths/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/maths/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/maths/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/maths/CMakeLists.txt
@@ -11,5 +11,6 @@ ecbuild_add_library( TARGET
INSTALL_HEADERS ALL
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/maths
@@ -63,10 +63,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/maths/CMakeLists.txt
+ VERSION 0d
INCLUDES "${EIGEN3_INCLUDE_DIR}"
LIBS eckit "${LAPACK_LIBRARIES}" "${BLAS_LIBRARIES}" )
-Index: odb-api-0.17.3/eckit/src/eckit/mpi/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/mpi/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/mpi/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/mpi/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/mpi/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/mpi/CMakeLists.txt
@@ -40,7 +40,8 @@ ecbuild_add_library(TARGET eckit_mpi
HEADER_DESTINATION
${INSTALL_INCLUDE_DIR}/eckit/mpi
@@ -77,10 +77,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/mpi/CMakeLists.txt
DEFINITIONS
"${eckit_mpi_defs}"
INCLUDES
-Index: odb-api-0.17.3/eckit/src/eckit/option/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/option/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/option/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/option/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/option/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/option/CMakeLists.txt
@@ -20,6 +20,8 @@ ecbuild_add_library(
CmdArgs.cc
CmdArgs.h
@@ -90,10 +90,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/option/CMakeLists.txt
TEMPLATES
FactoryOption.cc
VectorOption.cc
-Index: odb-api-0.17.3/eckit/src/eckit/web/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/web/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/web/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/web/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/web/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/web/CMakeLists.txt
@@ -45,7 +45,8 @@ Url.h)
ecbuild_add_library( TARGET eckit_web
INSTALL_HEADERS LISTED
@@ -104,10 +104,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/web/CMakeLists.txt
PERSISTENT
HtmlObject.h
HEADER_DESTINATION
-Index: odb-api-0.17.3/eckit/src/experimental/eckit/testing/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/experimental/eckit/testing/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/experimental/eckit/testing/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/experimental/eckit/testing/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/experimental/eckit/testing/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/experimental/eckit/testing/CMakeLists.txt
@@ -6,6 +6,7 @@ UnitTest.cc
ecbuild_add_library(TARGET eckit_testing
INSTALL_HEADERS ALL
@@ -116,11 +116,11 @@ Index: odb-api-0.17.3/eckit/src/experimental/eckit/testing/CMakeLists.txt
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/testing
LIBS eckit )
-Index: odb-api-0.17.3/metkit/src/metkit/CMakeLists.txt
+Index: odb-api-0.17.6/metkit/src/metkit/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/metkit/src/metkit/CMakeLists.txt
-+++ odb-api-0.17.3/metkit/src/metkit/CMakeLists.txt
-@@ -119,6 +119,8 @@ ecbuild_add_library(
+--- odb-api-0.17.6.orig/metkit/src/metkit/CMakeLists.txt
++++ odb-api-0.17.6/metkit/src/metkit/CMakeLists.txt
+@@ -118,6 +118,8 @@ ecbuild_add_library(
SOURCES
${metkit_srcs}
@@ -128,11 +128,11 @@ Index: odb-api-0.17.3/metkit/src/metkit/CMakeLists.txt
+ 0d
PRIVATE_INCLUDES
${ECKIT_INCLUDE_DIRS}
- ${GRIB_API_INCLUDE_DIRS}
-Index: odb-api-0.17.3/odb_api/src/fortran/CMakeLists.txt
+ ${ECCODES_INCLUDE_DIRS}
+Index: odb-api-0.17.6/odb_api/src/fortran/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/fortran/CMakeLists.txt
-+++ odb-api-0.17.3/odb_api/src/fortran/CMakeLists.txt
+--- odb-api-0.17.6.orig/odb_api/src/fortran/CMakeLists.txt
++++ odb-api-0.17.6/odb_api/src/fortran/CMakeLists.txt
@@ -12,7 +12,7 @@ ecbuild_add_library(TARGET Odb_fortran
# Legacy:
@@ -142,10 +142,10 @@ Index: odb-api-0.17.3/odb_api/src/fortran/CMakeLists.txt
LIBS Odb )
set( test_environment_fortran
-Index: odb-api-0.17.3/odb_api/src/odb_api/CMakeLists.txt
+Index: odb-api-0.17.6/odb_api/src/odb_api/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/CMakeLists.txt
-+++ odb-api-0.17.3/odb_api/src/odb_api/CMakeLists.txt
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/CMakeLists.txt
++++ odb-api-0.17.6/odb_api/src/odb_api/CMakeLists.txt
@@ -465,6 +465,7 @@ ecbuild_add_library( TARGET
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api
COMPONENT server
@@ -154,10 +154,10 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/CMakeLists.txt
GENERATED ODBAPIVersionSHA1.cc
TEMPLATES ${odblib_templates}
LINKER_LANGUAGE CXX
-Index: odb-api-0.17.3/odb_api/src/odb_api/tools/CMakeLists.txt
+Index: odb-api-0.17.6/odb_api/src/odb_api/tools/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/tools/CMakeLists.txt
-+++ odb-api-0.17.3/odb_api/src/odb_api/tools/CMakeLists.txt
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/tools/CMakeLists.txt
++++ odb-api-0.17.6/odb_api/src/odb_api/tools/CMakeLists.txt
@@ -113,6 +113,7 @@ ecbuild_add_library( TARGET odbtools
INSTALL_HEADERS LISTED
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools
@@ -174,10 +174,10 @@ Index: odb-api-0.17.3/odb_api/src/odb_api/tools/CMakeLists.txt
TEMPLATES ${odbtest_templates}
LIBS Odb odbtools )
-Index: odb-api-0.17.3/eckit/src/eckit/CMakeLists.txt
+Index: odb-api-0.17.6/eckit/src/eckit/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/eckit/src/eckit/CMakeLists.txt
-+++ odb-api-0.17.3/eckit/src/eckit/CMakeLists.txt
+--- odb-api-0.17.6.orig/eckit/src/eckit/CMakeLists.txt
++++ odb-api-0.17.6/eckit/src/eckit/CMakeLists.txt
@@ -694,7 +694,9 @@ ecbuild_add_library(TARGET eckit
HEADER_DESTINATION
${INSTALL_INCLUDE_DIR}/eckit
@@ -189,10 +189,10 @@ Index: odb-api-0.17.3/eckit/src/eckit/CMakeLists.txt
GENERATED
eckit_version.cc
TEMPLATES
-Index: odb-api-0.17.3/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
+Index: odb-api-0.17.6/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
===================================================================
---- odb-api-0.17.3.orig/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
-+++ odb-api-0.17.3/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
++++ odb-api-0.17.6/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
@@ -29,6 +29,7 @@ ecbuild_add_library( TARGET Odb2Netc
#HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api
#COMPONENT server
diff --git a/debian/patches/size_t_32bit.patch b/debian/patches/size_t_32bit.patch
index 7e3f94b..9881c6a 100644
--- a/debian/patches/size_t_32bit.patch
+++ b/debian/patches/size_t_32bit.patch
@@ -5,10 +5,10 @@ Bug-Origin: https://bugs.debian.org/880966
Last-Updated: 2017-11-06
Forwarded: no
-Index: odb-api-0.17.4/eckit/src/eckit/container/DenseMap.h
+Index: odb-api-0.17.6/eckit/src/eckit/container/DenseMap.h
===================================================================
---- odb-api-0.17.4.orig/eckit/src/eckit/container/DenseMap.h
-+++ odb-api-0.17.4/eckit/src/eckit/container/DenseMap.h
+--- odb-api-0.17.6.orig/eckit/src/eckit/container/DenseMap.h
++++ odb-api-0.17.6/eckit/src/eckit/container/DenseMap.h
@@ -138,8 +138,9 @@ public: // methods
const V& at( const size_t i ) const { ASSERT(i < keys_.size()); return values_[ keys_[i].idx() ]; }
V& at( const size_t i ) { ASSERT(i < keys_.size()); return values_[ i ]; }
@@ -21,10 +21,10 @@ Index: odb-api-0.17.4/eckit/src/eckit/container/DenseMap.h
const V& operator[] (const size_t& i ) const { ASSERT(i < values_.size()); return values_[ i ]; }
V& operator[] (const size_t& i ) { ASSERT(i < keys_.size()); return values_[ i ]; }
-Index: odb-api-0.17.4/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
+Index: odb-api-0.17.6/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
===================================================================
---- odb-api-0.17.4.orig/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
-+++ odb-api-0.17.4/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
+--- odb-api-0.17.6.orig/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
++++ odb-api-0.17.6/odb_api/src/odb_api/TReadOnlyMemoryDataHandle.h
@@ -79,7 +79,7 @@ public:
// dst[i] = *it_;
// return i;
diff --git a/debian/patches/swap_decl.patch b/debian/patches/swap_decl.patch
index 92958a1..d92d6ea 100644
--- a/debian/patches/swap_decl.patch
+++ b/debian/patches/swap_decl.patch
@@ -4,10 +4,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-11-06
Forwarded: no
-Index: odb-api-0.17.4/odb_api/tests/core/test_select_iterator.cc
+Index: odb-api-0.17.6/odb_api/tests/core/test_select_iterator.cc
===================================================================
---- odb-api-0.17.4.orig/odb_api/tests/core/test_select_iterator.cc
-+++ odb-api-0.17.4/odb_api/tests/core/test_select_iterator.cc
+--- odb-api-0.17.6.orig/odb_api/tests/core/test_select_iterator.cc
++++ odb-api-0.17.6/odb_api/tests/core/test_select_iterator.cc
@@ -154,7 +154,7 @@ CASE("Test bugfix 01, quote <<UnitTest p
for (int i = 0; i < sizeof(REF_DATA) / 8; i++)
{
diff --git a/debian/patches/unsigned-long-on-32bit.patch b/debian/patches/unsigned-long-on-32bit.patch
index 4bd300c..a248de2 100644
--- a/debian/patches/unsigned-long-on-32bit.patch
+++ b/debian/patches/unsigned-long-on-32bit.patch
@@ -4,10 +4,10 @@ Author: Alastair McKimstry <mckinstry at debian.org>
Last-Updated: 2017-11-05
Forwarded: no
-Index: odb-api-0.17.4/eckit/tests/config/test_configuration.cc
+Index: odb-api-0.17.6/eckit/tests/config/test_configuration.cc
===================================================================
---- odb-api-0.17.4.orig/eckit/tests/config/test_configuration.cc
-+++ odb-api-0.17.4/eckit/tests/config/test_configuration.cc
+--- odb-api-0.17.6.orig/eckit/tests/config/test_configuration.cc
++++ odb-api-0.17.6/eckit/tests/config/test_configuration.cc
@@ -52,7 +52,7 @@ CASE( "test_configuration_interface" )
std::string value_string = std::string("string");
std::vector<int> value_arr_int = make_vector(1,2,3);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/odb-api.git
More information about the debian-science-commits
mailing list