[cdo] 05/16: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Oct 25 08:21:40 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 043152205655b55d3a3a96fac14e097381cc7cd1
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Fri Oct 13 11:15:20 2017 +0100
refresh patches
---
debian/patches/deregister.patch | 38 +++++++++----------
debian/patches/eccodes.patch | 12 +++---
debian/patches/ppc64el.patch | 6 +--
debian/patches/reproducible-builds.patch | 64 ++++++++++++++++----------------
4 files changed, 60 insertions(+), 60 deletions(-)
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index ee8e6b4..7e3277e 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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
+Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- 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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
+@@ -6358,8 +6358,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -20795,7 +20795,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -19564,7 +19564,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -20813,9 +20813,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19582,9 +19582,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,7 +43,7 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -20828,7 +20828,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19597,7 +19597,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.9.0+dfsg.1~rc1/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]; \
-@@ -20855,7 +20855,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19624,7 +19624,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -20885,8 +20885,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19654,8 +19654,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -34969,7 +34969,7 @@ void listInitialize ( void )
+@@ -33878,7 +33878,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.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
-@@ -526,7 +526,7 @@ void avx_minmax_val_double(const double
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.1+dfsg.1/libcdi/src/cgribexlib.c
+@@ -527,7 +527,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.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -619,7 +619,7 @@ void sse2_minmax_val_double(const double
+@@ -620,7 +620,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -103,7 +103,7 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -703,8 +703,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -704,8 +704,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.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cksum.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/cksum.c
++++ cdo-1.9.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 5c1752f..03d0de6 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.9.0+dfsg.1~rc1/libcdi/m4/acx_options.m4
+Index: cdo-1.9.1+dfsg.1/libcdi/m4/acx_options.m4
===================================================================
---- 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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/m4/acx_options.m4
++++ cdo-1.9.1+dfsg.1/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])
@@ -29,10 +29,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/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.9.0+dfsg.1~rc1/m4/acx_options.m4
+Index: cdo-1.9.1+dfsg.1/m4/acx_options.m4
===================================================================
---- cdo-1.9.0+dfsg.1~rc1.orig/m4/acx_options.m4
-+++ cdo-1.9.0+dfsg.1~rc1/m4/acx_options.m4
+--- cdo-1.9.1+dfsg.1.orig/m4/acx_options.m4
++++ cdo-1.9.1+dfsg.1/m4/acx_options.m4
@@ -304,7 +304,7 @@ AC_ARG_WITH([grib_api],
AC_MSG_RESULT([suppressed])],
[yes],[AC_CHECK_HEADERS([grib_api.h])
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 06c1cc3..a03da90 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.9.0+dfsg.1~rc1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.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 c154401..23e096c 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.9.0+dfsg.1~rc1/libcdi/app/cdi.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/app/cdi.c
++++ cdo-1.9.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.9.0+dfsg.1~rc1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
+Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- 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;
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
+@@ -20412,7 +20412,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
const char *extLibraryVersion(void)
{
-@@ -22338,7 +22338,7 @@ static void file_table_print(void);
- #define LIBVERSION 1.8.3
+@@ -21113,7 +21113,7 @@ static void file_table_print(void);
+ #define LIBVERSION 1.8.2
#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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-@@ -30078,7 +30078,7 @@ static int iegDefaultDprec = 0;
+@@ -29091,7 +29091,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
const char *iegLibraryVersion(void)
{
-@@ -35727,7 +35727,7 @@ static int srvDefaultDprec = 0;
+@@ -34611,7 +34611,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.9.0+dfsg.1~rc1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/extralib.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/extralib.c
++++ cdo-1.9.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,10 +72,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/file.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/file.c
++++ cdo-1.9.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
@@ -85,10 +85,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/ieglib.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/ieglib.c
++++ cdo-1.9.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,10 +98,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.9.0+dfsg.1~rc1/configure.ac
+Index: cdo-1.9.1+dfsg.1/configure.ac
===================================================================
---- cdo-1.9.0+dfsg.1~rc1.orig/configure.ac
-+++ cdo-1.9.0+dfsg.1~rc1/configure.ac
+--- cdo-1.9.1+dfsg.1.orig/configure.ac
++++ cdo-1.9.1+dfsg.1/configure.ac
@@ -111,19 +111,19 @@ if test -z "$C_VERSION" ; then C_VERSION
AC_DEFINE_UNQUOTED(C_VERSION, ["$C_VERSION"], [C Compiler version])
@@ -134,10 +134,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/configure.ac
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/configure.ac
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/configure.ac
++++ cdo-1.9.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])
@@ -172,10 +172,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/configure.ac
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/servicelib.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/servicelib.c
++++ cdo-1.9.1+dfsg.1/libcdi/src/servicelib.c
@@ -34,7 +34,7 @@ static int srvDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -185,10 +185,10 @@ Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.9.0+dfsg.1~rc1/libcdi/src/version.c
+Index: cdo-1.9.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
+--- cdo-1.9.1+dfsg.1.orig/libcdi/src/version.c
++++ cdo-1.9.1+dfsg.1/libcdi/src/version.c
@@ -9,7 +9,7 @@
*/
--
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