[cdo] 44/84: refresh

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository cdo.

commit ba381f2861b28eb93248e3de6cbdd46df8f0f415
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 15 12:02:28 2013 +0000

    refresh
---
 debian/patches/disable-tests.patch | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/patches/disable-tests.patch b/debian/patches/disable-tests.patch
index 3f03432..26895ab 100644
--- a/debian/patches/disable-tests.patch
+++ b/debian/patches/disable-tests.patch
@@ -3,16 +3,27 @@ Description: For some reason, top_srcdir support is broken in auto*. Disable tes
 Last-Updated: 2013-11-15
 Forwarded: no
 
-Index: cdo-1.6.0+dfsg.1/test/Makefile.am
+Index: cdo-1.6.2+dfsg.1/test/Makefile.am
 ===================================================================
---- cdo-1.6.0+dfsg.1.orig/test/Makefile.am	2013-06-20 02:55:11.000000000 +0100
-+++ cdo-1.6.0+dfsg.1/test/Makefile.am	2013-06-20 03:03:17.000000000 +0100
-@@ -2,7 +2,7 @@
+--- 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 @@
  
  export
  
--TESTS = $(top_srcdir)/test/test_info.py
-+# TESTS = $(top_srcdir)/test/test_info.py
+-TESTS = $(top_srcdir)/test/test_Gridarea.sh \
+-        $(top_srcdir)/test/test_Remap.sh \
+-        $(top_srcdir)/test/test_Spectral.sh \
+-        $(top_srcdir)/test/test_Timstat.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_Spectral.sh \
++#        $(top_srcdir)/test/test_Timstat.sh \
++#        $(top_srcdir)/test/test_Vertint.sh
  
+ #       $(top_srcdir)/test/test_info.py
  #	$(top_srcdir)/test/test_diff.py
- #	$(top_srcdir)/test/test_Arith.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cdo.git