This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch master
in repository cdo.
commit 5a886237077da49da573fc5f35fdc8e9320a3baf
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Mon Feb 24 19:17:19 2014 +0000
Refresh patches
---
debian/patches/build-fixes.patch | 8 ++++----
debian/patches/disable-tests.patch | 19 ++++++++++++-------
debian/patches/ignore.patch | 12 ++++++------
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch
index 23beb26..6022bd2 100644
--- a/debian/patches/build-fixes.patch
+++ b/debian/patches/build-fixes.patch
@@ -3,11 +3,11 @@ Description: Add explicit declaration.
Last-Updated: 2013-06-06
Forwarded: no
-Index: cdo-1.6.0+dfsg.1/src/griddes.c
+Index: cdo-1.6.3+dfsg.1/src/griddes.c
===================================================================
---- cdo-1.6.0+dfsg.1.orig/src/griddes.c 2013-05-24 07:39:56.000000000 +0100
-+++ cdo-1.6.0+dfsg.1/src/griddes.c 2013-06-06 13:23:42.000000000 +0100
-@@ -57,6 +57,7 @@
+--- cdo-1.6.3+dfsg.1.orig/src/griddes.c 2014-02-24 19:15:11.072104268 +0000
++++ cdo-1.6.3+dfsg.1/src/griddes.c 2014-02-24 19:15:11.064105017 +0000
+@@ -55,6 +55,7 @@
#define MAX_LINE_LEN 65536
diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch
index 26895ab..e834622 100644
--- a/debian/patches/disable-tests.patch
+++ b/debian/patches/disable-tests.patch
@@ -3,27 +3,32 @@ Description: For some reason, top_srcdir support is broken in auto*. Disable tes
Last-Updated: 2013-11-15
Forwarded: no
-Index: cdo-1.6.2+dfsg.1/test/Makefile.am
+Index: cdo-1.6.3+dfsg.1/test/Makefile.am
===================================================================
---- cdo-1.6.2+dfsg.1.orig/test/Makefile.am 2013-11-15 12:01:13.000000000 +0000
-+++ cdo-1.6.2+dfsg.1/test/Makefile.am 2013-11-15 12:02:01.000000000 +0000
-@@ -2,11 +2,14 @@
+--- cdo-1.6.3+dfsg.1.orig/test/Makefile.am 2014-02-24 19:15:14.408181199 +0000
++++ cdo-1.6.3+dfsg.1/test/Makefile.am 2014-02-24 19:16:52.598539298 +0000
+@@ -2,13 +2,17 @@
export
-TESTS = $(top_srcdir)/test/test_Gridarea.sh \
-- $(top_srcdir)/test/test_Remap.sh \
+- $(top_srcdir)/test/test_Cat.sh \
- $(top_srcdir)/test/test_Spectral.sh \
- $(top_srcdir)/test/test_Timstat.sh \
+- $(top_srcdir)/test/test_Select.sh \
- $(top_srcdir)/test/test_Vertint.sh
+-
+# Disable any reference to top_srcdir in tests
+# or configure will break.
+# -- amck, 2013-11-15
++#
+#TESTS = $(top_srcdir)/test/test_Gridarea.sh \
-+# $(top_srcdir)/test/test_Remap.sh \
++# $(top_srcdir)/test/test_Cat.sh \
+# $(top_srcdir)/test/test_Spectral.sh \
+# $(top_srcdir)/test/test_Timstat.sh \
++# $(top_srcdir)/test/test_Select.sh \
+# $(top_srcdir)/test/test_Vertint.sh
-
++#
+ # $(top_srcdir)/test/test_Remap.sh \
# $(top_srcdir)/test/test_info.py
# $(top_srcdir)/test/test_diff.py
diff --git a/debian/patches/ignore.patch b/debian/patches/ignore.patch
index c661b5f..48d11e6 100644
--- a/debian/patches/ignore.patch
+++ b/debian/patches/ignore.patch
@@ -25,13 +25,13 @@ 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.5.6.1/libcdi/src/config.h.in
+Index: cdo-1.6.3+dfsg.1/libcdi/src/config.h.in
===================================================================
---- cdo-1.5.6.1.orig/libcdi/src/config.h.in 2012-07-19 08:55:06.000000000 +0100
-+++ cdo-1.5.6.1/libcdi/src/config.h.in 2012-09-10 21:21:38.000000000 +0100
-@@ -185,6 +185,11 @@
- /* Version number of package */
- #undef VERSION
+--- 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 @@
+ # endif
+ #endif
+/* Enable large inode numbers on Mac OS X 10.5. */
+#ifndef _DARWIN_USE_64_BIT_INODE
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git