[netcdf] 04/06: Drop patches applied upstream, refresh remaining patches.

Bas Couwenberg sebastic at debian.org
Tue Nov 22 06:54:29 UTC 2016 

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

sebastic pushed a commit to branch master
in repository netcdf.

commit 9f057873b386d25a6722b54724d2b244fa83170d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Nov 22 07:19:59 2016 +0100

    Drop patches applied upstream, refresh remaining patches.
---
 debian/changelog                            |  1 +
 debian/patches/hdf5-include-path.patch      | 21 ---------
 debian/patches/hdf5-library-path.patch      |  2 +-
 debian/patches/link-private.patch           |  2 +-
 debian/patches/series                       |  2 -
 debian/patches/spelling-errors.patch        | 71 -----------------------------
 debian/patches/tst_fileinfo-link-hdf5.patch |  2 +-
 7 files changed, 4 insertions(+), 97 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7bf026a..dd78723 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 netcdf (1:4.4.1.1-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches applied upstream, refresh remaining patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 22 Nov 2016 07:15:52 +0100
 
diff --git a/debian/patches/hdf5-include-path.patch b/debian/patches/hdf5-include-path.patch
deleted file mode 100644
index cfbc1dc..0000000
--- a/debian/patches/hdf5-include-path.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix HDF5 include directory with CMake >= 3.6.0.
- HDF5_INCLUDE_DIR has been deprecated some time ago,
- only HDF5_INCLUDE_DIRS is set for CMake >= 3.6.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/835710
-Forwarded: https://github.com/Unidata/netcdf-c/pull/311
-Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/4d0c0556772e7be1603f1d74d9ee17579be67148
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -572,6 +572,10 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4)
-     ##
-     # Include the HDF5 include directory.
-     ##
-+    IF(HDF5_INCLUDE_DIRS AND NOT HDF5_INCLUDE_DIR)
-+      SET(HDF5_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
-+    ENDIF()
-+    MESSAGE(STATUS "Using HDF5 include dir: ${HDF5_INCLUDE_DIR}")
-     INCLUDE_DIRECTORIES(${HDF5_INCLUDE_DIR})
- 
-     ###
diff --git a/debian/patches/hdf5-library-path.patch b/debian/patches/hdf5-library-path.patch
index ebdeeb2..82baa5c 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
-@@ -1617,6 +1617,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
+@@ -1613,6 +1613,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/link-private.patch b/debian/patches/link-private.patch
index 0f01cbd..2a0c42c 100644
--- a/debian/patches/link-private.patch
+++ b/debian/patches/link-private.patch
@@ -9,6 +9,6 @@ Author: Nico Schlömer <nico.schloemer at gmail.com>
  
 -TARGET_LINK_LIBRARIES(netcdf ${TLL_LIBS})
 +TARGET_LINK_LIBRARIES(netcdf PRIVATE ${TLL_LIBS})
- 
+ SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TLL_LIBS})
  IF(MSVC)
    SET_TARGET_PROPERTIES(netcdf PROPERTIES
diff --git a/debian/patches/series b/debian/patches/series
index e2e22b7..bf960a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 link-private.patch
 privacy-breach-logo.patch
 hdf5-library-path.patch
-hdf5-include-path.patch
 tst_fileinfo-link-hdf5.patch
 reproducible-settings.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 370c968..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix spelling errors.
- characers -> characters
- varaible  -> variable
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Unidata/netcdf-c/pull/312
-Applied-Upstream: https://github.com/Unidata/netcdf-c/commit/988b4ff868e1eb9a169d8c41e9fd133692590e59
-
---- a/ncgen/ncgen.1
-+++ b/ncgen/ncgen.1
-@@ -864,7 +864,7 @@ There are three other cases of note.
- .IP 1. 3
- If there is only a single, unlimited dimension,
- then all of the constants are concatenated
--and fill characers are added to the
-+and fill characters are added to the
- end of the resulting string to make its
- length be that of the unlimited dimension.
- If the length is larger than
---- a/docs/netcdf.m4
-+++ b/docs/netcdf.m4
-@@ -774,15 +774,15 @@ Learn about a compound type.
- .HP
- FDECL(def_vlen, (INCID(), INAME(), INCTYPE(base_typeid), ONCTYPE(xtypep)))
- .sp
--Create a varaible length array type.
-+Create a variable length array type.
- .HP
- FDECL(inq_vlen, (INCID(), INCTYPE(), ONAME(), OSIZET(datum_sizep), ONCTYPE(base_nc_typep)))
- .sp
--Learn about a varaible length array type.
-+Learn about a variable length array type.
- .HP
- FDECL(free_vlen, (nc_vlen_t *vl))
- .sp
--Free memory comsumed by reading data of a varaible length array type.
-+Free memory comsumed by reading data of a variable length array type.
- .HP
- FDECL(put_vlen_element, (INCID(), INCTYPE(), IVOIDP(vlen_element), ISIZET(len), IVOIDP(data)))
- .sp
---- a/docs/old/netcdf-f90.texi
-+++ b/docs/old/netcdf-f90.texi
-@@ -5180,7 +5180,7 @@ rh in an existing netCDF dataset named f
- @findex NF90_INQ_VARID 
- @cindex NF90_INQ_VARID, example
- 
--Given the name of a varaible, nf90_inq_varid finds the variable ID.
-+Given the name of a variable, nf90_inq_varid finds the variable ID.
- 
- @heading Usage 
- @example
---- a/libsrc/netcdf.3
-+++ b/libsrc/netcdf.3
-@@ -341,15 +341,15 @@ Learn about a compound type.
- .HP
- \fBint nc_def_vlen(int \fIncid\fP, const char \fIname\fP[], nc_type \fIbase_typeid\fP, nc_type* \fIxtypep\fP)\fR
- .sp
--Create a varaible length array type.
-+Create a variable length array type.
- .HP
- \fBint nc_inq_vlen(int \fIncid\fP, nc_type \fI\fP, char \fIname\fP[], size_t* \fIdatum_sizep\fP, nc_type* \fIbase_nc_typep\fP)\fR
- .sp
--Learn about a varaible length array type.
-+Learn about a variable length array type.
- .HP
- \fBint nc_free_vlen(nc_vlen_t *vl)\fR
- .sp
--Free memory comsumed by reading data of a varaible length array type.
-+Free memory comsumed by reading data of a variable length array type.
- .HP
- \fBint nc_put_vlen_element(int \fIncid\fP, nc_type \fI\fP, void * \fIvlen_element\fP, size_t \fIlen\fP, void * \fIdata\fP)\fR
- .sp
diff --git a/debian/patches/tst_fileinfo-link-hdf5.patch b/debian/patches/tst_fileinfo-link-hdf5.patch
index 81bc634..2790bf1 100644
--- a/debian/patches/tst_fileinfo-link-hdf5.patch
+++ b/debian/patches/tst_fileinfo-link-hdf5.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
 --- a/ncdump/CMakeLists.txt
 +++ b/ncdump/CMakeLists.txt
 @@ -62,6 +62,21 @@ IF(ENABLE_TESTS)
- IF(ENABLE_FILEINFO)
+ IF(USE_NETCDF4)
    ADD_EXECUTABLE(tst_fileinfo tst_fileinfo.c)
    TARGET_LINK_LIBRARIES(tst_fileinfo netcdf)
 +  IF(USE_HDF5 OR USE_NETCDF4)

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

More information about the Pkg-grass-devel mailing list