[cdo] 04/06: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Jun 9 07:45:31 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.7.0+dfsg.1-1
in repository cdo.
commit 4cc687f3ade07f3bc838ca70affce421a106e9d8
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Oct 28 14:43:20 2015 +0000
refresh patches
---
debian/patches/deregister.patch | 48 +++++------
debian/patches/gotocc-fix.patch | 10 +--
debian/patches/ignore.patch | 8 +-
debian/patches/ppc64el.patch | 8 +-
debian/patches/reproducible-builds.patch | 136 +++++++++++++++----------------
5 files changed, 105 insertions(+), 105 deletions(-)
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index 396bd6c..195fe9b 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.6.9+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
-@@ -6329,8 +6329,8 @@ void pwr6_minmax_val_double_unrolled6(co
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
+@@ -6480,8 +6480,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.6.9+dfsg.1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -19673,7 +19673,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -19833,7 +19833,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.6.9+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -19691,9 +19691,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19851,9 +19851,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,8 +43,8 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -19705,7 +19705,7 @@ memcrc_r(uint32_t *state, const unsigned
-
+@@ -19866,7 +19866,7 @@ memcrc_r(uint32_t *state, const unsigned
+ #ifdef WORDS_BIGENDIAN
#define SWAP_CSUM(BITWIDTH,BYTEWIDTH,NACC) \
do { \
- register const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *)elems; \
@@ -52,7 +52,7 @@ Index: cdo-1.6.9+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]; \
-@@ -19732,7 +19732,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19893,7 +19893,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -19762,8 +19762,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19923,8 +19923,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.6.9+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -33016,7 +33016,7 @@ void listInitialize ( void )
+@@ -33421,7 +33421,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.6.9+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
-@@ -772,7 +772,7 @@ void avx_minmax_val_double(const double
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
+@@ -770,7 +770,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.6.9+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -865,7 +865,7 @@ void sse2_minmax_val_double(const double
+@@ -863,7 +863,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -103,7 +103,7 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -950,8 +950,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -948,8 +948,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.6.9+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.6.9+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/cksum.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/cksum.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/cksum.c
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/cksum.c
++++ cdo-1.7.0+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. */
@@ -140,8 +140,8 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cksum.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -114,7 +114,7 @@ memcrc_r(uint32_t *state, const unsigned
-
+@@ -115,7 +115,7 @@ memcrc_r(uint32_t *state, const unsigned
+ #ifdef WORDS_BIGENDIAN
#define SWAP_CSUM(BITWIDTH,BYTEWIDTH,NACC) \
do { \
- register const uint##BITWIDTH##_t *b = (uint##BITWIDTH##_t *)elems; \
@@ -149,7 +149,7 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cksum.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]; \
-@@ -141,7 +141,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -142,7 +142,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -158,7 +158,7 @@ Index: cdo-1.6.9+dfsg.1/libcdi/src/cksum.c
switch (elem_size)
{
-@@ -171,8 +171,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -172,8 +172,8 @@ memcrc_r_eswap(uint32_t *state, const un
uint32_t
memcrc_finish(uint32_t *state, off_t total_size)
{
diff --git a/debian/patches/gotocc-fix.patch b/debian/patches/gotocc-fix.patch
index 94be518..ab7145c 100644
--- a/debian/patches/gotocc-fix.patch
+++ b/debian/patches/gotocc-fix.patch
@@ -4,11 +4,11 @@ Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747001
Last-Updated: 2014-10-28
Forwarded: no
-Index: cdo-1.6.9+dfsg.1/src/expr_yacc.c
+Index: cdo-1.7.0+dfsg.1/src/expr_yacc.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/src/expr_yacc.c
-+++ cdo-1.6.9+dfsg.1/src/expr_yacc.c
-@@ -86,7 +86,7 @@ nodeType *expr_con(double value);
+--- cdo-1.7.0+dfsg.1.orig/src/expr_yacc.c
++++ cdo-1.7.0+dfsg.1/src/expr_yacc.c
+@@ -85,7 +85,7 @@ nodeType *expr_con(double value);
nodeType *expr_fun(char *fname, nodeType *p);
void freeNode(nodeType *p);
@@ -16,4 +16,4 @@ Index: cdo-1.6.9+dfsg.1/src/expr_yacc.c
+nodeType *expr_run(nodeType *p, parse_parm_t *parse_arg);
- /* Line 371 of yacc.c */
+ #line 92 "expr_yacc.c" /* yacc.c:339 */
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
index a2d0975..1fd145d 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.6.9+dfsg.1/libcdi/src/config.h.in
+Index: cdo-1.7.0+dfsg.1/libcdi/src/config.h.in
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/config.h.in
-+++ cdo-1.6.9+dfsg.1/libcdi/src/config.h.in
-@@ -252,6 +252,11 @@
+--- 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 @@
# endif
#endif
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index f9ddf23..1e0c635 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -6,11 +6,11 @@ Bug-Debian: https://bugs.debian.org/763691
Last-Updated: 2015-07-14
Forwarded: no
-Index: cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
-@@ -14,6 +14,7 @@
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/cgribexlib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
+@@ -12,6 +12,7 @@
#ifdef _ARCH_PWR6
#pragma options nostrict
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index e2c26a3..62030b6 100644
--- a/debian/patches/reproducible-builds.patch
+++ b/debian/patches/reproducible-builds.patch
@@ -4,11 +4,11 @@ Description: Make builds bit-reproducible in Debian: remove timestamps
Last-Updated: 2015-10-20
Forwarded: no
-Index: cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.7.0+dfsg.1/libcdi/app/cdi.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/app/cdi.c
-+++ cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
-@@ -67,8 +67,8 @@ void version(void)
+--- cdo-1.7.0+dfsg.1.orig/libcdi/app/cdi.c
++++ cdo-1.7.0+dfsg.1/libcdi/app/cdi.c
+@@ -76,8 +76,8 @@ void version(void)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -19,89 +19,63 @@ Index: cdo-1.6.9+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
-@@ -33743,7 +33743,7 @@ static int srvDefaultDprec = 0;
- #define LIBVERSION 1.3.2
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/cdilib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
+@@ -20677,7 +20677,7 @@ static int extDefaultNumber = EXT_REAL;
+ #define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
--static const char srv_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+static const char srv_libvers[] = STRING(LIBVERSION);
+-static const char ext_libvers[] = STRING(LIBVERSION) " of " __DATE__ " " __TIME__ ;
++static const char ext_libvers[] = STRING(LIBVERSION) ;
- const char *srvLibraryVersion(void)
+ const char *extLibraryVersion(void)
{
-Index: cdo-1.6.9+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/extralib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/extralib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/extralib.c
-@@ -35,7 +35,7 @@ static int extDefaultNumber = EXT_REAL;
- #define LIBVERSION 1.3.2
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/extralib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/extralib.c
+@@ -34,7 +34,7 @@ static int extDefaultNumber = EXT_REAL;
+ #define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
--static const char ext_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
+-static const char ext_libvers[] = STRING(LIBVERSION) " of " __DATE__ " " __TIME__ ;
+static const char ext_libvers[] = STRING(LIBVERSION) ;
const char *extLibraryVersion(void)
{
-Index: cdo-1.6.9+dfsg.1/libcdi/src/file.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/file.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/file.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/file.c
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/file.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/file.c
@@ -153,7 +153,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.2
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
--const char file_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+const char file_libvers[] = STRING(LIBVERSION) ;
+-static const char file_libvers[] = STRING(LIBVERSION) " of " __DATE__ " " __TIME__;
++static const char file_libvers[] = STRING(LIBVERSION) ;
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.6.9+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.7.0+dfsg.1/libcdi/src/ieglib.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/ieglib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/ieglib.c
-@@ -29,7 +29,7 @@ static int iegDefaultDprec = 0;
- #define LIBVERSION 1.3.3
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/ieglib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/ieglib.c
+@@ -28,7 +28,7 @@ static int iegDefaultDprec = 0;
+ #define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
--static const char ieg_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+static const char ieg_libvers[] = STRING(LIBVERSION) ;
+-static const char ieg_libvers[] = STRING(LIBVERSION) " of " __DATE__ " " __TIME__;
++static const char ieg_libvers[] = STRING(LIBVERSION);
const char *iegLibraryVersion(void)
{
-Index: cdo-1.6.9+dfsg.1/libcdi/src/servicelib.c
-===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/servicelib.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/servicelib.c
-@@ -37,7 +37,7 @@ static int srvDefaultDprec = 0;
- #define LIBVERSION 1.3.2
- #define XSTRING(x) #x
- #define STRING(x) XSTRING(x)
--static const char srv_libvers[] = STRING(LIBVERSION) " of "__DATE__" "__TIME__;
-+static const char srv_libvers[] = STRING(LIBVERSION) ;
-
- const char *srvLibraryVersion(void)
- {
-Index: cdo-1.6.9+dfsg.1/libcdi/src/version.c
+Index: cdo-1.7.0+dfsg.1/src/cdo.c
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/src/version.c
-+++ cdo-1.6.9+dfsg.1/libcdi/src/version.c
-@@ -7,7 +7,7 @@
- */
-
- #if defined (VERSION)
-- static const char cdi_libvers[] = VERSION " of "__DATE__" "__TIME__;
-+ static const char cdi_libvers[] = VERSION ;
- #else
- # error "VERSION undefined"
- #endif
-Index: cdo-1.6.9+dfsg.1/src/cdo.c
-===================================================================
---- cdo-1.6.9+dfsg.1.orig/src/cdo.c
-+++ cdo-1.6.9+dfsg.1/src/cdo.c
-@@ -107,7 +107,7 @@ void cdo_version(void)
+--- cdo-1.7.0+dfsg.1.orig/src/cdo.c
++++ cdo-1.7.0+dfsg.1/src/cdo.c
+@@ -105,7 +105,7 @@ void cdo_version(void)
fprintf(stderr, "%s\n", CDO_Version);
#if defined(USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -110,11 +84,11 @@ Index: cdo-1.6.9+dfsg.1/src/cdo.c
#endif
#if defined(COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
-Index: cdo-1.6.9+dfsg.1/configure.ac
+Index: cdo-1.7.0+dfsg.1/configure.ac
===================================================================
---- cdo-1.6.9+dfsg.1.orig/configure.ac
-+++ cdo-1.6.9+dfsg.1/configure.ac
-@@ -90,19 +90,19 @@ if test -z "$COMP_VERSION" ; then COMP_V
+--- cdo-1.7.0+dfsg.1.orig/configure.ac
++++ cdo-1.7.0+dfsg.1/configure.ac
+@@ -91,19 +91,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
@@ -146,11 +120,11 @@ Index: cdo-1.6.9+dfsg.1/configure.ac
AC_DEFINE_UNQUOTED([SYSTEM_TYPE],["$ac_cv_build"], [System type])
AC_SUBST([SYSTEM_TYPE],["$ac_cv_build"])
-Index: cdo-1.6.9+dfsg.1/libcdi/configure.ac
+Index: cdo-1.7.0+dfsg.1/libcdi/configure.ac
===================================================================
---- cdo-1.6.9+dfsg.1.orig/libcdi/configure.ac
-+++ cdo-1.6.9+dfsg.1/libcdi/configure.ac
-@@ -106,19 +106,21 @@ if test -z "$COMP_VERSION" ; then COMP_V
+--- cdo-1.7.0+dfsg.1.orig/libcdi/configure.ac
++++ cdo-1.7.0+dfsg.1/libcdi/configure.ac
+@@ -104,19 +104,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
@@ -184,3 +158,29 @@ Index: cdo-1.6.9+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.0+dfsg.1/libcdi/src/servicelib.c
+===================================================================
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/servicelib.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/servicelib.c
+@@ -34,7 +34,7 @@ static int srvDefaultDprec = 0;
+ #define LIBVERSION 1.4.0
+ #define XSTRING(x) #x
+ #define STRING(x) XSTRING(x)
+-static const char srv_libvers[] = STRING(LIBVERSION) " of " __DATE__" " __TIME__;
++static const char srv_libvers[] = STRING(LIBVERSION);
+
+ const char *srvLibraryVersion(void)
+ {
+Index: cdo-1.7.0+dfsg.1/libcdi/src/version.c
+===================================================================
+--- cdo-1.7.0+dfsg.1.orig/libcdi/src/version.c
++++ cdo-1.7.0+dfsg.1/libcdi/src/version.c
+@@ -9,7 +9,7 @@
+ */
+
+ #if defined (VERSION)
+- static const char cdi_libvers[] = VERSION " of " __DATE__" " __TIME__;
++ static const char cdi_libvers[] = VERSION;
+ #else
+ # error "VERSION undefined"
+ #endif
--
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