[cdo] 07/11: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Jul 27 15:01: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 d0bd4f63e0a7025b018db93e166fce0b2e0e1c65
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jul 11 03:03:45 2017 +0100
refresh patches
---
debian/changelog | 2 +
debian/patches/deregister.patch | 38 +++++++--------
debian/patches/eccodes.patch | 20 ++++----
debian/patches/fix_typos.patch | 14 +++---
debian/patches/hppa_gomp_bug.patch | 30 ------------
debian/patches/ignore.patch | 25 ++--------
debian/patches/libc-2.23-fixes.patch | 19 --------
debian/patches/ppc64el.patch | 6 +--
debian/patches/reproducible-builds.patch | 81 ++++++++++++++------------------
debian/patches/series | 2 -
10 files changed, 78 insertions(+), 159 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ffea706..a96daad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
cdo (1.9.0+dfsg.1~rc1-1) UNRELEASED; urgency=medium
* New upstream release
+ - libc-2.23-fixes.patch now upstream
+ - hppa_gomp_bug.patch now unneeded
-- Alastair McKinstry <mckinstry at debian.org> Tue, 11 Jul 2017 02:55:52 +0100
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index 0421855..ee8e6b4 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.8.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
===================================================================
---- 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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
+@@ -7701,8 +7701,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.8.1+dfsg.1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -20734,7 +20734,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -20795,7 +20795,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.8.1+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -20752,9 +20752,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20813,9 +20813,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,7 +43,7 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -20767,7 +20767,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20828,7 +20828,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.8.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]; \
-@@ -20794,7 +20794,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20855,7 +20855,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -20824,8 +20824,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20885,8 +20885,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.8.1+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -34496,7 +34496,7 @@ void listInitialize ( void )
+@@ -34969,7 +34969,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.8.1+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
-@@ -531,7 +531,7 @@ void avx_minmax_val_double(const double
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
+@@ -526,7 +526,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.8.1+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -624,7 +624,7 @@ void sse2_minmax_val_double(const double
+@@ -619,7 +619,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -103,7 +103,7 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -708,8 +708,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -703,8 +703,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.8.1+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.8.1+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/cksum.c
++++ cdo-1.9.0+dfsg.1~rc1/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 753670b..5c1752f 100644
--- a/debian/patches/eccodes.patch
+++ b/debian/patches/eccodes.patch
@@ -3,11 +3,11 @@ Description: Build against eccodes lib, not libgrib_api
Last-Updated: 2016-11-30
Forwarded: no
-Index: cdo-1.8.1+dfsg.1/libcdi/m4/acx_options.m4
+Index: cdo-1.9.0+dfsg.1~rc1/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],
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/m4/acx_options.m4
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/m4/acx_options.m4
+@@ -198,7 +198,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -16,7 +16,7 @@ Index: cdo-1.8.1+dfsg.1/libcdi/m4/acx_options.m4
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])],
[AC_MSG_ERROR([Could not link to grib_api library])])],
[*],[GRIB_API_ROOT=$with_grib_api
-@@ -175,10 +175,10 @@ AC_ARG_WITH([grib_api],
+@@ -207,10 +207,10 @@ AC_ARG_WITH([grib_api],
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -29,11 +29,11 @@ Index: cdo-1.8.1+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.1+dfsg.1/m4/acx_options.m4
+Index: cdo-1.9.0+dfsg.1~rc1/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],
+--- cdo-1.9.0+dfsg.1~rc1.orig/m4/acx_options.m4
++++ cdo-1.9.0+dfsg.1~rc1/m4/acx_options.m4
+@@ -304,7 +304,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
@@ -42,7 +42,7 @@ Index: cdo-1.8.1+dfsg.1/m4/acx_options.m4
[AC_DEFINE([HAVE_LIBGRIB_API],[1],[GRIB_API library is present if defined to 1])
ENABLE_GRIBAPI=yes],
[AC_MSG_ERROR([Could not link to grib_api library])])],
-@@ -279,11 +279,11 @@ AC_ARG_WITH([grib_api],
+@@ -314,11 +314,11 @@ AC_ARG_WITH([grib_api],
CPPFLAGS="-I$GRIB_API_ROOT/include $CPPFLAGS"
AC_CHECK_HEADERS([grib_api.h])
AC_SEARCH_LIBS([grib_get_message],
diff --git a/debian/patches/fix_typos.patch b/debian/patches/fix_typos.patch
index 3688b23..40c6333 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -3,11 +3,11 @@ Description: Fix typos.
Last-Updated: 2017-04-20
Forwarded: no
-Index: cdo-1.8.1+dfsg.1/src/operator_help.h
+Index: cdo-1.9.0+dfsg.1~rc1/src/operator_help.h
===================================================================
---- 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[] = {
+--- cdo-1.9.0+dfsg.1~rc1.orig/src/operator_help.h
++++ cdo-1.9.0+dfsg.1~rc1/src/operator_help.h
+@@ -1797,7 +1797,7 @@ std::vector<std::string> ConsecstatHelp
"",
"DESCRIPTION",
" This module computes periods over all timesteps in infile where a",
@@ -16,7 +16,7 @@ Index: cdo-1.8.1+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.",
-@@ -1864,7 +1864,7 @@ static const char *ConsecstatHelp[] = {
+@@ -1809,7 +1809,7 @@ std::vector<std::string> 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",
@@ -24,8 +24,8 @@ Index: cdo-1.8.1+dfsg.1/src/operator_help.h
+ " In contrast to the operator above consects only computes the length of each",
" 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
-@@ -4974,7 +4974,7 @@ static const char *HistogramHelp[] = {
+ };
+@@ -4903,7 +4903,7 @@ std::vector<std::string> 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
deleted file mode 100644
index 36276ab..0000000
--- a/debian/patches/hppa_gomp_bug.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: John David Anglin <dave.anglin at bell.net>
-Description: Workaround for GCC ICE
- This bug is GCC PR middle-end/68733:
- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68733
- .
- The issue arises because structs larger than 64 bytes are passed by invisible reference and
- the callee is responsible for copying.
-Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
-Last-Updated: 2016-03-21
-Forwarded: no
-
-Index: cdo-1.8.1+dfsg.1/src/remaplib.c
-===================================================================
---- 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
-
- /*****************************************************************************/
-
--void remap_gradients(remapgrid_t grid, const double *restrict array, double *restrict grad_lat,
-+void remap_gradients(remapgrid_t grid_arg, const double *restrict array, double *restrict grad_lat,
- double *restrict grad_lon, double *restrict grad_latlon)
- {
- long i, j, ip1, im1, jp1, jm1, in, is, ie, iw, ine, inw, ise, isw;
- double delew, delns;
- double grad_lat_zero, grad_lon_zero;
-+ remapgrid_t grid = grid_arg; // Needed for HPPA gomp bug
-
- if ( grid.rank != 2 )
- cdoAbort("Internal problem (remap_gradients), grid rank = %d!", grid.rank);
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
index 20144f4..46a4068 100644
--- a/debian/patches/ignore.patch
+++ b/debian/patches/ignore.patch
@@ -1,22 +1,3 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- cdo (1.5.5+dfsg.1-1) unstable; urgency=low
- .
- * New upstream release
- * Standards-Version: 3.9.3
- * Don't use MPI builds. PIO code not included yet.
-Author: Alastair McKinstry <mckinstry at debian.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
@@ -25,10 +6,10 @@ 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.8.1+dfsg.1/libcdi/src/config.h.in
+Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/config.h.in
===================================================================
---- cdo-1.8.1+dfsg.1.orig/libcdi/src/config.h.in
-+++ cdo-1.8.1+dfsg.1/libcdi/src/config.h.in
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/config.h.in
++++ cdo-1.9.0+dfsg.1~rc1/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
deleted file mode 100644
index e081c0a..0000000
--- a/debian/patches/libc-2.23-fixes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix for isnan() conversion errors with libcc 2.23
-Forwarded: no
-Last-Updated: 2016-03-21
-Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818826
-
-Index: cdo-1.8.1+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;
-
-- double missval = 0;
-+ double missval = 0.0;
-
- typedef struct {
- bool init;
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 5e51b35..06c1cc3 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.8.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.0+dfsg.1~rc1/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 e80eab3..c154401 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.8.1+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/app/cdi.c
++++ cdo-1.9.0+dfsg.1~rc1/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.8.1+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
===================================================================
---- 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;
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
+@@ -21643,7 +21643,7 @@ static int extDefaultNumber = EXT_REAL;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -32,8 +32,8 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
const char *extLibraryVersion(void)
{
-@@ -22283,7 +22283,7 @@ static void file_table_print(void);
- #define LIBVERSION 1.8.2
+@@ -22338,7 +22338,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__;
@@ -41,7 +41,7 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/cdilib.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-@@ -29674,7 +29674,7 @@ static int iegDefaultDprec = 0;
+@@ -30078,7 +30078,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.8.1+dfsg.1/libcdi/src/cdilib.c
const char *iegLibraryVersion(void)
{
-@@ -35254,7 +35254,7 @@ static int srvDefaultDprec = 0;
+@@ -35727,7 +35727,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.8.1+dfsg.1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.8.1+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/extralib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/extralib.c
@@ -34,7 +34,7 @@ static int extDefaultNumber = EXT_REAL;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -72,10 +72,10 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.8.1+dfsg.1/libcdi/src/file.c
+Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/file.c
===================================================================
---- cdo-1.8.1+dfsg.1.orig/libcdi/src/file.c
-+++ cdo-1.8.1+dfsg.1/libcdi/src/file.c
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/file.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/file.c
@@ -147,7 +147,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.3
#define XSTRING(x) #x
@@ -85,10 +85,10 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.8.1+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/ieglib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/ieglib.c
@@ -28,7 +28,7 @@ static int iegDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -98,25 +98,12 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.8.1+dfsg.1/src/cdo.c
-===================================================================
---- 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)
-- fprintf(stderr, "Compiled: by %s on %s (%s) %s %s\n", USER_NAME, HOST_NAME, SYSTEM_TYPE, __DATE__, __TIME__);
-+ fprintf(stderr, "Compiled: by %s on %s (%s)\n", USER_NAME, HOST_NAME, SYSTEM_TYPE);
- #endif
- #if defined(COMPILER)
- fprintf(stderr, "Compiler: %s\n", COMPILER);
-Index: cdo-1.8.1+dfsg.1/configure.ac
+Index: cdo-1.9.0+dfsg.1~rc1/configure.ac
===================================================================
---- 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])
+--- cdo-1.9.0+dfsg.1~rc1.orig/configure.ac
++++ cdo-1.9.0+dfsg.1~rc1/configure.ac
+@@ -111,19 +111,19 @@ if test -z "$C_VERSION" ; then C_VERSION
+ AC_DEFINE_UNQUOTED(C_VERSION, ["$C_VERSION"], [C Compiler version])
# Checks for username, hostname and system type
-USERNAME=$LOGNAME
@@ -147,10 +134,10 @@ Index: cdo-1.8.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.8.1+dfsg.1/libcdi/configure.ac
+Index: cdo-1.9.0+dfsg.1~rc1/libcdi/configure.ac
===================================================================
---- cdo-1.8.1+dfsg.1.orig/libcdi/configure.ac
-+++ cdo-1.8.1+dfsg.1/libcdi/configure.ac
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/configure.ac
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/configure.ac
@@ -123,19 +123,21 @@ if test -z "$COMP_VERSION" ; then COMP_V
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
@@ -185,10 +172,10 @@ Index: cdo-1.8.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.8.1+dfsg.1/libcdi/src/servicelib.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/servicelib.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/servicelib.c
@@ -34,7 +34,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -198,10 +185,10 @@ Index: cdo-1.8.1+dfsg.1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.8.1+dfsg.1/libcdi/src/version.c
+Index: cdo-1.9.0+dfsg.1~rc1/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
+--- cdo-1.9.0+dfsg.1~rc1.orig/libcdi/src/version.c
++++ cdo-1.9.0+dfsg.1~rc1/libcdi/src/version.c
@@ -9,7 +9,7 @@
*/
diff --git a/debian/patches/series b/debian/patches/series
index af0aa43..41585e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,4 @@ ignore.patch
deregister.patch
reproducible-builds.patch
ppc64el.patch
-libc-2.23-fixes.patch
-hppa_gomp_bug.patch
eccodes.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