[odb-api] 04/08: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 4 14:48:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository odb-api.
commit ba9bffbbdcbd117836281cedf6b9542e11c9f060
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Oct 3 17:01:45 2017 +0100
refresh patches
---
debian/patches/py3-port.patch | 12 ++--
debian/patches/python3.patch | 119 +++++++++++++++++++++++-----------------
debian/patches/shared_lib.patch | 102 +++++++++++++++++-----------------
3 files changed, 125 insertions(+), 108 deletions(-)
diff --git a/debian/patches/py3-port.patch b/debian/patches/py3-port.patch
index 8e283e2..0cd1c5a 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.1/odb_api/src/odb_api/IteratorProxy.h
+Index: odb-api-0.17.3/odb_api/src/odb_api/IteratorProxy.h
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/odb_api/IteratorProxy.h
-+++ odb-api-0.17.1/odb_api/src/odb_api/IteratorProxy.h
-@@ -180,7 +180,7 @@ public:
+--- 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:
size_t j = 0;
for (; j < sizeof(double) && s[j]; ++j)
;
@@ -16,7 +16,7 @@ Index: odb-api-0.17.1/odb_api/src/odb_api/IteratorProxy.h
}
case INTEGER: return PyLong_FromDouble(d);
case BITFIELD:
-@@ -198,7 +198,7 @@ public:
+@@ -205,7 +205,7 @@ public:
mask >>= 1;
}
buf[sizeof(B)] = 0;
@@ -25,7 +25,7 @@ Index: odb-api-0.17.1/odb_api/src/odb_api/IteratorProxy.h
}
default: return PyFloat_FromDouble(d);
}
-@@ -229,22 +229,22 @@ public:
+@@ -236,22 +236,22 @@ public:
}
return l;
}
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 82d93a1..72c89c9 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -3,8 +3,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Update: 2017-08-29
Forwarded: no
---- odb-api-0.17.1.orig/odb-tools/src/migrator/pyodbdump_example.py
-+++ odb-api-0.17.1/odb-tools/src/migrator/pyodbdump_example.py
+Index: odb-api-0.17.3/odb-tools/src/migrator/pyodbdump_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
@@ -20,8 +22,10 @@ Forwarded: no
-print columns(db, sql)
+print (columns(db, sql))
---- odb-api-0.17.1.orig/odb_api/src/api/odbql_python_example.py
-+++ odb-api-0.17.1/odb_api/src/api/odbql_python_example.py
+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
@@ -14,7 +14,7 @@ Examples of usage of ODB API Python inte
@author Piotr Kuchta, ECMWF, August 2016
@@ -66,8 +70,10 @@ Forwarded: no
-print "That's all, folks!"
+print ("That's all, folks!")
---- odb-api-0.17.1.orig/odb_api/src/odb_api/fwrap.py
-+++ odb-api-0.17.1/odb_api/src/odb_api/fwrap.py
+Index: odb-api-0.17.3/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
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-
@@ -120,8 +126,10 @@ Forwarded: no
global status_handling_code
return_type, function_name, params = signature
---- odb-api-0.17.1.orig/odb_api/src/odb_api/test.py
-+++ odb-api-0.17.1/odb_api/src/odb_api/test.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -147,8 +155,10 @@ Forwarded: no
break
if __name__ == '__main__':
---- odb-api-0.17.1.orig/odb_api/src/python/legacy_odb_api_python_examples.py
-+++ odb-api-0.17.1/odb_api/src/python/legacy_odb_api_python_examples.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -183,8 +193,10 @@ Forwarded: no
break
def reading_metadata_of_result_set(file_name = test_file):
---- odb-api-0.17.1.orig/odb_api/src/python/legacy_test_python_odb_api.py
-+++ odb-api-0.17.1/odb_api/src/python/legacy_test_python_odb_api.py
+Index: odb-api-0.17.3/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
@@ -1,7 +1,8 @@
#!/usr/bin/env python
@@ -195,14 +207,18 @@ Forwarded: no
import odb
import unittest
---- odb-api-0.17.1.orig/odb_api/src/python/odb/__init__.py
-+++ odb-api-0.17.1/odb_api/src/python/odb/__init__.py
+Index: odb-api-0.17.3/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
@@ -1,2 +1,2 @@
-from odb import *
+from .odb import *
---- odb-api-0.17.1.orig/odb_api/src/python/odb/odb.py
-+++ odb-api-0.17.1/odb_api/src/python/odb/odb.py
+Index: odb-api-0.17.3/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
@@ -17,7 +17,7 @@ Functions sql and open are a legacy, uns
"""
@@ -212,8 +228,10 @@ Forwarded: no
# Disable SWIG based interface for now
'''
---- odb-api-0.17.1.orig/odb_api/src/python/odb/odbql.py
-+++ odb-api-0.17.1/odb_api/src/python/odb/odbql.py
+Index: odb-api-0.17.3/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):
def __init__(self, cursor):
self.cursor = cursor
@@ -280,8 +298,10 @@ Forwarded: no
v = self.cursor.fetchone()
if not v:
raise StopIteration()
---- odb-api-0.17.1.orig/odb_api/src/python/odb269.py
-+++ odb-api-0.17.1/odb_api/src/python/odb269.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import odb
@@ -298,8 +318,10 @@ Forwarded: no
- print row[0]
+ print (row[0])
c.close()
---- odb-api-0.17.1.orig/odb_api/src/python/odbless.py
-+++ odb-api-0.17.1/odb_api/src/python/odbless.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys
@@ -333,8 +355,10 @@ Forwarded: no
else:
for fn in sys.argv[1:]:
printStats(fn)
---- odb-api-0.17.1.orig/odb_api/src/python/psql.py
-+++ odb-api-0.17.1/odb_api/src/python/psql.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import os, subprocess, multiprocessing
@@ -364,8 +388,10 @@ Forwarded: no
subprocess.call(l)
return outputFile
---- odb-api-0.17.1.orig/odb_api/src/python/test_python_odb_api.py
-+++ odb-api-0.17.1/odb_api/src/python/test_python_odb_api.py
+Index: odb-api-0.17.3/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
@@ -1,5 +1,6 @@
#!/usr/bin/env python
@@ -483,8 +509,10 @@ Forwarded: no
c.executemany('INSERT INTO test_sql_variables (varno,obsvalue) VALUES (?,?);', data)
conn.commit()
---- odb-api-0.17.1.orig/odb_api/src/python/to_sqlite.py
-+++ odb-api-0.17.1/odb_api/src/python/to_sqlite.py
+Index: odb-api-0.17.3/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
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys, os
@@ -511,8 +539,10 @@ Forwarded: no
c.executemany('INSERT INTO ' + tableName + ' VALUES (' + ','.join('?' for c in columns) + ')', rows())
conn.commit()
---- odb-api-0.17.1.orig/odb_api/tests/dhshome/scripts/prestage.py
-+++ odb-api-0.17.1/odb_api/tests/dhshome/scripts/prestage.py
+Index: odb-api-0.17.3/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
@@ -1,10 +1,14 @@
#!/usr/bin/env python
@@ -590,25 +620,10 @@ Forwarded: no
ecfs = encodeFileName(d, emosBackup)
- print fn, '=> (', d, ')', ecfs
+ print (fn, '=> (', d, ')', ecfs)
---- odb-api-0.17.1.orig/odb_tools/src/migrator/pyodbdump_example.py
-+++ odb-api-0.17.1/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))
---- odb-api-0.17.1.orig/pkgpy.py
-+++ odb-api-0.17.1/pkgpy.py
+Index: odb-api-0.17.3/pkgpy.py
+===================================================================
+--- odb-api-0.17.3.orig/pkgpy.py
++++ odb-api-0.17.3/pkgpy.py
@@ -1,3 +1,4 @@
+from __future__ import print_function
import sys, json, re
@@ -638,8 +653,10 @@ Forwarded: no
if not fileHasMain(input):
- print input
+ print (input )
---- odb-api-0.17.1.orig/python_package/pkgpy.py
-+++ odb-api-0.17.1/python_package/pkgpy.py
+Index: odb-api-0.17.3/python_package/pkgpy.py
+===================================================================
+--- odb-api-0.17.3.orig/python_package/pkgpy.py
++++ odb-api-0.17.3/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 26b1479..ec41f5a 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.1/odb_api/src/ecml/CMakeLists.txt
+Index: odb-api-0.17.3/odb_api/src/ecml/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/ecml/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -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.1/odb_api/src/ecml/CMakeLists.txt
LIBS eckit
eckit_cmd # for UserInput
metkit
-Index: odb-api-0.17.1/eckit/src/eckit/cmd/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/cmd/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/cmd/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -74,5 +74,6 @@ ecbuild_add_library( TARGET
INSTALL_HEADERS LISTED
SOURCES ${eckit_cmd_srcs}
@@ -26,10 +26,10 @@ Index: odb-api-0.17.1/eckit/src/eckit/cmd/CMakeLists.txt
+ VERSION 0d
INCLUDES ${CURSES_INCLUDE_DIR}
LIBS eckit ${CURSES_LIBRARIES} )
-Index: odb-api-0.17.1/eckit/src/eckit/geometry/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/geometry/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/geometry/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -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.1/eckit/src/eckit/geometry/CMakeLists.txt
LIBS
eckit )
-Index: odb-api-0.17.1/eckit/src/eckit/linalg/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/linalg/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/linalg/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -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.1/eckit/src/eckit/linalg/CMakeLists.txt
INCLUDES "${ARMADILLO_INCLUDE_DIRS}"
"${CUDA_INCLUDE_DIRS}"
"${MKL_INCLUDE_DIRS}"
-Index: odb-api-0.17.1/eckit/src/eckit/maths/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/maths/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/maths/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -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.1/eckit/src/eckit/maths/CMakeLists.txt
+ VERSION 0d
INCLUDES "${EIGEN3_INCLUDE_DIR}"
LIBS eckit "${LAPACK_LIBRARIES}" "${BLAS_LIBRARIES}" )
-Index: odb-api-0.17.1/eckit/src/eckit/mpi/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/mpi/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/mpi/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -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.1/eckit/src/eckit/mpi/CMakeLists.txt
DEFINITIONS
"${eckit_mpi_defs}"
INCLUDES
-Index: odb-api-0.17.1/eckit/src/eckit/option/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/option/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/option/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -20,6 +20,8 @@ ecbuild_add_library(
CmdArgs.cc
CmdArgs.h
@@ -90,11 +90,11 @@ Index: odb-api-0.17.1/eckit/src/eckit/option/CMakeLists.txt
TEMPLATES
FactoryOption.cc
VectorOption.cc
-Index: odb-api-0.17.1/eckit/src/eckit/web/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/web/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/web/CMakeLists.txt
-+++ odb-api-0.17.1/eckit/src/eckit/web/CMakeLists.txt
-@@ -41,7 +41,8 @@ Url.h )
+--- odb-api-0.17.3.orig/eckit/src/eckit/web/CMakeLists.txt
++++ odb-api-0.17.3/eckit/src/eckit/web/CMakeLists.txt
+@@ -45,7 +45,8 @@ Url.h)
ecbuild_add_library( TARGET eckit_web
INSTALL_HEADERS LISTED
SOURCES
@@ -104,10 +104,10 @@ Index: odb-api-0.17.1/eckit/src/eckit/web/CMakeLists.txt
PERSISTENT
HtmlObject.h
HEADER_DESTINATION
-Index: odb-api-0.17.1/eckit/src/experimental/eckit/testing/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/experimental/eckit/testing/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/experimental/eckit/testing/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -6,6 +6,7 @@ UnitTest.cc
ecbuild_add_library(TARGET eckit_testing
INSTALL_HEADERS ALL
@@ -116,11 +116,11 @@ Index: odb-api-0.17.1/eckit/src/experimental/eckit/testing/CMakeLists.txt
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/eckit/testing
LIBS eckit )
-Index: odb-api-0.17.1/metkit/src/metkit/CMakeLists.txt
+Index: odb-api-0.17.3/metkit/src/metkit/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/metkit/src/metkit/CMakeLists.txt
-+++ odb-api-0.17.1/metkit/src/metkit/CMakeLists.txt
-@@ -113,6 +113,8 @@ ecbuild_add_library(
+--- 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(
SOURCES
${metkit_srcs}
@@ -129,10 +129,10 @@ Index: odb-api-0.17.1/metkit/src/metkit/CMakeLists.txt
PRIVATE_INCLUDES
${ECKIT_INCLUDE_DIRS}
${GRIB_API_INCLUDE_DIRS}
-Index: odb-api-0.17.1/odb_api/src/fortran/CMakeLists.txt
+Index: odb-api-0.17.3/odb_api/src/fortran/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/fortran/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -12,7 +12,7 @@ ecbuild_add_library(TARGET Odb_fortran
# Legacy:
@@ -142,11 +142,11 @@ Index: odb-api-0.17.1/odb_api/src/fortran/CMakeLists.txt
LIBS Odb )
set( test_environment_fortran
-Index: odb-api-0.17.1/odb_api/src/odb_api/CMakeLists.txt
+Index: odb-api-0.17.3/odb_api/src/odb_api/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/odb_api/CMakeLists.txt
-+++ odb-api-0.17.1/odb_api/src/odb_api/CMakeLists.txt
-@@ -467,6 +467,7 @@ ecbuild_add_library( TARGET
+--- 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
+@@ -465,6 +465,7 @@ ecbuild_add_library( TARGET
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api
COMPONENT server
SOURCES ${odblib_src_files}
@@ -154,11 +154,11 @@ Index: odb-api-0.17.1/odb_api/src/odb_api/CMakeLists.txt
GENERATED ODBAPIVersionSHA1.cc
TEMPLATES ${odblib_templates}
LINKER_LANGUAGE CXX
-Index: odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
+Index: odb-api-0.17.3/odb_api/src/odb_api/tools/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/odb_api/tools/CMakeLists.txt
-+++ odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
-@@ -128,6 +128,7 @@ ecbuild_add_library( TARGET odbtools
+--- 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
+@@ -113,6 +113,7 @@ ecbuild_add_library( TARGET odbtools
INSTALL_HEADERS LISTED
HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools
SOURCES ${odbtools_src_files}
@@ -166,7 +166,7 @@ Index: odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
TEMPLATES ${odbtools_templates}
LIBS Odb )
-@@ -135,6 +136,7 @@ ecbuild_add_library( TARGET odbtest
+@@ -120,6 +121,7 @@ ecbuild_add_library( TARGET odbtest
#INSTALL_HEADERS LISTED
#HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api/tools
SOURCES ${odbtest_src_files}
@@ -174,11 +174,11 @@ Index: odb-api-0.17.1/odb_api/src/odb_api/tools/CMakeLists.txt
TEMPLATES ${odbtest_templates}
LIBS Odb odbtools )
-Index: odb-api-0.17.1/eckit/src/eckit/CMakeLists.txt
+Index: odb-api-0.17.3/eckit/src/eckit/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/eckit/src/eckit/CMakeLists.txt
-+++ odb-api-0.17.1/eckit/src/eckit/CMakeLists.txt
-@@ -670,7 +670,9 @@ ecbuild_add_library(TARGET eckit
+--- odb-api-0.17.3.orig/eckit/src/eckit/CMakeLists.txt
++++ odb-api-0.17.3/eckit/src/eckit/CMakeLists.txt
+@@ -694,7 +694,9 @@ ecbuild_add_library(TARGET eckit
HEADER_DESTINATION
${INSTALL_INCLUDE_DIR}/eckit
SOURCES
@@ -189,10 +189,10 @@ Index: odb-api-0.17.1/eckit/src/eckit/CMakeLists.txt
GENERATED
eckit_version.cc
TEMPLATES
-Index: odb-api-0.17.1/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
+Index: odb-api-0.17.3/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
===================================================================
---- odb-api-0.17.1.orig/odb_api/src/odb_api/odb2netcdf/CMakeLists.txt
-+++ odb-api-0.17.1/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
@@ -29,6 +29,7 @@ ecbuild_add_library( TARGET Odb2Netc
#HEADER_DESTINATION ${INSTALL_INCLUDE_DIR}/odb_api
#COMPONENT server
--
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