[libdap] 06/13: WIP: refresh patches

[Alastair McKinstry]

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

mckinstry pushed a commit to tag unstable/3.14.0-2
in repository libdap.

commit bac897dbe743bcc5e3590bcfeefba0eee3561dea
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat May 2 10:03:47 2015 +0100

    WIP: refresh patches
---
 debian/changelog              |  1 +
 debian/patches/series         |  2 +-
 debian/patches/xml_libs.patch | 14 +++++++-------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2028f71..4a3bbc8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ libdap (3.14.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Move to Standards-Version: 3.9.6
   * Use 'xz' compression
+  * Refreshed patches; re-enabled all tests for the moment
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 02 May 2015 09:48:51 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 645a5f0..216f3e7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 xml_libs.patch
-testsuite-failures.patch
+# testsuite-failures.patch
 pkgconfig.patch
diff --git a/debian/patches/xml_libs.patch b/debian/patches/xml_libs.patch
index 6287d0a..13cfa36 100644
--- a/debian/patches/xml_libs.patch
+++ b/debian/patches/xml_libs.patch
@@ -3,16 +3,16 @@ Description: Fix to link correctly with XML libs
 Forwarded: no
 Last-Updated: 2011-12-08
 
-Index: libdap-3.12.0/Makefile.am
+Index: libdap-3.14.0/Makefile.am
 ===================================================================
---- 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 @@
+--- libdap-3.14.0.orig/Makefile.am
++++ libdap-3.14.0/Makefile.am
+@@ -66,7 +66,7 @@ endif
  libdapclient_la_SOURCES = $(CLIENT_SRC) 
  libdapclient_la_LDFLAGS = -version-info $(CLIENTLIB_VERSION)
  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)
- 
- libdapserver_la_SOURCES = $(SERVER_SRC)
- libdapserver_la_LDFLAGS = -version-info $(SERVERLIB_VERSION)
+ if DAP4_DEFINED
+     libdapclient_la_SOURCES += $(DAP4_CLIENT_HDR) $(DAP4_CLIENT_SRC)
+ endif

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