[netcdf] 05/07: Drop inconsistent-return-type.patch, applied upstream. Refresh remaining patches.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository netcdf.

commit 37b50020aebeb8fbd12cfe22a93103e286c55446
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 11 22:18:30 2015 +0100

    Drop inconsistent-return-type.patch, applied upstream. Refresh remaining patches.
---
 debian/changelog                              |  6 ++--
 debian/patches/hdf5-library-path.patch        |  2 +-
 debian/patches/inconsistent-return-type.patch | 48 ---------------------------
 debian/patches/link-private.patch             |  2 +-
 debian/patches/series                         |  1 -
 5 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9a565b..164b39e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 netcdf (1:4.4.0~rc4-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
-  * Add patch to fix inconsistent return types.
-    (closes: 749511)
+    - Includes fixes for inconsistent return types.
+      (closes: 749511)
   * Update copyright for new files.
+  * Drop inconsistent-return-type.patch, applied upstream.
+    Refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 11 Nov 2015 22:11:10 +0100
 
diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch
index 7bcb6ae..7bcd0a3 100644
--- a/debian/patches/hdf5-library-path.patch
+++ b/debian/patches/hdf5-library-path.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1469,6 +1469,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
+@@ -1519,6 +1519,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
  SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
  SET(CC ${CMAKE_C_COMPILER})
  
diff --git a/debian/patches/inconsistent-return-type.patch b/debian/patches/inconsistent-return-type.patch
deleted file mode 100644
index 6f23afb..0000000
--- a/debian/patches/inconsistent-return-type.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix inconsistent return type.
-Author: Michael Tautschnig <mt at debian.org>
-Bug-Debian: https://bugs.debian.org/749511
-Forwarded: https://github.com/Unidata/netcdf-c/pull/147
-Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/b8e4161baf369ed590faee09906ee54bf4887606
-
---- a/oc2/oc.h
-+++ b/oc2/oc.h
-@@ -537,7 +537,7 @@ extern OCerror oc_svcerrordata(OClink li
-    note that this may or may not be the same as returned
-    by oc_svcerrordata.
-  */
--extern int oc_httpcode(OClink);
-+extern OCerror oc_httpcode(OClink);
- 
- /*
- (Re-)initialize the oc library as if nothing had been called.
---- a/oc2/ochttp.c
-+++ b/oc2/ochttp.c
-@@ -88,11 +88,11 @@ fail:
- 	return OCTHROW(OC_ECURL);
- }
- 
--int
-+OCerror
- ocfetchurl(CURL* curl, const char* url, OCbytes* buf, long* filetime,
-            struct OCcredentials* creds)
- {
--	int stat = OC_NOERR;
-+	OCerror stat = OC_NOERR;
- 	CURLcode cstat = CURLE_OK;
- 	size_t len;
-         long httpcode = 0;
---- a/oc2/ocrc.c
-+++ b/oc2/ocrc.c
-@@ -408,10 +408,10 @@ done:
-     return stat;
- }
- 
--int
-+OCerror
- ocrc_process(OCstate* state)
- {
--    int stat = 0;
-+    OCerror stat = OC_NOERR;
-     char* value = NULL;
-     OCURI* uri = state->uri;
-     char* url_userpwd = NULL;
diff --git a/debian/patches/link-private.patch b/debian/patches/link-private.patch
index 0732943..0f01cbd 100644
--- a/debian/patches/link-private.patch
+++ b/debian/patches/link-private.patch
@@ -3,7 +3,7 @@ Author: Nico Schlömer <nico.schloemer at gmail.com>
 
 --- a/liblib/CMakeLists.txt
 +++ b/liblib/CMakeLists.txt
-@@ -83,7 +83,7 @@ IF(TLL_LIBS)
+@@ -80,7 +80,7 @@ IF(TLL_LIBS)
    LIST(REMOVE_DUPLICATES TLL_LIBS)
  ENDIF()
  
diff --git a/debian/patches/series b/debian/patches/series
index f8c1713..60a8cb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 link-private.patch
 privacy-breach-logo.patch
 hdf5-library-path.patch
-inconsistent-return-type.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git