[netcdf4-python] 04/05: Drop patches, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Oct 18 11:26:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository netcdf4-python.
commit 636c357100624532fa85959eed2b8d1b4a562bbc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Oct 18 12:48:05 2015 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/homogeneous-typo.patch | 101 ----------------------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 102 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f10319c..885b81f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
netcdf4-python (1.2.1-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 18 Oct 2015 12:45:28 +0200
diff --git a/debian/patches/homogeneous-typo.patch b/debian/patches/homogeneous-typo.patch
deleted file mode 100644
index 6075d42..0000000
--- a/debian/patches/homogeneous-typo.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Fix 'homogenous' typo, replace with 'homogeneous'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/Unidata/netcdf4-python/pull/462
-Applied-Upstream: https://github.com/Unidata/netcdf4-python/commit/7a9d984d6061ddfbb07cd1d2f9384495c2696d11
-
---- a/docs/netCDF4/index.html
-+++ b/docs/netCDF4/index.html
-@@ -1343,7 +1343,7 @@ types) are not supported.</p>
- <li><a href="#section7">Dealing with time coordinates.</a></li>
- <li><a href="#section8">Reading data from a multi-file netCDF dataset.</a></li>
- <li><a href="#section9">Efficient compression of netCDF variables.</a></li>
--<li><a href="#section10">Beyond homogenous arrays of a fixed type - compound data types.</a></li>
-+<li><a href="#section10">Beyond homogeneous arrays of a fixed type - compound data types.</a></li>
- <li><a href="#section11">Variable-length (vlen) data types.</a></li>
- <li><a href="#section12">Enum data type.</a></li>
- </ol>
-@@ -1862,7 +1862,7 @@ sacrificed for the sake of disk space.</
-
-
- <p>and see how much smaller the resulting files are.</p>
--<h2><div id='section10'>10) Beyond homogenous arrays of a fixed type - compound data types.</h2>
-+<h2><div id='section10'>10) Beyond homogeneous arrays of a fixed type - compound data types.</h2>
- <p>Compound data types map directly to numpy structured (a.k.a 'record'
- arrays). Structured arrays are akin to C structs, or derived types
- in Fortran. They allow for the construction of table-like structures
-@@ -2690,7 +2690,7 @@ parent Dataset instance is garbage colle
- dtype object <code>datatype</code>.</p>
- <p><strong><em>Note</em></strong>: If the new compound data type contains other compound data types
- (i.e. it is a 'nested' compound type, where not all of the elements
--are homogenous numeric data types), then the 'inner' compound types <strong>must</strong> be
-+are homogeneous numeric data types), then the 'inner' compound types <strong>must</strong> be
- created first.</p>
- <p>The return value is the <a href="#netCDF4.CompoundType"><code>CompoundType</code></a> class instance describing the new
- datatype.</p></div>
-@@ -3700,7 +3700,7 @@ instances, raises IOError.</p></div>
- dtype object <code>datatype</code>.</p>
- <p><strong><em>Note</em></strong>: If the new compound data type contains other compound data types
- (i.e. it is a 'nested' compound type, where not all of the elements
--are homogenous numeric data types), then the 'inner' compound types <strong>must</strong> be
-+are homogeneous numeric data types), then the 'inner' compound types <strong>must</strong> be
- created first.</p>
- <p>The return value is the <a href="#netCDF4.CompoundType"><code>CompoundType</code></a> class instance describing the new
- datatype.</p></div>
-@@ -4585,7 +4585,7 @@ variable-length types defined for the <a
- dtype object <code>datatype</code>.</p>
- <p><strong><em>Note</em></strong>: If the new compound data type contains other compound data types
- (i.e. it is a 'nested' compound type, where not all of the elements
--are homogenous numeric data types), then the 'inner' compound types <strong>must</strong> be
-+are homogeneous numeric data types), then the 'inner' compound types <strong>must</strong> be
- created first.</p>
- <p>The return value is the <a href="#netCDF4.CompoundType"><code>CompoundType</code></a> class instance describing the new
- datatype.</p></div>
---- a/netCDF4/_netCDF4.c
-+++ b/netCDF4/_netCDF4.c
-@@ -1781,7 +1781,7 @@ static char __pyx_k_Class_providing_an_i
- static char __pyx_k_FillValue_attribute_must_be_set[] = "_FillValue attribute must be set when variable is ";
- static char __pyx_k_The_vltypes_dictionary_maps_the[] = "The `vltypes` dictionary maps the names of\n variable-length types defined for the `netCDF4.Group` or `netCDF4.Dataset` to instances of the\n `netCDF4.VLType` class.";
- static char __pyx_k_Variable_object_no_longer_valid[] = "Variable object no longer valid";
--static char __pyx_k_Version_1_2_0_Introduction_netc[] = "\nVersion 1.2.0\n-------------\n- - - \n\nIntroduction\n============\n\nnetcdf4-python is a Python interface to the netCDF C library. \n\n[netCDF](http://www.unidata.ucar.edu/software/netcdf/) version 4 has many features\nnot found in earlier versions of the library and is implemented on top of\n[HDF5](http://www.hdfgroup.org/HDF5). This module can read and write\nfiles in both the new netCDF 4 and the old netCDF 3 format, and ca [...]
-+static char __pyx_k_Version_1_2_0_Introduction_netc[] = "\nVersion 1.2.0\n-------------\n- - - \n\nIntroduction\n============\n\nnetcdf4-python is a Python interface to the netCDF C library. \n\n[netCDF](http://www.unidata.ucar.edu/software/netcdf/) version 4 has many features\nnot found in earlier versions of the library and is implemented on top of\n[HDF5](http://www.hdfgroup.org/HDF5). This module can read and write\nfiles in both the new netCDF 4 and the old netCDF 3 format, and ca [...]
- static char __pyx_k_Volumes_Drobo_python_netcdf4_py[] = "/Volumes/Drobo/python/netcdf4-python.git/netCDF4/_netCDF4.pyx";
- static char __pyx_k_assign_vlen_method_only_for_use[] = "_assign_vlen method only for use with VLEN variables";
- static char __pyx_k_cannot_set__FillValue_attribute[] = "cannot set _FillValue attribute for VLEN or compound variable";
-@@ -14898,7 +14898,7 @@ static PyObject *__pyx_pf_7netCDF4_8_net
-
- /* Python wrapper */
- static PyObject *__pyx_pw_7netCDF4_8_netCDF4_7Dataset_35createCompoundType(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
--static char __pyx_doc_7netCDF4_8_netCDF4_7Dataset_34createCompoundType[] = "\n**`createCompoundType(self, datatype, datatype_name)`**\n\nCreates a new compound data type named `datatype_name` from the numpy\ndtype object `datatype`.\n\n***Note***: If the new compound data type contains other compound data types\n(i.e. it is a 'nested' compound type, where not all of the elements\nare homogenous numeric data types), then the 'inner' compound types **must** be\ncreated first.\n\nThe retur [...]
-+static char __pyx_doc_7netCDF4_8_netCDF4_7Dataset_34createCompoundType[] = "\n**`createCompoundType(self, datatype, datatype_name)`**\n\nCreates a new compound data type named `datatype_name` from the numpy\ndtype object `datatype`.\n\n***Note***: If the new compound data type contains other compound data types\n(i.e. it is a 'nested' compound type, where not all of the elements\nare homogeneous numeric data types), then the 'inner' compound types **must** be\ncreated first.\n\nThe retu [...]
- static PyObject *__pyx_pw_7netCDF4_8_netCDF4_7Dataset_35createCompoundType(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
- PyObject *__pyx_v_datatype = 0;
- PyObject *__pyx_v_datatype_name = 0;
---- a/netCDF4/_netCDF4.pyx
-+++ b/netCDF4/_netCDF4.pyx
-@@ -103,7 +103,7 @@ Tutorial
- 7. [Dealing with time coordinates.](#section7)
- 8. [Reading data from a multi-file netCDF dataset.](#section8)
- 9. [Efficient compression of netCDF variables.](#section9)
--10. [Beyond homogenous arrays of a fixed type - compound data types.](#section10)
-+10. [Beyond homogeneous arrays of a fixed type - compound data types.](#section10)
- 11. [Variable-length (vlen) data types.](#section11)
- 12. [Enum data type.](#section12)
-
-@@ -651,7 +651,7 @@ and then
-
- and see how much smaller the resulting files are.
-
--## <div id='section10'>10) Beyond homogenous arrays of a fixed type - compound data types.
-+## <div id='section10'>10) Beyond homogeneous arrays of a fixed type - compound data types.
-
- Compound data types map directly to numpy structured (a.k.a 'record'
- arrays). Structured arrays are akin to C structs, or derived types
-@@ -1971,7 +1971,7 @@ dtype object `datatype`.
-
- ***Note***: If the new compound data type contains other compound data types
- (i.e. it is a 'nested' compound type, where not all of the elements
--are homogenous numeric data types), then the 'inner' compound types **must** be
-+are homogeneous numeric data types), then the 'inner' compound types **must** be
- created first.
-
- The return value is the `netCDF4.CompoundType` class instance describing the new
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cfdc1fd..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-homogeneous-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git
More information about the Pkg-grass-devel
mailing list