[libdap] 05/10: Disable HTTPCache test; remove obsolete patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Nov 6 11:40:51 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/experimental
in repository libdap.
commit adf90b197c62ca3262d407d3618bfe16ddec8e69
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Oct 20 12:34:24 2015 +0100
Disable HTTPCache test; remove obsolete patches
---
debian/changelog | 5 ++++-
debian/control | 2 +-
debian/patches/curl-types-remove.patch | 19 -------------------
debian/patches/disable-cache-test.patch | 18 ++++++++++++++++++
debian/patches/g++47-fix.patch | 18 ------------------
debian/patches/series | 4 ++--
debian/patches/testsuite-failures.patch | 19 -------------------
7 files changed, 25 insertions(+), 60 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c8b373d..e30125e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
-libdap (3.15.1-1) UNRELEASED; urgency=medium
+libdap (3.15.1-1) experimental; urgency=medium
* New upstream release
+ * Disable HTTPCacheTest as website appears to be down
+ * Re-enable docs now that doxygen available.
+ * Remove obsolete patches from debian/patches directory.
-- Alastair McKinstry <mckinstry at debian.org> Sat, 17 Oct 2015 03:41:45 +0100
diff --git a/debian/control b/debian/control
index 1490bfd..b1dc9fd 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Alastair McKinstry <mckinstry at debian.org>
Build-Depends: zlib1g-dev, debhelper (>= 9), pkg-config, libxml2-dev,
libcurl4-gnutls-dev | libcurl-dev,
- libcppunit-dev, cxxtest,
+ libcppunit-dev, cxxtest, doxygen,
dejagnu, graphviz, dh-autoreconf (>= 4~),
autoconf, automake, libtool, flex, bison, uuid-dev, libjs-jquery, libpth-dev, libssl-dev
Build-Conflicts: autoconf2.13
diff --git a/debian/patches/curl-types-remove.patch b/debian/patches/curl-types-remove.patch
deleted file mode 100644
index 69c0589..0000000
--- a/debian/patches/curl-types-remove.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Remove unnecessary include that has been removed from curl, and breaks things.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Forwarded: no
-Last-Updated: 2011-08-13
-Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=80;bug=637682
-Bug-Debian: http://bugs.debian.org/637682
-
-Index: libdap-3.11.1/HTTPConnect.h
-===================================================================
---- libdap-3.11.1.orig/HTTPConnect.h 2011-12-07 14:05:05.000000000 +0000
-+++ libdap-3.11.1/HTTPConnect.h 2011-12-07 17:08:53.000000000 +0000
-@@ -30,7 +30,6 @@
- #include <string>
-
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
-
- #ifndef _rc_reader_h_
diff --git a/debian/patches/disable-cache-test.patch b/debian/patches/disable-cache-test.patch
new file mode 100644
index 0000000..a4d7a7b
--- /dev/null
+++ b/debian/patches/disable-cache-test.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Disable test as website appears to be down
+Forwarded: no
+Last-Updated: 2015-10-20
+
+Index: libdap-3.15.1/unit-tests/Makefile.am
+===================================================================
+--- libdap-3.15.1.orig/unit-tests/Makefile.am
++++ libdap-3.15.1/unit-tests/Makefile.am
+@@ -69,7 +69,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
+ RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+ DDSTest DDXParserTest generalUtilTest HTTPConnectTest parserUtilTest \
+ RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \
+- HTTPCacheTest ServerFunctionsListUnitTest
++ ServerFunctionsListUnitTest
+
+ if DAP4_DEFINED
+ UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
diff --git a/debian/patches/g++47-fix.patch b/debian/patches/g++47-fix.patch
deleted file mode 100644
index 83d8395..0000000
--- a/debian/patches/g++47-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Alastair McKinstry <mckinstry at debian.org>
-Forwwarded: no
-Description: GCC-4.7 is more strict on including headers.
-Bug-Debian: http://bugs.debian.org/672008
-
-Index: libdap-3.11.1/ResponseBuilder.cc
-===================================================================
---- libdap-3.11.1.orig/ResponseBuilder.cc 2012-05-08 16:57:16.000000000 +0100
-+++ libdap-3.11.1/ResponseBuilder.cc 2012-05-08 16:57:50.000000000 +0100
-@@ -29,7 +29,7 @@
- #include <signal.h>
-
- #ifndef WIN32
--// #include <unistd.h> // for getopt
-+#include <unistd.h> // for getopt, and alarm()
- #include <sys/wait.h>
- #else
- #include <io.h>
diff --git a/debian/patches/series b/debian/patches/series
index 2d34eac..ef753e6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
xml_libs.patch
-# testsuite-failures.patch
pkgconfig.patch
-disable-docs.patch
+# disable-docs.patch
+disable-cache-test.patch
diff --git a/debian/patches/testsuite-failures.patch b/debian/patches/testsuite-failures.patch
deleted file mode 100644
index d9a6aa1..0000000
--- a/debian/patches/testsuite-failures.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Disable a broken test (code works, but testsuite is broken, tests 59,60 fail incorrectly).
- Issue reported upstream.
-Author: Alastair McKinstry <mckinstry at debian.org>
-Forwarded: no
-Last-Updated: 2013-10-17
-
-Index: libdap-3.12.0/tests/EXPRTest.at
-===================================================================
---- 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])
- EXPR_RESPONSE_P([test.5], [g[[1:4:9]]], [test.5e], [pass])
--EXPR_RESPONSE_P([test.6], [i[[1:4:9]]], [test.6b], [pass])
-+#EXPR_RESPONSE_P([test.6], [i[[1:4:9]]], [test.6b], [pass])
- EXPR_RESPONSE_P([test.a], ["" -b], [test.a], [pass])
- EXPR_RESPONSE_P([test.a], ["&i<2000" -b], [test.aa], [pass])
- EXPR_RESPONSE_P([test.a], ["j&i>2000" -b], [test.ab], [pass])
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libdap.git
More information about the debian-science-commits
mailing list