This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository netcdf4-python.
commit 7a96c59add83831dd41838e612588482ac513804 Author: Bas Couwenberg <[email protected]> Date: Sat Mar 12 01:36:38 2016 +0100 Drop spelling-errors.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/spelling-errors.patch | 192 ----------------------------------- 3 files changed, 1 insertion(+), 193 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4cb2e67..63e52f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ netcdf4-python (1.2.3.1-1) UNRELEASED; urgency=medium * New upstream release. + * Drop spelling-errors.patch, applied upstream. -- Bas Couwenberg <[email protected]> Sat, 12 Mar 2016 01:34:47 +0100 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 38edaa7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index e3159df..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,192 +0,0 @@ -Description: Fix various spelling errors. - analagous -> analogous - Overwite -> Overwrite -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/Unidata/netcdf4-python/pull/538 -Applied-Upstream: https://github.com/Unidata/netcdf4-python/commit/1f16ff710cc650a9b9b21d6a192bc6fdcedccdc6 - ---- a/docs/netCDF4/index.html -+++ b/docs/netCDF4/index.html -@@ -1394,7 +1394,7 @@ OPenDAP support, via the <code>--enable- - version 4.0.1).</p> - <h2><div id='section2'>2) Groups in a netCDF file.</h2> - <p>netCDF version 4 added support for organizing data in hierarchical --groups, which are analagous to directories in a filesystem. Groups serve -+groups, which are analogous to directories in a filesystem. Groups serve - as containers for variables, dimensions and attributes, as well as other - groups. A <a href="#netCDF4.Dataset"><code>Dataset</code></a> defines creates a special group, called - the 'root group', which is similar to the root directory in a unix -@@ -2770,7 +2770,7 @@ datatype.</p></div> - <div class="desc"><p>Creates a new <a href="#netCDF4.Group"><code>Group</code></a> with the given <code>groupname</code>.</p> - <p>If <code>groupname</code> is specified as a path, using forward slashes as in unix to - separate components, then intermediate groups will be created as necessary --(analagous to <code>mkdir -p</code> in unix). For example, -+(analogous to <code>mkdir -p</code> in unix). For example, - <code>createGroup('/GroupA/GroupB/GroupC')</code> will create <code>GroupA</code>, - <code>GroupA/GroupB</code>, and <code>GroupA/GroupB/GroupC</code>, if they don't already exist. - If the specified path describes a group that already exists, no error is -@@ -3448,7 +3448,7 @@ method of a <a href="#netCDF4.Dataset">< - - - <div class="desc"><p>Groups define a hierarchical namespace within a netCDF file. They are --analagous to directories in a unix filesystem. Each <a href="#netCDF4.Group"><code>Group</code></a> behaves like -+analogous to directories in a unix filesystem. Each <a href="#netCDF4.Group"><code>Group</code></a> behaves like - a <a href="#netCDF4.Dataset"><code>Dataset</code></a> within a Dataset, and can contain it's own variables, - dimensions and attributes (and other Groups). See <a href="#netCDF4.Group.__init__"><code>__init__</code></a> - for more details.</p> -@@ -3821,7 +3821,7 @@ datatype.</p></div> - <div class="desc inherited"><p>Creates a new <a href="#netCDF4.Group"><code>Group</code></a> with the given <code>groupname</code>.</p> - <p>If <code>groupname</code> is specified as a path, using forward slashes as in unix to - separate components, then intermediate groups will be created as necessary --(analagous to <code>mkdir -p</code> in unix). For example, -+(analogous to <code>mkdir -p</code> in unix). For example, - <code>createGroup('/GroupA/GroupB/GroupC')</code> will create <code>GroupA</code>, - <code>GroupA/GroupB</code>, and <code>GroupA/GroupB/GroupC</code>, if they don't already exist. - If the specified path describes a group that already exists, no error is -@@ -4727,7 +4727,7 @@ datatype.</p></div> - <div class="desc inherited"><p>Creates a new <a href="#netCDF4.Group"><code>Group</code></a> with the given <code>groupname</code>.</p> - <p>If <code>groupname</code> is specified as a path, using forward slashes as in unix to - separate components, then intermediate groups will be created as necessary --(analagous to <code>mkdir -p</code> in unix). For example, -+(analogous to <code>mkdir -p</code> in unix). For example, - <code>createGroup('/GroupA/GroupB/GroupC')</code> will create <code>GroupA</code>, - <code>GroupA/GroupB</code>, and <code>GroupA/GroupB/GroupC</code>, if they don't already exist. - If the specified path describes a group that already exists, no error is -@@ -5541,7 +5541,7 @@ method of a <a href="#netCDF4.Dataset">< - - - <div class="desc"><p>A netCDF <a href="#netCDF4.Variable"><code>Variable</code></a> is used to read and write netCDF data. They are --analagous to numpy array objects. See <a href="#netCDF4.Variable.__init__"><code>__init__</code></a> for more -+analogous to numpy array objects. See <a href="#netCDF4.Variable.__init__"><code>__init__</code></a> for more - details.</p> - <p>A list of attribute names corresponding to netCDF attributes defined for - the variable can be obtained with the <a href="#netCDF4.Variable.ncattrs"><code>ncattrs</code></a> method. These ---- a/examples/writing_netCDF.ipynb -+++ b/examples/writing_netCDF.ipynb -@@ -728,7 +728,7 @@ - "\n", - "netCDF version 4 added support for organizing data in hierarchical groups.\n", - "\n", -- "- analagous to directories in a filesystem. \n", -+ "- analogous to directories in a filesystem. \n", - "- Groups serve as containers for variables, dimensions and attributes, as well as other groups. \n", - "- A `netCDF4.Dataset` creates a special group, called the 'root group', which is similar to the root directory in a unix filesystem. \n", - "\n", ---- a/netCDF4/_netCDF4.c -+++ b/netCDF4/_netCDF4.c -@@ -1880,7 +1880,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_3_Introduction_netc[] = "\nVersion 1.2.3\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_3_Introduction_netc[] = "\nVersion 1.2.3\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_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"; - static char __pyx_k_cannot_specify_chunksizes_for_a[] = "cannot specify chunksizes for a contiguous dataset"; -@@ -16841,7 +16841,7 @@ static PyObject *__pyx_pf_7netCDF4_8_net - - /* Python wrapper */ - static PyObject *__pyx_pw_7netCDF4_8_netCDF4_7Dataset_45createGroup(PyObject *__pyx_v_self, PyObject *__pyx_v_groupname); /*proto*/ --static char __pyx_doc_7netCDF4_8_netCDF4_7Dataset_44createGroup[] = "\n**`createGroup(self, groupname)`**\n\nCreates a new `netCDF4.Group` with the given `groupname`.\n\nIf `groupname` is specified as a path, using forward slashes as in unix to\nseparate components, then intermediate groups will be created as necessary \n(analagous to `mkdir -p` in unix). For example,\n`createGroup('/GroupA/GroupB/GroupC')` will create `GroupA`,\n`GroupA/GroupB`, and `GroupA/GroupB/GroupC`, if they don [...] -+static char __pyx_doc_7netCDF4_8_netCDF4_7Dataset_44createGroup[] = "\n**`createGroup(self, groupname)`**\n\nCreates a new `netCDF4.Group` with the given `groupname`.\n\nIf `groupname` is specified as a path, using forward slashes as in unix to\nseparate components, then intermediate groups will be created as necessary \n(analogous to `mkdir -p` in unix). For example,\n`createGroup('/GroupA/GroupB/GroupC')` will create `GroupA`,\n`GroupA/GroupB`, and `GroupA/GroupB/GroupC`, if they don [...] - static PyObject *__pyx_pw_7netCDF4_8_netCDF4_7Dataset_45createGroup(PyObject *__pyx_v_self, PyObject *__pyx_v_groupname) { - PyObject *__pyx_r = 0; - __Pyx_RefNannyDeclarations -@@ -72271,7 +72271,7 @@ static PyTypeObject __pyx_type_7netCDF4_ - 0, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ -- "\nGroups define a hierarchical namespace within a netCDF file. They are\nanalagous to directories in a unix filesystem. Each `netCDF4.Group` behaves like\na `netCDF4.Dataset` within a Dataset, and can contain it's own variables,\ndimensions and attributes (and other Groups). See `netCDF4.Group.__init__`\nfor more details.\n\n`netCDF4.Group` inherits from `netCDF4.Dataset`, so all the \n`netCDF4.Dataset` class methods and variables are available\nto a `netCDF4.Group` instance (except [...] -+ "\nGroups define a hierarchical namespace within a netCDF file. They are\nanalogous to directories in a unix filesystem. Each `netCDF4.Group` behaves like\na `netCDF4.Dataset` within a Dataset, and can contain it's own variables,\ndimensions and attributes (and other Groups). See `netCDF4.Group.__init__`\nfor more details.\n\n`netCDF4.Group` inherits from `netCDF4.Dataset`, so all the \n`netCDF4.Dataset` class methods and variables are available\nto a `netCDF4.Group` instance (except [...] - __pyx_tp_traverse_7netCDF4_8_netCDF4_Dataset, /*tp_traverse*/ - __pyx_tp_clear_7netCDF4_8_netCDF4_Dataset, /*tp_clear*/ - 0, /*tp_richcompare*/ -@@ -73136,7 +73136,7 @@ static PyTypeObject __pyx_type_7netCDF4_ - __pyx_tp_setattro_7netCDF4_8_netCDF4_Variable, /*tp_setattro*/ - 0, /*tp_as_buffer*/ - Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ -- "\nA netCDF `netCDF4.Variable` is used to read and write netCDF data. They are\nanalagous to numpy array objects. See `netCDF4.Variable.__init__` for more\ndetails.\n\nA list of attribute names corresponding to netCDF attributes defined for\nthe variable can be obtained with the `netCDF4.Variable.ncattrs` method. These\nattributes can be created by assigning to an attribute of the\n`netCDF4.Variable` instance. A dictionary containing all the netCDF attribute\nname/value pairs is prov [...] -+ "\nA netCDF `netCDF4.Variable` is used to read and write netCDF data. They are\nanalogous to numpy array objects. See `netCDF4.Variable.__init__` for more\ndetails.\n\nA list of attribute names corresponding to netCDF attributes defined for\nthe variable can be obtained with the `netCDF4.Variable.ncattrs` method. These\nattributes can be created by assigning to an attribute of the\n`netCDF4.Variable` instance. A dictionary containing all the netCDF attribute\nname/value pairs is prov [...] - __pyx_tp_traverse_7netCDF4_8_netCDF4_Variable, /*tp_traverse*/ - __pyx_tp_clear_7netCDF4_8_netCDF4_Variable, /*tp_clear*/ - 0, /*tp_richcompare*/ ---- a/netCDF4/_netCDF4.pyx -+++ b/netCDF4/_netCDF4.pyx -@@ -156,7 +156,7 @@ version 4.0.1). - ## <div id='section2'>2) Groups in a netCDF file. - - netCDF version 4 added support for organizing data in hierarchical --groups, which are analagous to directories in a filesystem. Groups serve -+groups, which are analogous to directories in a filesystem. Groups serve - as containers for variables, dimensions and attributes, as well as other - groups. A `netCDF4.Dataset` defines creates a special group, called - the 'root group', which is similar to the root directory in a unix -@@ -2246,7 +2246,7 @@ Creates a new `netCDF4.Group` with the g - - If `groupname` is specified as a path, using forward slashes as in unix to - separate components, then intermediate groups will be created as necessary --(analagous to `mkdir -p` in unix). For example, -+(analogous to `mkdir -p` in unix). For example, - `createGroup('/GroupA/GroupB/GroupC')` will create `GroupA`, - `GroupA/GroupB`, and `GroupA/GroupB/GroupC`, if they don't already exist. - If the specified path describes a group that already exists, no error is -@@ -2540,7 +2540,7 @@ attribute does not exist on the variable - cdef class Group(Dataset): - """ - Groups define a hierarchical namespace within a netCDF file. They are --analagous to directories in a unix filesystem. Each `netCDF4.Group` behaves like -+analogous to directories in a unix filesystem. Each `netCDF4.Group` behaves like - a `netCDF4.Dataset` within a Dataset, and can contain it's own variables, - dimensions and attributes (and other Groups). See `netCDF4.Group.__init__` - for more details. -@@ -2796,7 +2796,7 @@ returns `True` if the `netCDF4.Dimension - cdef class Variable: - """ - A netCDF `netCDF4.Variable` is used to read and write netCDF data. They are --analagous to numpy array objects. See `netCDF4.Variable.__init__` for more -+analogous to numpy array objects. See `netCDF4.Variable.__init__` for more - details. - - A list of attribute names corresponding to netCDF attributes defined for ---- a/man/nc3tonc4.1 -+++ b/man/nc3tonc4.1 -@@ -33,7 +33,7 @@ A summary of options is included below. - Shows a summary of the available options. - .TP - .B \-o --Overwite destination file (default is to raise an error if output file already exists). -+Overwrite destination file (default is to raise an error if output file already exists). - .TP - .B \-\-vars - A comma separated list of variable names to copy (default is to copy all variables). ---- a/man/nc4tonc3.1 -+++ b/man/nc4tonc3.1 -@@ -27,7 +27,7 @@ A summary of options is included below. - Shows a summary of the available options. - .TP - .B \-o --Overwite destination file (default is to raise an error if output file already exists). -+Overwrite destination file (default is to raise an error if output file already exists). - .TP - .B \-\-quiet=(0|1) - If set to 1, don't print any diagnostic information. ---- a/netCDF4/utils.py -+++ b/netCDF4/utils.py -@@ -570,7 +570,7 @@ def nc4tonc3(): - - usage: %s [-h] [-o] [--chunk] netcdf4filename netcdf3filename - -h -- Print usage message. -- -o -- Overwite destination file (default is to raise an error if output file already exists). -+ -o -- Overwrite destination file (default is to raise an error if output file already exists). - --quiet=(0|1) -- if 1, don't print diagnostic information. - --format -- netcdf3 format to use (NETCDF3_64BIT by default, can be set to NETCDF3_CLASSIC) - --chunk=(integer) -- number of records along unlimited dimension to -@@ -775,7 +775,7 @@ def nc3tonc4(): - - usage: %s [-h] [-o] [--vars=var1,var2,..] [--zlib=(0|1)] [--complevel=(1-9)] [--shuffle=(0|1)] [--fletcher32=(0|1)] [--unpackshort=(0|1)] [--quantize=var1=n1,var2=n2,..] netcdf3filename netcdf4filename - -h -- Print usage message. -- -o -- Overwite destination file (default is to raise an error if output file already exists). -+ -o -- Overwrite destination file (default is to raise an error if output file already exists). - --vars -- comma separated list of variable names to copy (default is to copy - all variables) - --classic=(0|1) -- use NETCDF4_CLASSIC format instead of NETCDF4 (default 1) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf4-python.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
