[libdap] 44/48: Refresh patches

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.12.0-1
in repository libdap.

commit 9ea417d83c7e33ab74bdd188362779333a4e95ee
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Oct 17 22:57:59 2013 +0100

    Refresh patches
---
 debian/patches/testsuite-failures.patch | 16 ++++------------
 debian/patches/xml_libs.patch           | 10 +++++-----
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/debian/patches/testsuite-failures.patch b/debian/patches/testsuite-failures.patch
index 8be395e..d9a6aa1 100644
--- a/debian/patches/testsuite-failures.patch
+++ b/debian/patches/testsuite-failures.patch
@@ -2,20 +2,12 @@ Description: Disable a broken test (code works, but testsuite is broken, tests 5
  Issue reported upstream.
 Author: Alastair McKinstry <mckinstry at debian.org>
 Forwarded: no
-Last-Updated: 2011-08-13
+Last-Updated: 2013-10-17
 
-Index: libdap-3.11.1/tests/expr-testsuite/test.6b.base
+Index: libdap-3.12.0/tests/EXPRTest.at
 ===================================================================
---- libdap-3.11.1.orig/tests/expr-testsuite/test.6b.base	2011-12-07 14:05:05.000000000 +0000
-+++ libdap-3.11.1/tests/expr-testsuite/test.6b.base	2011-12-07 17:08:53.000000000 +0000
-@@ -1,2 +1 @@
- Error: The number of dimensions in the constraint for i must match the number in the array.
-- 
-\ No newline at end of file
-Index: libdap-3.11.1/tests/EXPRTest.at
-===================================================================
---- libdap-3.11.1.orig/tests/EXPRTest.at	2011-12-07 14:05:05.000000000 +0000
-+++ libdap-3.11.1/tests/EXPRTest.at	2011-12-07 17:08:53.000000000 +0000
+--- libdap-3.12.0.orig/tests/EXPRTest.at	2013-10-17 22:56:27.000000000 +0100
++++ libdap-3.12.0/tests/EXPRTest.at	2013-10-17 22:56:27.000000000 +0100
 @@ -74,7 +74,7 @@
  EXPR_RESPONSE_P([test.8], ["data%20name,y"], [test.8b], [pass])
  EXPR_RESPONSE_P([test.9], ["Data-Set-2.fakeDim0[[0:3]],Data-Set-2.fakeDim1[[0:3]]"], [test.9], [pass])
diff --git a/debian/patches/xml_libs.patch b/debian/patches/xml_libs.patch
index 945651b..6287d0a 100644
--- a/debian/patches/xml_libs.patch
+++ b/debian/patches/xml_libs.patch
@@ -3,14 +3,14 @@ Description: Fix to link correctly with XML libs
 Forwarded: no
 Last-Updated: 2011-12-08
 
-Index: libdap-3.11.1/Makefile.am
+Index: libdap-3.12.0/Makefile.am
 ===================================================================
---- libdap-3.11.1.orig/Makefile.am	2011-12-07 14:05:05.000000000 +0000
-+++ libdap-3.11.1/Makefile.am	2011-12-07 17:08:53.000000000 +0000
-@@ -49,7 +49,7 @@
+--- libdap-3.12.0.orig/Makefile.am	2013-10-17 22:54:41.000000000 +0100
++++ libdap-3.12.0/Makefile.am	2013-10-17 22:55:52.000000000 +0100
+@@ -71,7 +71,7 @@
  libdapclient_la_SOURCES = $(CLIENT_SRC) 
  libdapclient_la_LDFLAGS = -version-info $(CLIENTLIB_VERSION)
- libdapclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS) $(XML2_CFLAGS)
+ libdapclient_la_CPPFLAGS = $(AM_CPPFLAGS) $(CURL_CFLAGS)
 -libdapclient_la_LIBADD = $(CURL_LIBS) libdap.la $(PTHREAD_LIBS)
 +libdapclient_la_LIBADD = $(XML2_LIBS) $(CURL_LIBS) libdap.la $(PTHREAD_LIBS)
  

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