[cdo] 04/06: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Nov 14 14:26:05 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 5bb16fdb57960ca5f74326382abfb7badb7879fa
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Nov 11 11:16:02 2017 +0000
refresh patches
---
debian/patches/deregister.patch | 32 +++++++--------
debian/patches/fix_typos.patch | 12 +++---
debian/patches/ignore.patch | 10 ++---
debian/patches/off_t-fix.patch | 25 +++---------
debian/patches/ppc64el.patch | 6 +--
debian/patches/reproducible-builds.patch | 68 ++++++++++++++++----------------
6 files changed, 70 insertions(+), 83 deletions(-)
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index 7e3277e..2e7ced2 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.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.9.2~rc1/libcdi/src/cdilib.c
===================================================================
---- 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
+--- cdo-1.9.2~rc1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.2~rc1/libcdi/src/cdilib.c
+@@ -7773,8 +7773,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.1+dfsg.1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -19564,7 +19564,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -20321,7 +20321,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.1+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -19582,9 +19582,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20339,9 +20339,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,7 +43,7 @@ Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -19597,7 +19597,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -20354,7 +20354,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.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]; \
-@@ -19624,7 +19624,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20381,7 +20381,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -19654,8 +19654,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -20411,8 +20411,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.1+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -33878,7 +33878,7 @@ void listInitialize ( void )
+@@ -34515,7 +34515,7 @@ void listInitialize ( void )
pthread_mutexattr_destroy(&ma);
#endif
/* file is special and has its own table, which needs to be
@@ -81,10 +81,10 @@ Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.9.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.2~rc1/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;
@@ -114,10 +114,10 @@ Index: cdo-1.9.1+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.9.1+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/cksum.c
++++ cdo-1.9.2~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/fix_typos.patch b/debian/patches/fix_typos.patch
index 40c6333..1ba29ff 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.9.0+dfsg.1~rc1/src/operator_help.h
+Index: cdo-1.9.2~rc1/src/operator_help.h
===================================================================
---- 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
+--- cdo-1.9.2~rc1.orig/src/operator_help.h
++++ cdo-1.9.2~rc1/src/operator_help.h
+@@ -1846,7 +1846,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.9.0+dfsg.1~rc1/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.",
-@@ -1809,7 +1809,7 @@ std::vector<std::string> ConsecstatHelp
+@@ -1858,7 +1858,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",
@@ -25,7 +25,7 @@ Index: cdo-1.9.0+dfsg.1~rc1/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.",
};
-@@ -4903,7 +4903,7 @@ std::vector<std::string> HistogramHelp =
+@@ -4953,7 +4953,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/ignore.patch b/debian/patches/ignore.patch
index 46a4068..5ff93e3 100644
--- a/debian/patches/ignore.patch
+++ b/debian/patches/ignore.patch
@@ -6,12 +6,12 @@ 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.9.0+dfsg.1~rc1/libcdi/src/config.h.in
+Index: cdo-1.9.2~rc1/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
+--- cdo-1.9.2~rc1.orig/libcdi/src/config.h.in
++++ cdo-1.9.2~rc1/libcdi/src/config.h.in
+@@ -272,6 +272,11 @@
+ # define _DARWIN_USE_64_BIT_INODE 1
#endif
+/* Enable large inode numbers on Mac OS X 10.5. */
diff --git a/debian/patches/off_t-fix.patch b/debian/patches/off_t-fix.patch
index 6f7d4e3..1122ddc 100644
--- a/debian/patches/off_t-fix.patch
+++ b/debian/patches/off_t-fix.patch
@@ -5,10 +5,10 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Last-Updated: 2017-10-24
Forwarded: no
-Index: cdo-1.9.1+dfsg.1/src/Afterburner.cc
+Index: cdo-1.9.2~rc1/src/Afterburner.cc
===================================================================
---- cdo-1.9.1+dfsg.1.orig/src/Afterburner.cc
-+++ cdo-1.9.1+dfsg.1/src/Afterburner.cc
+--- cdo-1.9.2~rc1.orig/src/Afterburner.cc
++++ cdo-1.9.2~rc1/src/Afterburner.cc
@@ -10,6 +10,7 @@
/* */
/* ============================================================= */
@@ -17,10 +17,10 @@ Index: cdo-1.9.1+dfsg.1/src/Afterburner.cc
#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
-Index: cdo-1.9.1+dfsg.1/src/process.cc
+Index: cdo-1.9.2~rc1/src/process.cc
===================================================================
---- cdo-1.9.1+dfsg.1.orig/src/process.cc
-+++ cdo-1.9.1+dfsg.1/src/process.cc
+--- cdo-1.9.2~rc1.orig/src/process.cc
++++ cdo-1.9.2~rc1/src/process.cc
@@ -15,6 +15,7 @@
GNU General Public License for more details.
*/
@@ -29,16 +29,3 @@ Index: cdo-1.9.1+dfsg.1/src/process.cc
#if defined(HAVE_CONFIG_H)
#include "config.h"
#endif
-Index: cdo-1.9.1+dfsg.1/src/Gradsdes.cc
-===================================================================
---- cdo-1.9.1+dfsg.1.orig/src/Gradsdes.cc
-+++ cdo-1.9.1+dfsg.1/src/Gradsdes.cc
-@@ -21,7 +21,7 @@
- Gradsdes gradsdes GrADS data descriptor file
- */
-
--
-+#include <thread>
- #if defined(HAVE_CONFIG_H)
- #include "config.h" /* VERSION */
- #endif
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index a03da90..cb53d24 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.1+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.9.2~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 23e096c..17ead51 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.1+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/app/cdi.c
++++ cdo-1.9.2~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.9.1+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.9.1+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.9.2~rc1/libcdi/src/cdilib.c
===================================================================
---- 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;
+--- cdo-1.9.2~rc1.orig/libcdi/src/cdilib.c
++++ cdo-1.9.2~rc1/libcdi/src/cdilib.c
+@@ -21169,7 +21169,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.1+dfsg.1/libcdi/src/cdilib.c
const char *extLibraryVersion(void)
{
-@@ -21113,7 +21113,7 @@ static void file_table_print(void);
- #define LIBVERSION 1.8.2
+@@ -21864,7 +21864,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.9.1+dfsg.1/libcdi/src/cdilib.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-@@ -29091,7 +29091,7 @@ static int iegDefaultDprec = 0;
+@@ -29607,7 +29607,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.1+dfsg.1/libcdi/src/cdilib.c
const char *iegLibraryVersion(void)
{
-@@ -34611,7 +34611,7 @@ static int srvDefaultDprec = 0;
+@@ -35273,7 +35273,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.1+dfsg.1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.9.1+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/extralib.c
++++ cdo-1.9.2~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.9.1+dfsg.1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.9.1+dfsg.1/libcdi/src/file.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/file.c
++++ cdo-1.9.2~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.9.1+dfsg.1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.9.1+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/ieglib.c
++++ cdo-1.9.2~rc1/libcdi/src/ieglib.c
@@ -28,7 +28,7 @@ static int iegDefaultDprec = 0;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
@@ -98,12 +98,12 @@ Index: cdo-1.9.1+dfsg.1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.9.1+dfsg.1/configure.ac
+Index: cdo-1.9.2~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])
+--- cdo-1.9.2~rc1.orig/configure.ac
++++ cdo-1.9.2~rc1/configure.ac
+@@ -122,19 +122,19 @@ if test -z "$F77_VERSION" ; then F77_VER
+ AC_DEFINE_UNQUOTED(F77_VERSION, ["$F77_VERSION"], [F77 Compiler version])
# Checks for username, hostname and system type
-USERNAME=$LOGNAME
@@ -134,10 +134,10 @@ Index: cdo-1.9.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.9.1+dfsg.1/libcdi/configure.ac
+Index: cdo-1.9.2~rc1/libcdi/configure.ac
===================================================================
---- cdo-1.9.1+dfsg.1.orig/libcdi/configure.ac
-+++ cdo-1.9.1+dfsg.1/libcdi/configure.ac
+--- cdo-1.9.2~rc1.orig/libcdi/configure.ac
++++ cdo-1.9.2~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])
@@ -172,10 +172,10 @@ Index: cdo-1.9.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.9.1+dfsg.1/libcdi/src/servicelib.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/servicelib.c
++++ cdo-1.9.2~rc1/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.1+dfsg.1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.9.1+dfsg.1/libcdi/src/version.c
+Index: cdo-1.9.2~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
+--- cdo-1.9.2~rc1.orig/libcdi/src/version.c
++++ cdo-1.9.2~rc1/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