[cdo] 10/11: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Apr 20 10:40:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cdo.
commit 46d43541848854fc0732c5e9abfbb55e63dfaa76
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Thu Apr 20 09:26:30 2017 +0100
refresh patches
---
debian/patches/deregister.patch | 38 ++++++++--------
debian/patches/eccodes.patch | 12 ++---
debian/patches/fix_typos.patch | 40 +++-------------
debian/patches/hppa_gomp_bug.patch | 8 ++--
debian/patches/ignore.patch | 8 ++--
debian/patches/libc-2.23-fixes.patch | 6 +--
debian/patches/pkgconfig.patch | 26 -----------
debian/patches/ppc64el.patch | 6 +--
debian/patches/reproducible-builds.patch | 78 ++++++++++++++++----------------
debian/patches/series | 1 -
10 files changed, 85 insertions(+), 138 deletions(-)
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index f911a59..0421855 100644
--- a/debian/patches/deregister.patch
+++ b/debian/patches/deregister.patch
@@ -6,11 +6,11 @@ Description: Remove 'register' from C code. Especially never try to get the
Last-Updated: 2015-06-29
Forwarded: no
-Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
-@@ -6329,8 +6329,8 @@ void pwr6_minmax_val_double_unrolled6(co
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
+@@ -7528,8 +7528,8 @@ void pwr6_minmax_val_double_unrolled6(co
size_t i, j;
size_t residual = datasize % __UNROLL_DEPTH_1;
size_t ofs = datasize - residual;
@@ -21,7 +21,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -19520,7 +19520,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -20734,7 +20734,7 @@ memcrc(const unsigned char *b, size_t n)
/* Extend with the length of the string. */
while (n != 0) {
@@ -30,7 +30,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -19538,9 +19538,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20752,9 +20752,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,7 +43,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -19553,7 +19553,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20767,7 +20767,7 @@ memcrc_r(uint32_t *state, const unsigned
#ifdef WORDS_BIGENDIAN
#define SWAP_CSUM(BITWIDTH,BYTEWIDTH,NACC) \
do { \
@@ -52,7 +52,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
for (size_t i = 0; i < num_elems; ++i) { \
for(size_t aofs = NACC; aofs > 0; --aofs) { \
uint##BITWIDTH##_t accum = b[i + aofs - 1]; \
-@@ -19580,7 +19580,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20794,7 +20794,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -19610,8 +19610,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20824,8 +20824,8 @@ memcrc_r_eswap(uint32_t *state, const un
uint32_t
memcrc_finish(uint32_t *state, off_t total_size)
{
@@ -72,7 +72,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -33748,7 +33748,7 @@ void listInitialize ( void )
+@@ -34496,7 +34496,7 @@ void listInitialize ( void )
pthread_mutexattr_destroy(&ma);
#endif
/* file is special and has its own table, which needs to be
@@ -81,11 +81,11 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
-@@ -507,7 +507,7 @@ void avx_minmax_val_double(const double
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
+@@ -531,7 +531,7 @@ void avx_minmax_val_double(const double
double fmin[4], fmax[4];
__m256d current_max, current_min, work;
@@ -94,7 +94,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -600,7 +600,7 @@ void sse2_minmax_val_double(const double
+@@ -624,7 +624,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -103,7 +103,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -684,8 +684,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -708,8 +708,8 @@ void pwr6_minmax_val_double_unrolled6(co
size_t i, j;
size_t residual = datasize % __UNROLL_DEPTH_1;
size_t ofs = datasize - residual;
@@ -114,10 +114,10 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.7.1+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/cksum.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/cksum.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/cksum.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/cksum.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/cksum.c
@@ -82,7 +82,7 @@ memcrc(const unsigned char *b, size_t n)
/* Extend with the length of the string. */
diff --git a/debian/patches/eccodes.patch b/debian/patches/eccodes.patch
index 182d34f..753670b 100644
--- a/debian/patches/eccodes.patch
+++ b/debian/patches/eccodes.patch
@@ -3,10 +3,10 @@ Description: Build against eccodes lib, not libgrib_api
Last-Updated: 2016-11-30
Forwarded: no
-Index: cdo-1.8.0+dfsg.1/libcdi/m4/acx_options.m4
+Index: cdo-1.8.1+dfsg.1/libcdi/m4/acx_options.m4
===================================================================
---- cdo-1.8.0+dfsg.1.orig/libcdi/m4/acx_options.m4
-+++ cdo-1.8.0+dfsg.1/libcdi/m4/acx_options.m4
+--- cdo-1.8.1+dfsg.1.orig/libcdi/m4/acx_options.m4
++++ cdo-1.8.1+dfsg.1/libcdi/m4/acx_options.m4
@@ -166,7 +166,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
@@ -29,10 +29,10 @@ Index: cdo-1.8.0+dfsg.1/libcdi/m4/acx_options.m4
GRIB_API_INCLUDE=" -I$GRIB_API_ROOT/include"],
[AC_MSG_ERROR([$GRIB_API_ROOT is not a directory! GRIB_API suppressed])])])],
[AC_MSG_CHECKING([for the GRIB_API library])
-Index: cdo-1.8.0+dfsg.1/m4/acx_options.m4
+Index: cdo-1.8.1+dfsg.1/m4/acx_options.m4
===================================================================
---- cdo-1.8.0+dfsg.1.orig/m4/acx_options.m4
-+++ cdo-1.8.0+dfsg.1/m4/acx_options.m4
+--- cdo-1.8.1+dfsg.1.orig/m4/acx_options.m4
++++ cdo-1.8.1+dfsg.1/m4/acx_options.m4
@@ -269,7 +269,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index 47796d5..3688b23 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,39 +1,13 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Fix typos.
-Last-Updated: 2015-07-20
+Last-Updated: 2017-04-20
Forwarded: no
-Index: cdo-1.8.0+dfsg.1/libcdi/src/grid.c
+Index: cdo-1.8.1+dfsg.1/src/operator_help.h
===================================================================
---- cdo-1.8.0+dfsg.1.orig/libcdi/src/grid.c
-+++ cdo-1.8.0+dfsg.1/libcdi/src/grid.c
-@@ -3597,8 +3597,8 @@ const double *gridInqYvalsPtr(int gridID
- @Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
- @Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
- @Item lat2 Second latitude at which the secant cone cuts the sphere.
-- @Item xinc X-direction grid lenght in meter.
-- @Item yinc Y-direction grid lenght in meter.
-+ @Item xinc X-direction grid length in meter.
-+ @Item yinc Y-direction grid length in meter.
- @Item projflag Projection centre flag.
- @Item scanflag Scanning mode flag.
-
-@@ -3644,8 +3644,8 @@ void gridDefParamLCC(int gridID, double
- @Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
- @Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
- @Item lat2 Second latitude at which the secant cone cuts the sphere.
-- @Item xinc X-direction grid lenght in meter.
-- @Item yinc Y-direction grid lenght in meter.
-+ @Item xinc X-direction grid length in meter.
-+ @Item yinc Y-direction grid length in meter.
- @Item projflag Projection centre flag.
- @Item scanflag Scanning mode flag.
-
-Index: cdo-1.8.0+dfsg.1/src/operator_help.h
-===================================================================
---- cdo-1.8.0+dfsg.1.orig/src/operator_help.h
-+++ cdo-1.8.0+dfsg.1/src/operator_help.h
-@@ -1764,7 +1764,7 @@ static const char *ConsecstatHelp[] = {
+--- cdo-1.8.1+dfsg.1.orig/src/operator_help.h
++++ cdo-1.8.1+dfsg.1/src/operator_help.h
+@@ -1852,7 +1852,7 @@ static const char *ConsecstatHelp[] = {
"",
"DESCRIPTION",
" This module computes periods over all timesteps in infile where a",
@@ -42,7 +16,7 @@ Index: cdo-1.8.0+dfsg.1/src/operator_help.h
" the original data, which is the expected input format for operators of this",
" module. Depending on the operator full information about each period or",
" just its length and ending date are computed.",
-@@ -1776,7 +1776,7 @@ static const char *ConsecstatHelp[] = {
+@@ -1864,7 +1864,7 @@ static const char *ConsecstatHelp[] = {
" multiple periods can be found. Timesteps from the input are preserved. Missing",
" values are handled like 0, i.e. finish periods of consecutive timesteps.",
" consects Consecutive Timesteps",
@@ -51,7 +25,7 @@ Index: cdo-1.8.0+dfsg.1/src/operator_help.h
" period together with its last timestep. To be able to perform statistical",
" analysis like min, max or mean, everything else is set to missing value.",
NULL
-@@ -4855,7 +4855,7 @@ static const char *HistogramHelp[] = {
+@@ -4974,7 +4974,7 @@ static const char *HistogramHelp[] = {
" is the lower bound and the second value the upper bound of the",
" first bin. The bounds of the second bin are defined by the",
" second and third value, aso.",
diff --git a/debian/patches/hppa_gomp_bug.patch b/debian/patches/hppa_gomp_bug.patch
index de23815..36276ab 100644
--- a/debian/patches/hppa_gomp_bug.patch
+++ b/debian/patches/hppa_gomp_bug.patch
@@ -9,11 +9,11 @@ Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
Last-Updated: 2016-03-21
Forwarded: no
-Index: cdo-1.8.0+dfsg.1/src/remaplib.c
+Index: cdo-1.8.1+dfsg.1/src/remaplib.c
===================================================================
---- cdo-1.8.0+dfsg.1.orig/src/remaplib.c
-+++ cdo-1.8.0+dfsg.1/src/remaplib.c
-@@ -1535,12 +1535,13 @@ void remap_stat(int remap_order, remapgr
+--- cdo-1.8.1+dfsg.1.orig/src/remaplib.c
++++ cdo-1.8.1+dfsg.1/src/remaplib.c
+@@ -1516,12 +1516,13 @@ void remap_stat(int remap_order, remapgr
/*****************************************************************************/
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
index 1fd145d..20144f4 100644
--- a/debian/patches/ignore.patch
+++ b/debian/patches/ignore.patch
@@ -25,11 +25,11 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
-Index: cdo-1.7.0+dfsg.1/libcdi/src/config.h.in
+Index: cdo-1.8.1+dfsg.1/libcdi/src/config.h.in
===================================================================
---- cdo-1.7.0+dfsg.1.orig/libcdi/src/config.h.in
-+++ cdo-1.7.0+dfsg.1/libcdi/src/config.h.in
-@@ -286,6 +286,11 @@
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/config.h.in
++++ cdo-1.8.1+dfsg.1/libcdi/src/config.h.in
+@@ -267,6 +267,11 @@
# endif
#endif
diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
index b7d8977..e081c0a 100644
--- a/debian/patches/libc-2.23-fixes.patch
+++ b/debian/patches/libc-2.23-fixes.patch
@@ -4,10 +4,10 @@ Forwarded: no
Last-Updated: 2016-03-21
Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818826
-Index: cdo-1.8.0+dfsg.1/src/EOFs.c
+Index: cdo-1.8.1+dfsg.1/src/EOFs.c
===================================================================
---- cdo-1.8.0+dfsg.1.orig/src/EOFs.c
-+++ cdo-1.8.0+dfsg.1/src/EOFs.c
+--- cdo-1.8.1+dfsg.1.orig/src/EOFs.c
++++ cdo-1.8.1+dfsg.1/src/EOFs.c
@@ -178,7 +178,7 @@ void *EOFs(void * argument)
int calendar = CALENDAR_STANDARD;
juldate_t juldate;
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
deleted file mode 100644
index b424ee3..0000000
--- a/debian/patches/pkgconfig.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Remove dodgy inclusion of @JASPER_LIBS@, not present on Debian
-Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2017-03-22
-Forwarded: not-needed
-
-Index: cdo-1.8.0+dfsg.1/libcdi/src/pkgconfig/cdi.pc.in
-===================================================================
---- cdo-1.8.0+dfsg.1.orig/libcdi/src/pkgconfig/cdi.pc.in
-+++ cdo-1.8.0+dfsg.1/libcdi/src/pkgconfig/cdi.pc.in
-@@ -4,7 +4,7 @@ libdir=@libdir@
- includedir=@includedir@
- cflags=-I at includedir@
- fcflags=@FPP_INCOPT@@includedir@ @CDI_F90_INTERFACE_FCFLAGS@
--libs=-L at libdir@ -lcdi @GRIB_API_LIBS@ @JASPER_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@
-+libs=-L at libdir@ -lcdi @GRIB_API_LIBS@ @NETCDF_LIBS@ @SZLIB_LIBS@ @THREADS_LIBS@
- threads_libs=@THREADS_LIBS@
- threads_cflags=@THREADS_INCLUDE@
- szlib_cflags=@SZLIB_INCLUDE@
-@@ -12,7 +12,6 @@ szlib_libs=@SZLIB_LIBS@
- netcdf_root=@NETCDF_ROOT@
- netcdf_cflags=@NETCDF_INCLUDE@
- netcdf_libs=@NETCDF_LIBS@
--jasper_libs=@JASPER_LIBS@
- grib_api_cflags=@GRIB_API_INCLUDE@
- grib_api_libs=@GRIB_API_LIBS@
- cdi_build_cc=@CC@
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 76179b6..5e51b35 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -6,10 +6,10 @@ Bug-Debian: https://bugs.debian.org/763691
Last-Updated: 2015-07-14
Forwarded: no
-Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
@@ -12,6 +12,7 @@
#ifdef _ARCH_PWR6
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index a7abd70..e80eab3 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -4,10 +4,10 @@ Description: Make builds bit-reproducible in Debian: remove timestamps
Last-Updated: 2015-10-20
Forwarded: no
-Index: cdo-1.7.1+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.8.1+dfsg.1/libcdi/app/cdi.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/app/cdi.c
-+++ cdo-1.7.1+dfsg.1/libcdi/app/cdi.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/app/cdi.c
++++ cdo-1.8.1+dfsg.1/libcdi/app/cdi.c
@@ -86,8 +86,8 @@ void version(void)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
@@ -19,11 +19,11 @@ Index: cdo-1.7.1+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
-@@ -20368,7 +20368,7 @@ static int extDefaultNumber = EXT_REAL;
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
+@@ -21582,7 +21582,7 @@ static int extDefaultNumber = EXT_REAL;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -32,7 +32,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
const char *extLibraryVersion(void)
{
-@@ -21069,7 +21069,7 @@ static void file_table_print(void);
+@@ -22283,7 +22283,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.2
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -41,7 +41,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-@@ -28963,7 +28963,7 @@ static int iegDefaultDprec = 0;
+@@ -29674,7 +29674,7 @@ static int iegDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -50,7 +50,7 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
const char *iegLibraryVersion(void)
{
-@@ -34481,7 +34481,7 @@ static int srvDefaultDprec = 0;
+@@ -35254,7 +35254,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -59,10 +59,10 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.7.1+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/extralib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/extralib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/extralib.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/extralib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/extralib.c
@@ -34,7 +34,7 @@ static int extDefaultNumber = EXT_REAL;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -72,12 +72,12 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.7.1+dfsg.1/libcdi/src/file.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/file.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/file.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/file.c
-@@ -153,7 +153,7 @@ static void file_table_print(void);
- #define LIBVERSION 1.8.2
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/file.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/file.c
+@@ -147,7 +147,7 @@ static void file_table_print(void);
+ #define LIBVERSION 1.8.3
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
-static const char file_libvers[] = STRING(LIBVERSION) " of " __DATE__ " " __TIME__;
@@ -85,10 +85,10 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.7.1+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/ieglib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/ieglib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/ieglib.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/ieglib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/ieglib.c
@@ -28,7 +28,7 @@ static int iegDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -98,11 +98,11 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.7.1+dfsg.1/src/cdo.c
+Index: cdo-1.8.1+dfsg.1/src/cdo.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/src/cdo.c
-+++ cdo-1.7.1+dfsg.1/src/cdo.c
-@@ -165,7 +165,7 @@ void cdo_version(void)
+--- cdo-1.8.1+dfsg.1.orig/src/cdo.c
++++ cdo-1.8.1+dfsg.1/src/cdo.c
+@@ -191,7 +191,7 @@ void cdo_version(void)
fprintf(stderr, "%s\n", CDO_Version);
#if defined(USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -111,11 +111,11 @@ Index: cdo-1.7.1+dfsg.1/src/cdo.c
#endif
#if defined(COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
-Index: cdo-1.7.1+dfsg.1/configure.ac
+Index: cdo-1.8.1+dfsg.1/configure.ac
===================================================================
---- cdo-1.7.1+dfsg.1.orig/configure.ac
-+++ cdo-1.7.1+dfsg.1/configure.ac
-@@ -93,19 +93,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
+--- cdo-1.8.1+dfsg.1.orig/configure.ac
++++ cdo-1.8.1+dfsg.1/configure.ac
+@@ -96,19 +96,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
@@ -147,11 +147,11 @@ Index: cdo-1.7.1+dfsg.1/configure.ac
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
-Index: cdo-1.7.1+dfsg.1/libcdi/configure.ac
+Index: cdo-1.8.1+dfsg.1/libcdi/configure.ac
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/configure.ac
-+++ cdo-1.7.1+dfsg.1/libcdi/configure.ac
-@@ -121,19 +121,21 @@ if test -z "$COMP_VERSION" ; then COMP_V
+--- cdo-1.8.1+dfsg.1.orig/libcdi/configure.ac
++++ cdo-1.8.1+dfsg.1/libcdi/configure.ac
+@@ -123,19 +123,21 @@ if test -z "$COMP_VERSION" ; then COMP_V
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
@@ -185,10 +185,10 @@ Index: cdo-1.7.1+dfsg.1/libcdi/configure.ac
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
-Index: cdo-1.7.1+dfsg.1/libcdi/src/servicelib.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/servicelib.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/servicelib.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/servicelib.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/servicelib.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/servicelib.c
@@ -34,7 +34,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -198,10 +198,10 @@ Index: cdo-1.7.1+dfsg.1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.7.1+dfsg.1/libcdi/src/version.c
+Index: cdo-1.8.1+dfsg.1/libcdi/src/version.c
===================================================================
---- cdo-1.7.1+dfsg.1.orig/libcdi/src/version.c
-+++ cdo-1.7.1+dfsg.1/libcdi/src/version.c
+--- cdo-1.8.1+dfsg.1.orig/libcdi/src/version.c
++++ cdo-1.8.1+dfsg.1/libcdi/src/version.c
@@ -9,7 +9,7 @@
*/
diff --git a/debian/patches/series b/debian/patches/series
index 529aad9..af0aa43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ ppc64el.patch
libc-2.23-fixes.patch
hppa_gomp_bug.patch
eccodes.patch
-pkgconfig.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git
More information about the debian-science-commits
mailing list