[cdo] 05/16: - gotocc-fix.patch removed
Alastair McKinstry
mckinstry at moszumanska.debian.org
Thu Aug 11 11:15:21 UTC 2016
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cdo.
commit 9b41484adf404c9b50c9bdceb983580fcec869eb
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Apr 27 10:24:35 2016 +0100
- gotocc-fix.patch removed
---
debian/changelog | 10 ++---
debian/patches/deregister.patch | 38 ++++++++--------
debian/patches/gotocc-fix.patch | 19 --------
debian/patches/hppa_gomp_bug.patch | 6 ++-
debian/patches/libc-2.23-fixes.patch | 6 +--
debian/patches/ppc64el.patch | 6 +--
debian/patches/reproducible-builds.patch | 76 ++++++++++++++++----------------
debian/patches/series | 1 -
8 files changed, 70 insertions(+), 92 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 712511c..3cae319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,13 @@
cdo (1.7.1+dfsg.1-1) UNRELEASED; urgency=medium
* New upstream release
+ - gotocc-fix.patch removed
* Standards-Version: 3.9.8
-
- -- Alastair McKinstry <mckinstry at debian.org> Wed, 27 Apr 2016 10:15:39 +0100
-
-cdo (1.7.0+dfsg.1-4) UNRELEASED; urgency=medium
-
- * Enable CMOR support.
+ * Enable experimental CMOR support.
* Bugfix for FTBFS with libc 2.23. Closes: #818826.
* Workaround for hppa FTBFS (GCC ICE). Closes: #790393.
- -- Alastair McKinstry <mckinstry at debian.org> Sun, 20 Mar 2016 15:37:34 +0000
+ -- Alastair McKinstry <mckinstry at debian.org> Wed, 27 Apr 2016 10:15:39 +0100
cdo (1.7.0+dfsg.1-3) unstable; urgency=medium
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index 195fe9b..f911a59 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.0+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- 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
+--- 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
size_t i, j;
size_t residual = datasize % __UNROLL_DEPTH_1;
size_t ofs = datasize - residual;
@@ -21,7 +21,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-@@ -19833,7 +19833,7 @@ memcrc(const unsigned char *b, size_t n)
+@@ -19520,7 +19520,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.0+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -19851,9 +19851,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19538,9 +19538,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -43,7 +43,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -19866,7 +19866,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19553,7 +19553,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.0+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]; \
-@@ -19893,7 +19893,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19580,7 +19580,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -61,7 +61,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -19923,8 +19923,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19610,8 +19610,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.0+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -33421,7 +33421,7 @@ void listInitialize ( void )
+@@ -33748,7 +33748,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.0+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- 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
+--- 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
double fmin[4], fmax[4];
__m256d current_max, current_min, work;
@@ -94,7 +94,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -863,7 +863,7 @@ void sse2_minmax_val_double(const double
+@@ -600,7 +600,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -103,7 +103,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -948,8 +948,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -684,8 +684,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.0+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.7.0+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.7.1+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
+--- cdo-1.7.1+dfsg.1.orig/libcdi/src/cksum.c
++++ cdo-1.7.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/gotocc-fix.patch b/debian/patches/gotocc-fix.patch
deleted file mode 100644
index ab7145c..0000000
--- a/debian/patches/gotocc-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Description: Fix expr() definition conflict spotted by gotocc project
-Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747001
-Last-Updated: 2014-10-28
-Forwarded: no
-
-Index: cdo-1.7.0+dfsg.1/src/expr_yacc.c
-===================================================================
---- 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);
--int expr_run(nodeType *p, parse_parm_t *parse_arg);
-+nodeType *expr_run(nodeType *p, parse_parm_t *parse_arg);
-
-
- #line 92 "expr_yacc.c" /* yacc.c:339 */
diff --git a/debian/patches/hppa_gomp_bug.patch b/debian/patches/hppa_gomp_bug.patch
index 4cf7ba3..b8a4b91 100644
--- a/debian/patches/hppa_gomp_bug.patch
+++ b/debian/patches/hppa_gomp_bug.patch
@@ -9,8 +9,10 @@ Bug-Origin: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790393
Last-Updated: 2016-03-21
Forwarded: no
---- cdo-1.7.0+dfsg.1.orig/src/remaplib.c
-+++ cdo-1.7.0+dfsg.1/src/remaplib.c
+Index: cdo-1.7.1+dfsg.1/src/remaplib.c
+===================================================================
+--- cdo-1.7.1+dfsg.1.orig/src/remaplib.c
++++ cdo-1.7.1+dfsg.1/src/remaplib.c
@@ -1573,13 +1573,14 @@ void remap_stat(int remap_order, remapgr
/*****************************************************************************/
diff --git a/debian/patches/libc-2.23-fixes.patch b/debian/patches/libc-2.23-fixes.patch
index b20f72f..955199c 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.7.0+dfsg.1/src/EOFs.c
+Index: cdo-1.7.1+dfsg.1/src/EOFs.c
===================================================================
---- cdo-1.7.0+dfsg.1.orig/src/EOFs.c
-+++ cdo-1.7.0+dfsg.1/src/EOFs.c
+--- cdo-1.7.1+dfsg.1.orig/src/EOFs.c
++++ cdo-1.7.1+dfsg.1/src/EOFs.c
@@ -181,7 +181,7 @@ void *EOFs(void * argument)
juldate_t juldate;
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index 1e0c635..76179b6 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.0+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.7.0+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.7.0+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
@@ -12,6 +12,7 @@
#ifdef _ARCH_PWR6
diff --git a/debian/patches/reproducible-builds.patch b/debian/patches/reproducible-builds.patch
index 9d45ccc..a7abd70 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.7.0+dfsg.1/libcdi/app/cdi.c
+Index: cdo-1.7.1+dfsg.1/libcdi/app/cdi.c
===================================================================
---- 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)
+--- cdo-1.7.1+dfsg.1.orig/libcdi/app/cdi.c
++++ cdo-1.7.1+dfsg.1/libcdi/app/cdi.c
+@@ -86,8 +86,8 @@ void version(void)
fprintf(stderr, " version: %s\n", COMP_VERSION);
#endif
#if defined (USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -19,11 +19,11 @@ Index: cdo-1.7.0+dfsg.1/libcdi/app/cdi.c
#endif
fprintf(stderr, "filetype: ");
-Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- 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;
+--- 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;
#define LIBVERSION 1.4.0
#define XSTRING(x) #x
#define STRING(x) XSTRING(x)
@@ -32,7 +32,7 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/cdilib.c
const char *extLibraryVersion(void)
{
-@@ -21378,7 +21378,7 @@ static void file_table_print(void);
+@@ -21069,7 +21069,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.0+dfsg.1/libcdi/src/cdilib.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-@@ -28911,7 +28911,7 @@ static int iegDefaultDprec = 0;
+@@ -28963,7 +28963,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.0+dfsg.1/libcdi/src/cdilib.c
const char *iegLibraryVersion(void)
{
-@@ -34154,7 +34154,7 @@ static int srvDefaultDprec = 0;
+@@ -34481,7 +34481,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.0+dfsg.1/libcdi/src/cdilib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.7.0+dfsg.1/libcdi/src/extralib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/extralib.c
===================================================================
---- cdo-1.7.0+dfsg.1.orig/libcdi/src/extralib.c
-+++ cdo-1.7.0+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
@@ -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.7.0+dfsg.1/libcdi/src/extralib.c
const char *extLibraryVersion(void)
{
-Index: cdo-1.7.0+dfsg.1/libcdi/src/file.c
+Index: cdo-1.7.1+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
+--- 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
#define XSTRING(x) #x
@@ -85,10 +85,10 @@ Index: cdo-1.7.0+dfsg.1/libcdi/src/file.c
/*
21/05/2004 1.3.2 set min I/O Buffersize to 128k
-Index: cdo-1.7.0+dfsg.1/libcdi/src/ieglib.c
+Index: cdo-1.7.1+dfsg.1/libcdi/src/ieglib.c
===================================================================
---- cdo-1.7.0+dfsg.1.orig/libcdi/src/ieglib.c
-+++ cdo-1.7.0+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
@@ -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.0+dfsg.1/libcdi/src/ieglib.c
const char *iegLibraryVersion(void)
{
-Index: cdo-1.7.0+dfsg.1/src/cdo.c
+Index: cdo-1.7.1+dfsg.1/src/cdo.c
===================================================================
---- 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)
+--- 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)
fprintf(stderr, "%s\n", CDO_Version);
#if defined(USER_NAME) && defined(HOST_NAME) && defined(SYSTEM_TYPE)
@@ -111,11 +111,11 @@ Index: cdo-1.7.0+dfsg.1/src/cdo.c
#endif
#if defined(COMPILER)
fprintf(stderr, "Compiler: %s\n", COMPILER);
-Index: cdo-1.7.0+dfsg.1/configure.ac
+Index: cdo-1.7.1+dfsg.1/configure.ac
===================================================================
---- 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
+--- 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
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
@@ -147,11 +147,11 @@ Index: cdo-1.7.0+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.0+dfsg.1/libcdi/configure.ac
+Index: cdo-1.7.1+dfsg.1/libcdi/configure.ac
===================================================================
---- 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
+--- 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
AC_DEFINE_UNQUOTED(COMP_VERSION, ["$COMP_VERSION"], [Compiler version])
# Checks for username, hostname and system type
@@ -185,10 +185,10 @@ Index: cdo-1.7.0+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
+Index: cdo-1.7.1+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
+--- cdo-1.7.1+dfsg.1.orig/libcdi/src/servicelib.c
++++ cdo-1.7.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.0+dfsg.1/libcdi/src/servicelib.c
const char *srvLibraryVersion(void)
{
-Index: cdo-1.7.0+dfsg.1/libcdi/src/version.c
+Index: cdo-1.7.1+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
+--- cdo-1.7.1+dfsg.1.orig/libcdi/src/version.c
++++ cdo-1.7.1+dfsg.1/libcdi/src/version.c
@@ -9,7 +9,7 @@
*/
diff --git a/debian/patches/series b/debian/patches/series
index 5ec1e0f..1e9d82e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
fix_typos.patch
ignore.patch
-gotocc-fix.patch
deregister.patch
reproducible-builds.patch
ppc64el.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