[libdap] 18/22: Add unique_ptr patch

[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 60e2defa5a4ecde62690929d44f6af5507b3fbcd
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 31 15:14:06 2016 +0000

    Add unique_ptr patch
---
 debian/patches/pkgconfig.patch  |  6 +++---
 debian/patches/series           |  1 -
 debian/patches/unique_ptr.patch | 24 ++++++++++++------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index ebb6c95..66f50a5 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.18.0/libdapclient.pc.in
+Index: libdap.git/libdapclient.pc.in
 ===================================================================
---- libdap-3.18.0.orig/libdapclient.pc.in
-+++ libdap-3.18.0/libdapclient.pc.in
+--- libdap.git.orig/libdapclient.pc.in
++++ libdap.git/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 4669a4b..5cd740c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@ disable-cache-test.patch
 disable-dmr-tests.patch
 disable-net-tests.patch
 disable-D4FilterClauseTest.patch
-g++-6.patch
diff --git a/debian/patches/unique_ptr.patch b/debian/patches/unique_ptr.patch
index dd854e3..c07b935 100644
--- a/debian/patches/unique_ptr.patch
+++ b/debian/patches/unique_ptr.patch
@@ -3,10 +3,10 @@ Description: Move from deprecated auto_ptr to std::unique_ptr
 Last-Updated: 2016-10-03
 Forwarded: no
 
-Index: libdap-3.18.1/tests/dmr-test.cc
+Index: libdap.git/tests/dmr-test.cc
 ===================================================================
---- libdap-3.18.1.orig/tests/dmr-test.cc
-+++ libdap-3.18.1/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
      // 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.18.1/tests/dmr-test.cc
  
  	// The Function Parser
  	if (!function.empty()) {
-Index: libdap-3.18.1/unit-tests/HTTPCacheTest.cc
+Index: libdap.git/unit-tests/HTTPCacheTest.cc
 ===================================================================
---- libdap-3.18.1.orig/unit-tests/HTTPCacheTest.cc
-+++ libdap-3.18.1/unit-tests/HTTPCacheTest.cc
+--- libdap.git.orig/unit-tests/HTTPCacheTest.cc
++++ libdap.git/unit-tests/HTTPCacheTest.cc
 @@ -543,7 +543,7 @@ public:
          try {
              delete hc;
@@ -83,10 +83,10 @@ Index: libdap-3.18.1/unit-tests/HTTPCacheTest.cc
              CPPUNIT_ASSERT(!pc->is_url_in_cache(feb));
          }
          catch (Error &e) {
-Index: libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
+Index: libdap.git/unit-tests/D4FilterClauseTest.cc
 ===================================================================
---- libdap-3.18.1.orig/unit-tests/D4FilterClauseTest.cc
-+++ libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
+--- libdap.git.orig/unit-tests/D4FilterClauseTest.cc
++++ libdap.git/unit-tests/D4FilterClauseTest.cc
 @@ -109,25 +109,25 @@ public:
          D4RValue *arg1 = new D4RValue(byte);    // holds 17
          D4RValue *arg2 = new D4RValue((long long)21);
@@ -413,10 +413,10 @@ Index: libdap-3.18.1/unit-tests/D4FilterClauseTest.cc
  
          D4RValue *arg1_1 = new D4RValue(byte);    // holds 17
          D4RValue *arg1_2 = new D4RValue((double)21.0);
-Index: libdap-3.18.1/unit-tests/D4SequenceTest.cc
+Index: libdap.git/unit-tests/D4SequenceTest.cc
 ===================================================================
---- libdap-3.18.1.orig/unit-tests/D4SequenceTest.cc
-+++ libdap-3.18.1/unit-tests/D4SequenceTest.cc
+--- libdap.git.orig/unit-tests/D4SequenceTest.cc
++++ libdap.git/unit-tests/D4SequenceTest.cc
 @@ -118,7 +118,7 @@ public:
      }
  

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