[libdap] 05/12: refresh unique_ptr.ptch

[Alastair McKinstry]

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

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

commit 963b879eb61a2451a37ea642795f64a6fdc1bd03
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Oct 3 09:51:41 2017 +0100

    refresh unique_ptr.ptch
---
 debian/changelog                |  1 +
 debian/patches/unique_ptr.patch | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cc5bb4c..d6db1b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libdap (3.19.1-1) UNRELEASED; urgency=medium
 
   * New upstream release 3.19.1
+    - refresh unique_ptr.ptch
   * Standards-Version: 4.1.0
   * Drop dependencies on autotools; automatic in debhelper 10
 
diff --git a/debian/patches/unique_ptr.patch b/debian/patches/unique_ptr.patch
index 321eb3e..11603d9 100644
--- a/debian/patches/unique_ptr.patch
+++ b/debian/patches/unique_ptr.patch
@@ -1,12 +1,12 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Move from deprecated auto_ptr to std::unique_ptr
-Last-Updated: 2017-06-21
+Last-Updated: 2017-10-03
 Forwarded: no
 
-Index: libdap-3.19.0/tests/dmr-test.cc
+Index: libdap-3.19.1/tests/dmr-test.cc
 ===================================================================
---- libdap-3.19.0.orig/tests/dmr-test.cc
-+++ libdap-3.19.0/tests/dmr-test.cc
+--- libdap-3.19.1.orig/tests/dmr-test.cc
++++ libdap-3.19.1/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
@@ -16,10 +16,10 @@ Index: libdap-3.19.0/tests/dmr-test.cc
  
  	// The Function Parser
  	if (!function.empty()) {
-Index: libdap-3.19.0/unit-tests/HTTPCacheTest.cc
+Index: libdap-3.19.1/unit-tests/HTTPCacheTest.cc
 ===================================================================
---- libdap-3.19.0.orig/unit-tests/HTTPCacheTest.cc
-+++ libdap-3.19.0/unit-tests/HTTPCacheTest.cc
+--- libdap-3.19.1.orig/unit-tests/HTTPCacheTest.cc
++++ libdap-3.19.1/unit-tests/HTTPCacheTest.cc
 @@ -543,7 +543,7 @@ public:
          try {
              delete hc;
@@ -71,10 +71,10 @@ Index: libdap-3.19.0/unit-tests/HTTPCacheTest.cc
          try {
 -            auto_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
 +            unique_ptr<HTTPCache> pc(new HTTPCache("cache-testsuite/purge_cache", true));
- 
+ #if 0
+             // This broke Fedora ppc64le system with XFS system
              CPPUNIT_ASSERT(pc->d_http_cache_table->d_block_size == 4096);
- 
-@@ -855,7 +855,7 @@ public:
+@@ -856,7 +856,7 @@ public:
          // performed. The feb URL should have been deleted.
  
          try {
@@ -83,10 +83,10 @@ Index: libdap-3.19.0/unit-tests/HTTPCacheTest.cc
              CPPUNIT_ASSERT(!pc->is_url_in_cache(feb));
          }
          catch (Error &e) {
-Index: libdap-3.19.0/unit-tests/D4FilterClauseTest.cc
+Index: libdap-3.19.1/unit-tests/D4FilterClauseTest.cc
 ===================================================================
---- libdap-3.19.0.orig/unit-tests/D4FilterClauseTest.cc
-+++ libdap-3.19.0/unit-tests/D4FilterClauseTest.cc
+--- libdap-3.19.1.orig/unit-tests/D4FilterClauseTest.cc
++++ libdap-3.19.1/unit-tests/D4FilterClauseTest.cc
 @@ -115,25 +115,25 @@ public:
          D4RValue *arg1 = new D4RValue(byte);    // holds 17
          D4RValue *arg2 = new D4RValue((long long) 21);
@@ -414,10 +414,10 @@ Index: libdap-3.19.0/unit-tests/D4FilterClauseTest.cc
  
          D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
          D4RValue *arg1_2 = new D4RValue((double) 21.0);
-Index: libdap-3.19.0/unit-tests/D4SequenceTest.cc
+Index: libdap-3.19.1/unit-tests/D4SequenceTest.cc
 ===================================================================
---- libdap-3.19.0.orig/unit-tests/D4SequenceTest.cc
-+++ libdap-3.19.0/unit-tests/D4SequenceTest.cc
+--- libdap-3.19.1.orig/unit-tests/D4SequenceTest.cc
++++ libdap-3.19.1/unit-tests/D4SequenceTest.cc
 @@ -127,7 +127,7 @@ public:
  
      void copy_ctor_test()

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