[libdap] 05/22: refresh patches

Alastair McKinstry mckinstry at moszumanska.debian.org
Fri Nov 4 15:20:53 UTC 2016 

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

mckinstry pushed a commit to branch debian/master
in repository libdap.

commit 908a6e39a102ccbc4b1786684c9886ec78d05462
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Aug 29 18:49:37 2016 +0100

    refresh patches
---
 debian/patches/disable-cache-test.patch | 16 +++++++++-------
 debian/patches/disable-dmr-tests.patch  | 21 +++------------------
 debian/patches/disable-net-tests.patch  | 19 +++----------------
 debian/patches/g++-6.patch              | 26 --------------------------
 debian/patches/pkgconfig.patch          |  6 +++---
 debian/patches/series                   |  2 --
 debian/patches/xml_libs.patch           | 19 +++----------------
 7 files changed, 21 insertions(+), 88 deletions(-)

diff --git a/debian/patches/disable-cache-test.patch b/debian/patches/disable-cache-test.patch
index 11526e2..6ce7ae0 100644
--- a/debian/patches/disable-cache-test.patch
+++ b/debian/patches/disable-cache-test.patch
@@ -3,18 +3,20 @@ 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
+Index: libdap-3.18.0/unit-tests/Makefile.am
 ===================================================================
---- libdap-3.15.1.orig/unit-tests/Makefile.am
-+++ libdap-3.15.1/unit-tests/Makefile.am
-@@ -68,8 +68,8 @@ if CPPUNIT
+--- libdap-3.18.0.orig/unit-tests/Makefile.am
++++ libdap-3.18.0/unit-tests/Makefile.am
+@@ -67,9 +67,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+ if CPPUNIT
  UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
  	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
- 	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
+-	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
 -	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
--	HTTPCacheTest ServerFunctionsListUnitTest 
+-	HTTPCacheTest ServerFunctionsListUnitTest
++	DDSTest	DDXParserTest  generalUtilTest  parserUtilTest \
 +	SequenceTest SignalHandlerTest  MarshallerTest \
-+	ServerFunctionsListUnitTest 
++	ServerFunctionsListUnitTest
  
  if DAP4_DEFINED
  UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
diff --git a/debian/patches/disable-dmr-tests.patch b/debian/patches/disable-dmr-tests.patch
index 85d946a..d4691f5 100644
--- a/debian/patches/disable-dmr-tests.patch
+++ b/debian/patches/disable-dmr-tests.patch
@@ -3,10 +3,10 @@ Description: Disable DMR tests which break on big-endian archs at the moment
 Last-Updated: 2015-11-08
 Forwarded: no
 
-Index: libdap-3.15.1/tests/Makefile.am
+Index: libdap-3.18.0/tests/Makefile.am
 ===================================================================
---- libdap-3.15.1.orig/tests/Makefile.am
-+++ libdap-3.15.1/tests/Makefile.am
+--- libdap-3.18.0.orig/tests/Makefile.am
++++ libdap-3.18.0/tests/Makefile.am
 @@ -31,7 +31,7 @@ endif
  # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
  
@@ -29,18 +29,3 @@ Index: libdap-3.15.1/tests/Makefile.am
  	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
  
  # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
-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
-@@ -72,8 +72,8 @@ UNIT_TESTS = marshT arrayT attrTableT st
- 	ServerFunctionsListUnitTest 
- 
- if DAP4_DEFINED
--UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
--	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
-+UNIT_TESTS +=  D4DimensionsTest \
-+	D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest \
- 	chunked_iostream_test D4AsyncDocTest DMRTest
- endif
- 
diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch
index 492e68c..7c42ec1 100644
--- a/debian/patches/disable-net-tests.patch
+++ b/debian/patches/disable-net-tests.patch
@@ -4,10 +4,10 @@ Description: Disable network tests, as network not available on
 Last-Updated: 2016-02-06
 Forwarded: not-needed
 
-Index: libdap-3.15.1/tests/Makefile.am
+Index: libdap-3.18.0/tests/Makefile.am
 ===================================================================
---- libdap-3.15.1.orig/tests/Makefile.am
-+++ libdap-3.15.1/tests/Makefile.am
+--- libdap-3.18.0.orig/tests/Makefile.am
++++ libdap-3.18.0/tests/Makefile.am
 @@ -30,8 +30,7 @@ endif
  
  # TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
@@ -31,16 +31,3 @@ Index: libdap-3.15.1/tests/Makefile.am
  
  # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
  # Delete the scripts here and not using CLEANFILES because this target is
