[cdo] 11/14: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Aug 23 11:53:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/1.6.9+dfsg.1-1
in repository cdo.
commit 60fa6610565b0751b12463cb0e4a4eab02483298
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Jul 20 04:18:55 2015 +0100
refresh patches
---
debian/patches/deregister.patch | 76 ++++++++++++++++-------------------------
debian/patches/fix_typos.patch | 22 ++++++------
debian/patches/gotocc-fix.patch | 6 ++--
debian/patches/ignore.patch | 8 ++---
debian/patches/series | 1 -
5 files changed, 47 insertions(+), 66 deletions(-)
diff --git a/debian/patches/deregister.patch b/debian/patches/deregister.patch
index 0c7944b..396bd6c 100644
--- a/debian/patches/deregister.patch
+++ b/debian/patches/deregister.patch
@@ -6,11 +6,22 @@ Description: Remove 'register' from C code. Especially never try to get the
Last-Updated: 2015-06-29
Forwarded: no
-Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/cdilib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/cdilib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
-@@ -6020,7 +6020,7 @@ memcrc(const unsigned char *b, size_t n)
+--- 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
+ size_t i, j;
+ size_t residual = datasize % __UNROLL_DEPTH_1;
+ size_t ofs = datasize - residual;
+- double register dmin[__UNROLL_DEPTH_1];
+- double register dmax[__UNROLL_DEPTH_1];
++ double dmin[__UNROLL_DEPTH_1];
++ double dmax[__UNROLL_DEPTH_1];
+
+ for ( j = 0; j < __UNROLL_DEPTH_1; j++)
+ {
+@@ -19673,7 +19673,7 @@ memcrc(const unsigned char *b, size_t n)
/* Extend with the length of the string. */
while (n != 0) {
@@ -19,7 +30,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
n >>= 8;
s = (s << 8) ^ crctab[(s >> 24) ^ c];
}
-@@ -6038,9 +6038,9 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19691,9 +19691,9 @@ memcrc_r(uint32_t *state, const unsigned
*/
@@ -32,7 +43,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
for (; n > 0; --n) {
c = (uint32_t)(*b++);
-@@ -6052,7 +6052,7 @@ memcrc_r(uint32_t *state, const unsigned
+@@ -19705,7 +19705,7 @@ memcrc_r(uint32_t *state, const unsigned
#define SWAP_CSUM(BITWIDTH,BYTEWIDTH,NACC) \
do { \
@@ -41,7 +52,7 @@ Index: cdo-1.6.6+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]; \
-@@ -6079,7 +6079,7 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19732,7 +19732,7 @@ memcrc_r_eswap(uint32_t *state, const un
size_t elem_size)
{
#ifdef WORDS_BIGENDIAN
@@ -50,7 +61,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
switch (elem_size)
{
-@@ -6109,8 +6109,8 @@ memcrc_r_eswap(uint32_t *state, const un
+@@ -19762,8 +19762,8 @@ memcrc_r_eswap(uint32_t *state, const un
uint32_t
memcrc_finish(uint32_t *state, off_t total_size)
{
@@ -61,36 +72,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
/* Extend with the length of the string. */
while (n != 0) {
-@@ -48913,7 +48913,7 @@ void avx_minmax_val_double(const double
- double fmin[4], fmax[4];
- __m256d current_max, current_min, work;
-
-- // load max and min values into all four slots of the YMM registers
-+ // load max and min values into all four slots of the YMM s
- current_min = _mm256_set1_pd(*min);
- current_max = _mm256_set1_pd(*max);
-
-@@ -49006,7 +49006,7 @@ void sse2_minmax_val_double(const double
- {
- __m128d current_max, current_min, work;
-
-- // load starting max and min values into all slots of the XMM registers
-+ // load starting max and min values into all slots of the XMM s
- current_min = _mm_set1_pd(*min);
- current_max = _mm_set1_pd(*max);
-
-@@ -49091,8 +49091,8 @@ void pwr6_minmax_val_double_unrolled6(co
- size_t i, j;
- size_t residual = datasize % __UNROLL_DEPTH_1;
- size_t ofs = datasize - residual;
-- double register dmin[__UNROLL_DEPTH_1];
-- double register dmax[__UNROLL_DEPTH_1];
-+ double dmin[__UNROLL_DEPTH_1];
-+ double dmax[__UNROLL_DEPTH_1];
-
- for ( j = 0; j < __UNROLL_DEPTH_1; j++)
- {
-@@ -63703,7 +63703,7 @@ void listInitialize ( void )
+@@ -33016,7 +33016,7 @@ void listInitialize ( void )
pthread_mutexattr_destroy(&ma);
#endif
/* file is special and has its own table, which needs to be
@@ -99,11 +81,11 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cdilib.c
{
int null_id;
null_id = fileOpen_serial("/dev/null", "r");
-Index: cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/cgribexlib.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/cgribexlib.c
-+++ cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
-@@ -763,7 +763,7 @@ void avx_minmax_val_double(const double
+--- 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
double fmin[4], fmax[4];
__m256d current_max, current_min, work;
@@ -112,7 +94,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm256_set1_pd(*min);
current_max = _mm256_set1_pd(*max);
-@@ -856,7 +856,7 @@ void sse2_minmax_val_double(const double
+@@ -865,7 +865,7 @@ void sse2_minmax_val_double(const double
{
__m128d current_max, current_min, work;
@@ -121,7 +103,7 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
current_min = _mm_set1_pd(*min);
current_max = _mm_set1_pd(*max);
-@@ -941,8 +941,8 @@ void pwr6_minmax_val_double_unrolled6(co
+@@ -950,8 +950,8 @@ void pwr6_minmax_val_double_unrolled6(co
size_t i, j;
size_t residual = datasize % __UNROLL_DEPTH_1;
size_t ofs = datasize - residual;
@@ -132,10 +114,10 @@ Index: cdo-1.6.6+dfsg.1/libcdi/src/cgribexlib.c
for ( j = 0; j < __UNROLL_DEPTH_1; j++)
{
-Index: cdo-1.6.6+dfsg.1/libcdi/src/cksum.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/cksum.c
===================================================================
---- cdo-1.6.6+dfsg.1.orig/libcdi/src/cksum.c
-+++ cdo-1.6.6+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
@@ -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 88d0c22..d86318c 100644
--- a/debian/patches/fix_typos.patch
+++ b/debian/patches/fix_typos.patch
@@ -1,8 +1,8 @@
-Index: cdo-1.6.2+dfsg.1/libcdi/src/grid.c
+Index: cdo-1.6.9+dfsg.1/libcdi/src/grid.c
===================================================================
---- cdo-1.6.2+dfsg.1.orig/libcdi/src/grid.c 2013-11-15 10:42:27.000000000 +0000
-+++ cdo-1.6.2+dfsg.1/libcdi/src/grid.c 2013-11-15 10:42:57.000000000 +0000
-@@ -3896,8 +3896,8 @@
+--- cdo-1.6.9+dfsg.1.orig/libcdi/src/grid.c
++++ cdo-1.6.9+dfsg.1/libcdi/src/grid.c
+@@ -3456,8 +3456,8 @@ const double *gridInqYvalsPtr(int gridID
@Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
@Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
@Item lat2 Second latitude at which the secant cone cuts the sphere.
@@ -13,7 +13,7 @@ Index: cdo-1.6.2+dfsg.1/libcdi/src/grid.c
@Item projflag Projection centre flag.
@Item scanflag Scanning mode flag.
-@@ -3952,8 +3952,8 @@
+@@ -3503,8 +3503,8 @@ void gridDefLCC(int gridID, double origi
@Item lonParY The East longitude of the meridian which is parallel to the Y-axis.
@Item lat1 First latitude from the pole at which the secant cone cuts the sphere.
@Item lat2 Second latitude at which the secant cone cuts the sphere.
@@ -24,11 +24,11 @@ Index: cdo-1.6.2+dfsg.1/libcdi/src/grid.c
@Item projflag Projection centre flag.
@Item scanflag Scanning mode flag.
-Index: cdo-1.6.2+dfsg.1/src/operator_help.h
+Index: cdo-1.6.9+dfsg.1/src/operator_help.h
===================================================================
---- cdo-1.6.2+dfsg.1.orig/src/operator_help.h 2013-11-15 10:42:27.000000000 +0000
-+++ cdo-1.6.2+dfsg.1/src/operator_help.h 2013-11-15 10:42:27.000000000 +0000
-@@ -1443,7 +1443,7 @@
+--- cdo-1.6.9+dfsg.1.orig/src/operator_help.h
++++ cdo-1.6.9+dfsg.1/src/operator_help.h
+@@ -1611,7 +1611,7 @@ static char *ConsecstatHelp[] = {
"",
"DESCRIPTION",
" This module computes periods over all timesteps in ifile where a",
@@ -37,7 +37,7 @@ Index: cdo-1.6.2+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.",
-@@ -1455,7 +1455,7 @@
+@@ -1623,7 +1623,7 @@ static char *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",
@@ -46,7 +46,7 @@ Index: cdo-1.6.2+dfsg.1/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.",
NULL
-@@ -4121,7 +4121,7 @@
+@@ -4447,7 +4447,7 @@ static char *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/gotocc-fix.patch b/debian/patches/gotocc-fix.patch
index 3e17f22..94be518 100644
--- a/debian/patches/gotocc-fix.patch
+++ b/debian/patches/gotocc-fix.patch
@@ -4,10 +4,10 @@ Origin-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747001
Last-Updated: 2014-10-28
Forwarded: no
-Index: cdo-1.6.5+dfsg.1/src/expr_yacc.c
+Index: cdo-1.6.9+dfsg.1/src/expr_yacc.c
===================================================================
---- cdo-1.6.5+dfsg.1.orig/src/expr_yacc.c
-+++ cdo-1.6.5+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);
nodeType *expr_fun(char *fname, nodeType *p);
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
index 48d11e6..a2d0975 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.3+dfsg.1/libcdi/src/config.h.in
+Index: cdo-1.6.9+dfsg.1/libcdi/src/config.h.in
===================================================================
---- cdo-1.6.3+dfsg.1.orig/libcdi/src/config.h.in 2014-02-24 19:15:03.239912792 +0000
-+++ cdo-1.6.3+dfsg.1/libcdi/src/config.h.in 2014-02-24 19:15:03.239912792 +0000
-@@ -232,6 +232,11 @@
+--- 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 @@
# endif
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 775e128..f18f400 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-deregister.patch
fix_typos.patch
ignore.patch
gotocc-fix.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