[libdap] 11/16: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Fri Jul 28 11:14:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository libdap.
commit ba14b806d6ab28445ce688fc43cd6e6ba544aada
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Wed Jun 21 12:53:42 2017 +0100
refresh patches
---
debian/patches/disable-D4FilterClauseTest.patch | 8 +-
debian/patches/disable-cache-test.patch | 6 +-
debian/patches/disable-dmr-tests.patch | 6 +-
debian/patches/disable-net-tests.patch | 6 +-
debian/patches/pkgconfig.patch | 6 +-
debian/patches/unique_ptr.patch | 135 ++++++++++++------------
6 files changed, 84 insertions(+), 83 deletions(-)
diff --git a/debian/patches/disable-D4FilterClauseTest.patch b/debian/patches/disable-D4FilterClauseTest.patch
index 779e4e1..023fad4 100644
--- a/debian/patches/disable-D4FilterClauseTest.patch
+++ b/debian/patches/disable-D4FilterClauseTest.patch
@@ -4,16 +4,16 @@ Last-Updated: 2016-10-31
Bug-Origin: https://bugs.debian.org/836187
Forwarded: no
-Index: libdap-3.18.1/unit-tests/Makefile.am
+Index: libdap-3.19.0/unit-tests/Makefile.am
===================================================================
---- libdap-3.18.1.orig/unit-tests/Makefile.am
-+++ libdap-3.18.1/unit-tests/Makefile.am
+--- libdap-3.19.0.orig/unit-tests/Makefile.am
++++ libdap-3.19.0/unit-tests/Makefile.am
@@ -74,7 +74,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
if DAP4_DEFINED
UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
D4EnumDefsTest D4GroupTest D4ParserSax2Test D4AttributesTest D4EnumTest \
- chunked_iostream_test D4AsyncDocTest DMRTest D4FilterClauseTest \
+ chunked_iostream_test D4AsyncDocTest DMRTest \
- D4SequenceTest
+ D4SequenceTest DmrRoundTripTest DmrToDap2Test
endif
diff --git a/debian/patches/disable-cache-test.patch b/debian/patches/disable-cache-test.patch
index 6ce7ae0..5489532 100644
--- a/debian/patches/disable-cache-test.patch
+++ b/debian/patches/disable-cache-test.patch
@@ -3,10 +3,10 @@ Description: Disable test as website appears to be down
Forwarded: no
Last-Updated: 2015-10-20
-Index: libdap-3.18.0/unit-tests/Makefile.am
+Index: libdap-3.19.0/unit-tests/Makefile.am
===================================================================
---- libdap-3.18.0.orig/unit-tests/Makefile.am
-+++ libdap-3.18.0/unit-tests/Makefile.am
+--- libdap-3.19.0.orig/unit-tests/Makefile.am
++++ libdap-3.19.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 \
diff --git a/debian/patches/disable-dmr-tests.patch b/debian/patches/disable-dmr-tests.patch
index d4691f5..cdc586b 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.18.0/tests/Makefile.am
+Index: libdap-3.19.0/tests/Makefile.am
===================================================================
---- libdap-3.18.0.orig/tests/Makefile.am
-+++ libdap-3.18.0/tests/Makefile.am
+--- libdap-3.19.0.orig/tests/Makefile.am
++++ libdap-3.19.0/tests/Makefile.am
@@ -31,7 +31,7 @@ endif
# TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
diff --git a/debian/patches/disable-net-tests.patch b/debian/patches/disable-net-tests.patch
index 7c42ec1..de43b6f 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.18.0/tests/Makefile.am
+Index: libdap-3.19.0/tests/Makefile.am
===================================================================
---- libdap-3.18.0.orig/tests/Makefile.am
-+++ libdap-3.18.0/tests/Makefile.am
+--- libdap-3.19.0.orig/tests/Makefile.am
++++ libdap-3.19.0/tests/Makefile.am
@@ -30,8 +30,7 @@ endif
# TESTS = DASTest DDSTest EXPRTest DMRTest getdapTest
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 66f50a5..36c9d94 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.git/libdapclient.pc.in
+Index: libdap-3.19.0/libdapclient.pc.in
===================================================================
---- libdap.git.orig/libdapclient.pc.in
-+++ libdap.git/libdapclient.pc.in
+--- libdap-3.19.0.orig/libdapclient.pc.in
++++ libdap-3.19.0/libdapclient.pc.in
@@ -11,6 +11,6 @@ Version: @VERSION@
Requires: libdap
Libs: -L${libdir} -ldapclient
diff --git a/debian/patches/unique_ptr.patch b/debian/patches/unique_ptr.patch
index c07b935..4e50c70 100644
--- a/debian/patches/unique_ptr.patch
+++ b/debian/patches/unique_ptr.patch
@@ -3,11 +3,11 @@ Description: Move from deprecated auto_ptr to std::unique_ptr
Last-Updated: 2016-10-03
Forwarded: no
-Index: libdap.git/tests/dmr-test.cc
+Index: libdap-3.19.0/tests/dmr-test.cc
===================================================================
---- libdap.git.orig/tests/dmr-test.cc
-+++ libdap.git/tests/dmr-test.cc
-@@ -148,7 +148,7 @@ send_data(DMR *dataset, const string &co
+--- libdap-3.19.0.orig/tests/dmr-test.cc
++++ libdap-3.19.0/tests/dmr-test.cc
+@@ -150,7 +150,7 @@ send_data(DMR *dataset, const string &co
// It's declared at this scope because we (may) need it for the code beyond the
// function parse/eval code that immediately follows. jhrg 3/12/14
D4TestTypeFactory d4_factory;
@@ -16,10 +16,10 @@ Index: libdap.git/tests/dmr-test.cc
// The Function Parser
if (!function.empty()) {
-Index: libdap.git/unit-tests/HTTPCacheTest.cc
+Index: libdap-3.19.0/unit-tests/HTTPCacheTest.cc
===================================================================
---- libdap.git.orig/unit-tests/HTTPCacheTest.cc
-+++ libdap.git/unit-tests/HTTPCacheTest.cc
+--- libdap-3.19.0.orig/unit-tests/HTTPCacheTest.cc
++++ libdap-3.19.0/unit-tests/HTTPCacheTest.cc
@@ -543,7 +543,7 @@ public:
try {
delete hc;
@@ -83,119 +83,119 @@ Index: libdap.git/unit-tests/HTTPCacheTest.cc
CPPUNIT_ASSERT(!pc->is_url_in_cache(feb));
}
catch (Error &e) {
-Index: libdap.git/unit-tests/D4FilterClauseTest.cc
+Index: libdap-3.19.0/unit-tests/D4FilterClauseTest.cc
===================================================================
---- libdap.git.orig/unit-tests/D4FilterClauseTest.cc
-+++ libdap.git/unit-tests/D4FilterClauseTest.cc
-@@ -109,25 +109,25 @@ public:
+--- libdap-3.19.0.orig/unit-tests/D4FilterClauseTest.cc
++++ libdap-3.19.0/unit-tests/D4FilterClauseTest.cc
+@@ -115,25 +115,25 @@ public:
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((long long)21);
+ D4RValue *arg2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value(dmr));
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((long long)21);
+ D4RValue *arg2_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
-+ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
++ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value(dmr));
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((long long)21);
+ D4RValue *arg3_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value(dmr));
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((long long)21);
+ D4RValue *arg4_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value(dmr));
}
-@@ -136,25 +136,25 @@ public:
+@@ -143,25 +143,25 @@ public:
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((long long)21);
+ D4RValue *arg2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((long long)21);
+ D4RValue *arg2_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value());
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((long long)21);
+ D4RValue *arg3_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value());
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((long long)21);
+ D4RValue *arg4_2 = new D4RValue((long long) 21);
- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value());
}
-@@ -162,25 +162,25 @@ public:
+@@ -170,25 +170,25 @@ public:
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((double)21.0);
+ D4RValue *arg2 = new D4RValue((double) 21.0);
- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value(dmr));
D4RValue *arg2_1 = new D4RValue(byte); // holds 17
- D4RValue *arg2_2 = new D4RValue((double)21);
+ D4RValue *arg2_2 = new D4RValue((double) 21);
- auto_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
+ unique_ptr<D4FilterClause> greater(new D4FilterClause(D4FilterClause::greater, arg2_1, arg2_2));
CPPUNIT_ASSERT(!greater->value(dmr));
D4RValue *arg3_1 = new D4RValue(byte); // holds 17
- D4RValue *arg3_2 = new D4RValue((double)21);
+ D4RValue *arg3_2 = new D4RValue((double) 21);
- auto_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
+ unique_ptr<D4FilterClause> equal(new D4FilterClause(D4FilterClause::equal, arg3_1, arg3_2));
CPPUNIT_ASSERT(!equal->value(dmr));
D4RValue *arg4_1 = new D4RValue(byte); // holds 17
- D4RValue *arg4_2 = new D4RValue((double)21);
+ D4RValue *arg4_2 = new D4RValue((double) 21);
- auto_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
+ unique_ptr<D4FilterClause> not_equal(new D4FilterClause(D4FilterClause::not_equal, arg4_1, arg4_2));
CPPUNIT_ASSERT(not_equal->value(dmr));
}
-@@ -191,7 +191,7 @@ public:
+@@ -200,7 +200,7 @@ public:
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((unsigned long long)(21));
+ D4RValue *arg2 = new D4RValue((unsigned long long) (21));
- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
}
-@@ -200,7 +200,7 @@ public:
+@@ -210,7 +210,7 @@ public:
D4RValue *arg1 = new D4RValue(byte); // holds 17
- D4RValue *arg2 = new D4RValue((float)21.0);
+ D4RValue *arg2 = new D4RValue((float) 21.0);
- auto_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
+ unique_ptr<D4FilterClause> less(new D4FilterClause(D4FilterClause::less, arg1, arg2));
CPPUNIT_ASSERT(less->value());
}
-@@ -211,25 +211,25 @@ public:
+@@ -222,25 +222,25 @@ public:
D4RValue *arg1 = new D4RValue(str);
D4RValue *arg2 = new D4RValue(string("Tesla"));
@@ -225,7 +225,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(not_equal->value(dmr));
}
-@@ -237,7 +237,7 @@ public:
+@@ -249,7 +249,7 @@ public:
D4RValue *arg1 = new D4RValue(str);
D4RValue *arg2 = new D4RValue(string("E.*n"));
@@ -234,7 +234,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(match->value());
}
-@@ -247,7 +247,7 @@ public:
+@@ -259,7 +259,7 @@ public:
D4RValue *arg2 = new D4RValue((long long) 21);
try {
@@ -243,7 +243,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
// The Filter Clause instance is built OK, but the value() method
// will balk at this comparison. jhrg 4/21/16
DBG(cerr << "built filter clause instance" << endl);
-@@ -267,7 +267,7 @@ public:
+@@ -279,7 +279,7 @@ public:
D4RValue *arg2 = new D4RValue("Tesla");
try {
@@ -252,7 +252,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(less->value());
CPPUNIT_FAIL("Expected error");
-@@ -280,13 +280,13 @@ public:
+@@ -292,13 +292,13 @@ public:
void Structure_and_string_error_test()
{
@@ -268,7 +268,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(less->value());
CPPUNIT_FAIL("Expected error");
-@@ -300,13 +300,13 @@ public:
+@@ -312,13 +312,13 @@ public:
// There's no way this will get past the parser, but ...
void Byte_and_Structure_error_test()
{
@@ -284,7 +284,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(less->value());
CPPUNIT_FAIL("Expected error");
-@@ -320,13 +320,13 @@ public:
+@@ -332,13 +332,13 @@ public:
// There's no way this will get past the parser, but ...
void Str_and_Structure_error_test()
{
@@ -300,7 +300,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(less->value());
CPPUNIT_FAIL("Expected error");
-@@ -342,25 +342,25 @@ public:
+@@ -355,25 +355,25 @@ public:
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(17.0);
@@ -330,7 +330,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(match->value(dmr));
}
-@@ -368,7 +368,7 @@ public:
+@@ -382,7 +382,7 @@ public:
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -339,7 +339,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(clause->value());
}
-@@ -376,7 +376,7 @@ public:
+@@ -391,7 +391,7 @@ public:
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -348,7 +348,7 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(clause->value());
}
-@@ -384,24 +384,24 @@ public:
+@@ -400,25 +400,25 @@ public:
D4RValue *arg2_1 = new D4RValue(f32);
D4RValue *arg2_2 = new D4RValue(3.1415);
@@ -357,70 +357,71 @@ Index: libdap.git/unit-tests/D4FilterClauseTest.cc
CPPUNIT_ASSERT(clause->value());
}
- void int_test() {
+ void int_test()
+ {
- auto_ptr<Int8> i8(new Int8(""));
+ unique_ptr<Int8> i8(new Int8(""));
i8->set_value(17);
D4RValue *arg2_1 = new D4RValue(i8.get());
- D4RValue *arg2_2 = new D4RValue((long long)17);
+ D4RValue *arg2_2 = new D4RValue((long long) 17);
- auto_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
+ unique_ptr<D4FilterClause> clause(new D4FilterClause(D4FilterClause::equal, arg2_1, arg2_2));
CPPUNIT_ASSERT(clause->value());
}
-
- void true_clauses_test() {
+ void true_clauses_test()
+ {
// Testing this as a pointer since that's how it will be stored in D4Sequence
- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
-@@ -426,7 +426,7 @@ public:
-
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
+@@ -444,7 +444,7 @@ public:
// This should return true
- void no_clauses_test() {
+ void no_clauses_test()
+ {
- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
CPPUNIT_ASSERT(clauses->size() == 0);
CPPUNIT_ASSERT(clauses->value(dmr));
-@@ -434,7 +434,7 @@ public:
- }
+@@ -453,7 +453,7 @@ public:
- void false_clauses_test() {
+ void false_clauses_test()
+ {
- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
-@@ -459,7 +459,7 @@ public:
- }
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
+@@ -479,7 +479,7 @@ public:
- void evaluation_order_test() {
+ void evaluation_order_test()
+ {
- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
-@@ -492,7 +492,7 @@ public:
- }
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
+@@ -513,7 +513,7 @@ public:
- void evaluation_order_test_2() {
+ void evaluation_order_test_2()
+ {
- auto_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
+ unique_ptr<D4FilterClauseList> clauses(new D4FilterClauseList());
D4RValue *arg1_1 = new D4RValue(byte); // holds 17
- D4RValue *arg1_2 = new D4RValue((double)21.0);
-Index: libdap.git/unit-tests/D4SequenceTest.cc
+ D4RValue *arg1_2 = new D4RValue((double) 21.0);
+Index: libdap-3.19.0/unit-tests/D4SequenceTest.cc
===================================================================
---- libdap.git.orig/unit-tests/D4SequenceTest.cc
-+++ libdap.git/unit-tests/D4SequenceTest.cc
-@@ -118,7 +118,7 @@ public:
- }
+--- libdap-3.19.0.orig/unit-tests/D4SequenceTest.cc
++++ libdap-3.19.0/unit-tests/D4SequenceTest.cc
+@@ -127,7 +127,7 @@ public:
- void copy_ctor_test() {
+ void copy_ctor_test()
+ {
- auto_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
+ unique_ptr<TestD4Sequence> ts(new TestD4Sequence(*s));
ts->intern_data();
--
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