-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
-@@ -67,7 +67,7 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
- if CPPUNIT
- UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
- 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
--	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
-+	DDSTest	DDXParserTest  generalUtilTest  parserUtilTest \
- 	SequenceTest SignalHandlerTest  MarshallerTest \
- 	ServerFunctionsListUnitTest 
- 
diff --git a/debian/patches/g++-6.patch b/debian/patches/g++-6.patch
index 40f755f..0267e1a 100644
--- a/debian/patches/g++-6.patch
+++ b/debian/patches/g++-6.patch
@@ -3,29 +3,3 @@ Description: Patch needed for G++-6 (c++11 ABI) changes
 Forwarded: no
 Last-Updated: 2016-02-16
 
-Index: libdap-3.15.1/dds.yy
-===================================================================
---- libdap-3.15.1.orig/dds.yy
-+++ libdap-3.15.1/dds.yy
-@@ -262,7 +262,7 @@ declaration:  base_type var ';'
- 		| grid '{' SCAN_WORD ':'
- 		{ 
- 		    if (is_keyword(string($3), "array")) {
--			    part = array;
-+		      part = Part::array;
- 			}
- 		    else {
- 			    ostringstream msg;
-Index: libdap-3.15.1/unit-tests/generalUtilTest.cc
-===================================================================
---- libdap-3.15.1.orig/unit-tests/generalUtilTest.cc
-+++ libdap-3.15.1/unit-tests/generalUtilTest.cc
-@@ -265,7 +265,7 @@ CPPUNIT_TEST_SUITE(generalUtilTest);
-         DBG(cerr << "XXX" << unescattr("\\\"attr") << "XXX" << endl);
-         CPPUNIT_ASSERT(unescattr("\\\"attr") == "\"attr");
- 
--        char A_200_177[4] = { 128, 127, 'A', '\0' };
-+        char A_200_177[4] = { (char) 128, (char) 127, 'A', '\0' };
-         DBG(cerr << "XXX" << unescattr("\\200\\177A") << "XXX" << endl);
-         CPPUNIT_ASSERT(unescattr("\\200\\177A") == string(A_200_177));
- 
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index ca56678..ebb6c95 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: Fix missing depends
 Last-Updated: 2011-09-05
 Forwarded: no
 
-Index: libdap-3.15.1/libdapclient.pc.in
+Index: libdap-3.18.0/libdapclient.pc.in
 ===================================================================
---- libdap-3.15.1.orig/libdapclient.pc.in
-+++ libdap-3.15.1/libdapclient.pc.in
+--- libdap-3.18.0.orig/libdapclient.pc.in
++++ libdap-3.18.0/libdapclient.pc.in
 @@ -11,6 +11,6 @@ Version: @VERSION@
  Requires: libdap
  Libs: -L${libdir} -ldapclient
diff --git a/debian/patches/series b/debian/patches/series
index 26800ec..ee9817d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
-xml_libs.patch
 pkgconfig.patch
 # disable-docs.patch
 disable-cache-test.patch
 disable-dmr-tests.patch
 disable-net-tests.patch
-g++-6.patch
diff --git a/debian/patches/xml_libs.patch b/debian/patches/xml_libs.patch
index aac1457..bc60e5f 100644
--- a/debian/patches/xml_libs.patch
+++ b/debian/patches/xml_libs.patch
@@ -3,10 +3,10 @@ Description: Fix to link correctly with XML libs
 Forwarded: no
 Last-Updated: 2011-12-08
 
-Index: libdap-3.15.1/Makefile.am
+Index: libdap-3.18.0/Makefile.am
 ===================================================================
---- libdap-3.15.1.orig/Makefile.am
-+++ libdap-3.15.1/Makefile.am
+--- libdap-3.18.0.orig/Makefile.am
++++ libdap-3.18.0/Makefile.am
 @@ -67,7 +67,7 @@ endif
  libdapclient_la_SOURCES = $(CLIENT_SRC) 
  libdapclient_la_LDFLAGS = -version-info $(CLIENTLIB_VERSION)
@@ -16,16 +16,3 @@ Index: libdap-3.15.1/Makefile.am
  if DAP4_DEFINED
      libdapclient_la_SOURCES += $(DAP4_CLIENT_HDR) $(DAP4_CLIENT_SRC)
  endif
-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
-@@ -8,7 +8,7 @@ AUTOMAKE_OPTIONS = foreign
- # Headers in 'tests' are used by the arrayT unit tests.
- 
- AM_CPPFLAGS = -I$(top_srcdir)/GNU -I$(top_srcdir) -I$(top_srcdir)/tests $(CURL_CFLAGS) $(XML2_CFLAGS)
--AM_LDADD =
-+AM_LDADD = $(XML2_LIBS)
- AM_CXXFLAGS = 
- # CXXFLAGS =
- 

-- 
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