[gdal] 05/06: Add patches for various typos.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Jan 25 21:39:34 UTC 2016


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

sebastic pushed a commit to branch experimental-2.0
in repository gdal.

commit 6eb18638ec89f18586514f53cd991fe58f64cf17
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 25 21:18:44 2016 +0100

    Add patches for various typos.
---
 debian/changelog                         |   2 +-
 debian/patches/existence-typo.patch      | 536 +++++++++++++++++++++++++++++++
 debian/patches/instantiate-typo.patch    | 285 ++++++++++++++++
 debian/patches/outputting-typo.patch     | 173 ++++++++++
 debian/patches/position-typo.patch       |  78 +++++
 debian/patches/responsibility-typo.patch |  67 ++++
 debian/patches/retrieve-typo.patch       |  14 +
 debian/patches/series                    |   8 +
 debian/patches/supported-typo.patch      |  69 ++++
 debian/patches/transform-typo.patch      |  65 ++++
 10 files changed, 1296 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c9030ae..53d56d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ gdal (2.0.2~rc3+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release candidate.
   * Update watch file for 2.0.2 pre-releases.
   * Drop hardening patch, applied upstream. Refresh remaining patches.
-  * Add patch to fix 'occurred' & 'occurrence' typos.
+  * Add patches for various typos.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 25 Jan 2016 21:34:50 +0100
 
diff --git a/debian/patches/existence-typo.patch b/debian/patches/existence-typo.patch
new file mode 100644
index 0000000..fa79629
--- /dev/null
+++ b/debian/patches/existence-typo.patch
@@ -0,0 +1,536 @@
+Description: Fix 'existance' typo, replace with 'existence'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/frmts/vrt/vrtdataset.h
++++ b/frmts/vrt/vrtdataset.h
+@@ -265,7 +265,7 @@ class CPL_DLL VRTRasterBand : public GDA
+     int            bIsMaskBand;
+ 
+     int            bNoDataValueSet;
+-    int            bHideNoDataValue; // If set to true, will not report the existance of nodata
++    int            bHideNoDataValue; // If set to true, will not report the existence of nodata
+     double         dfNoDataValue;
+ 
+     GDALColorTable *poColorTable;
+--- a/m4/ax_lib_sqlite3.m4
++++ b/m4/ax_lib_sqlite3.m4
+@@ -6,7 +6,7 @@ dnl Test for the SQLite 3 library of a p
+ dnl
+ dnl This macro takes only one optional argument, required version
+ dnl of SQLite 3 library. If required version is not passed,
+-dnl 3.0.0 is used in the test of existance of SQLite 3.
++dnl 3.0.0 is used in the test of existence of SQLite 3.
+ dnl
+ dnl If no intallation prefix to the installed SQLite library is given
+ dnl the macro searches under /usr, /usr/local, and /opt.
+--- a/ogr/ogrfeaturedefn.cpp
++++ b/ogr/ogrfeaturedefn.cpp
+@@ -364,7 +364,7 @@ OGRFieldDefnH OGR_FD_GetFieldDefn( OGRFe
+  * function directly, but use OGRLayer::CreateField() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.  The OGRFieldDefn
++ * objects in existence based on this OGRFeatureDefn.  The OGRFieldDefn
+  * passed in is copied, and remains the responsibility of the caller.
+  *
+  * This method is the same as the C function OGR_FD_AddFieldDefn().
+@@ -394,7 +394,7 @@ void OGRFeatureDefn::AddFieldDefn( OGRFi
+  * function directly, but use OGR_L_CreateField() instead.
+  *
+  * This function  should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.  The OGRFieldDefn
++ * objects in existence based on this OGRFeatureDefn.  The OGRFieldDefn
+  * passed in is copied, and remains the responsibility of the caller.
+  *
+  * This function is the same as the C++ method OGRFeatureDefn::AddFieldDefn().
+@@ -421,7 +421,7 @@ void OGR_FD_AddFieldDefn( OGRFeatureDefn
+  * function directly, but use OGRLayer::DeleteField() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C function OGR_FD_DeleteFieldDefn().
+  *
+@@ -462,7 +462,7 @@ OGRErr OGRFeatureDefn::DeleteFieldDefn(
+  * function directly, but use OGR_L_DeleteField() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C++ method OGRFeatureDefn::DeleteFieldDefn().
+  *
+@@ -489,7 +489,7 @@ OGRErr OGR_FD_DeleteFieldDefn( OGRFeatur
+  * function directly, but use OGR_L_ReorderFields() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C function OGR_FD_ReorderFieldDefns().
+  *
+@@ -536,7 +536,7 @@ OGRErr OGRFeatureDefn::ReorderFieldDefns
+  * function directly, but use OGR_L_ReorderFields() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C++ method OGRFeatureDefn::ReorderFieldDefns().
+  *
+@@ -679,7 +679,7 @@ OGRGeomFieldDefnH OGR_FD_GetGeomFieldDef
+  * field definition.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.  The OGRGeomFieldDefn
++ * objects in existence based on this OGRFeatureDefn.  The OGRGeomFieldDefn
+  * passed in is copied, and remains the responsibility of the caller.
+  *
+  * This method is the same as the C function OGR_FD_AddGeomFieldDefn().
+@@ -713,7 +713,7 @@ void OGRFeatureDefn::AddGeomFieldDefn( O
+  * function directly, but use OGR_L_CreateGeomField() instead.
+  *
+  * This function  should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.  The OGRGeomFieldDefn
++ * objects in existence based on this OGRFeatureDefn.  The OGRGeomFieldDefn
+  * passed in is copied, and remains the responsibility of the caller.
+  *
+  * This function is the same as the C++ method OGRFeatureDefn::AddGeomFieldDefn().
+@@ -742,7 +742,7 @@ void OGR_FD_AddGeomFieldDefn( OGRFeature
+  * function directly, but use OGRLayer::DeleteGeomField() instead.
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C function OGR_FD_DeleteGeomFieldDefn().
+  *
+@@ -784,7 +784,7 @@ OGRErr OGRFeatureDefn::DeleteGeomFieldDe
+  * function directly, but use OGR_L_DeleteGeomField() instead (*not implemented yet*)
+  *
+  * This method should only be called while there are no OGRFeature
+- * objects in existance based on this OGRFeatureDefn.
++ * objects in existence based on this OGRFeatureDefn.
+  *
+  * This method is the same as the C++ method OGRFeatureDefn::DeleteGeomFieldDefn().
+  *
+--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
++++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
+@@ -2009,7 +2009,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the new field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -2041,7 +2041,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the new field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this function. You can query a layer to check if it supports it
+@@ -2073,7 +2073,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the deleted field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -2101,7 +2101,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the deleted field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this function. You can query a layer to check if it supports it
+@@ -2129,7 +2129,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the reordering of the fields.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ panMap is such that,for each field definition at position i after reordering,
+@@ -2164,7 +2164,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the reordering of the fields.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ panMap is such that,for each field definition at position i after reordering,
+@@ -2202,7 +2202,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the reordering of the fields.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ The field definition that was at initial position iOldFieldPos will be moved at
+@@ -2239,7 +2239,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the reordering of the fields.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ The field definition that was at initial position iOldFieldPos will be moved at
+@@ -2274,7 +2274,7 @@ Internally the OGRFeatureDefn for the la
+ to reflect the altered field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -2307,7 +2307,7 @@ Internally the OGRFeatureDefn for the la
+ to reflect the altered field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this function. You can query a layer to check if it supports it
+@@ -2343,7 +2343,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the new field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -2377,7 +2377,7 @@ on a real layer. Internally the OGRFeatu
+ to reflect the new field.  Applications should never modify the OGRFeatureDefn
+ used by a layer directly.
+ 
+-This function should not be called while there are feature objects in existance that
++This function should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ 
+ Not all drivers support this function. You can query a layer to check if it supports it
+--- a/ogr/ogrspatialreference.cpp
++++ b/ogr/ogrspatialreference.cpp
+@@ -771,7 +771,7 @@ OGRErr OSRImportFromWkt( OGRSpatialRefer
+  * \brief Set attribute value in spatial reference.
+  *
+  * Missing intermediate nodes in the path will be created if not already
+- * in existance.  If the attribute has no children one will be created and
++ * in existence.  If the attribute has no children one will be created and
+  * assigned the value otherwise the zeroth child will be assigned the value.
+  *
+  * This method does the same as the C function OSRSetAttrValue(). 
+--- a/port/cpl_conv.cpp
++++ b/port/cpl_conv.cpp
+@@ -2638,7 +2638,7 @@ void CPLCleanupSetlocaleMutex(void)
+ /************************************************************************/
+ 
+ /**
+- * Check for file existance.
++ * Check for file existence.
+  *
+  * The function checks if a named file exists in the filesystem, hopefully
+  * in an efficient fashion if a sibling file list is available.   It exists
+@@ -2651,7 +2651,7 @@ void CPLCleanupSetlocaleMutex(void)
+  * updated with the correct case and TRUE is returned. 
+  *
+  * If papszSiblingFiles is NULL, a VSIStatL() is used to test for the files
+- * existance, and no case insensitive testing is done. 
++ * existence, and no case insensitive testing is done. 
+  *
+  * @param pszFilename name of file to check for - filename case updated in some cases.
+  * @param papszSiblingFiles a list of files in the same directory as 
+--- a/port/cpl_vsi_mem.cpp
++++ b/port/cpl_vsi_mem.cpp
+@@ -905,7 +905,7 @@ VSILFILE *VSIFileFromMemBuffer( const ch
+  * This function returns a pointer to the memory buffer underlying a 
+  * virtual "in memory" file.  If bUnlinkAndSeize is TRUE the filesystem
+  * object will be deleted, and ownership of the buffer will pass to the 
+- * caller otherwise the underlying file will remain in existance. 
++ * caller otherwise the underlying file will remain in existence. 
+  *
+  * @param pszFilename the name of the file to grab the buffer of.
+  * @param pnDataLength (file) length returned in this variable.
+--- a/swig/include/python/docs/ogr_featuredef_docs.i
++++ b/swig/include/python/docs/ogr_featuredef_docs.i
+@@ -109,7 +109,7 @@ To add a new field definition to a layer
+ function directly, but use OGR_L_CreateField() instead.
+ 
+ This function should only be called while there are no OGRFeature
+-objects in existance based on this OGRFeatureDefn. The OGRFieldDefn
++objects in existence based on this OGRFeatureDefn. The OGRFieldDefn
+ passed in is copied, and remains the responsibility of the caller.
+ 
+ This function is the same as the C++ method
+@@ -132,7 +132,7 @@ To delete an existing field definition f
+ use this function directly, but use OGR_L_DeleteField() instead.
+ 
+ This method should only be called while there are no OGRFeature
+-objects in existance based on this OGRFeatureDefn.
++objects in existence based on this OGRFeatureDefn.
+ 
+ This method is the same as the C++ method
+ OGRFeatureDefn::DeleteFieldDefn().
+@@ -157,7 +157,7 @@ To reorder the field definitions in a la
+ this function directly, but use OGR_L_ReorderFields() instead.
+ 
+ This method should only be called while there are no OGRFeature
+-objects in existance based on this OGRFeatureDefn.
++objects in existence based on this OGRFeatureDefn.
+ 
+ This method is the same as the C++ method
+ OGRFeatureDefn::ReorderFieldDefns().
+@@ -349,4 +349,4 @@ on.
+ 
+ bIgnore:  ignore state ";
+ 
+-}
+\ No newline at end of file
++}
+--- a/swig/include/python/docs/ogr_layer_docs.i
++++ b/swig/include/python/docs/ogr_layer_docs.i
+@@ -261,7 +261,7 @@ Applications should never modify the OGR
+ directly.
+ 
+ This function should not be called while there are feature objects in
+-existance that were obtained or created with the previous layer
++existence that were obtained or created with the previous layer
+ definition.
+ 
+ Not all drivers support this function. You can query a layer to check
+@@ -295,7 +295,7 @@ the deleted field. Applications should n
+ used by a layer directly.
+ 
+ This function should not be called while there are feature objects in
+-existance that were obtained or created with the previous layer
++existence that were obtained or created with the previous layer
+ definition.
+ 
+ Not all drivers support this function. You can query a layer to check
+@@ -328,7 +328,7 @@ the reordering of the fields. Applicatio
+ OGRFeatureDefn used by a layer directly.
+ 
+ This function should not be called while there are feature objects in
+-existance that were obtained or created with the previous layer
++existence that were obtained or created with the previous layer
+ definition.
+ 
+ panMap is such that,for each field definition at position i after
+@@ -373,7 +373,7 @@ the reordering of the fields. Applicatio
+ OGRFeatureDefn used by a layer directly.
+ 
+ This function should not be called while there are feature objects in
+-existance that were obtained or created with the previous layer
++existence that were obtained or created with the previous layer
+ definition.
+ 
+ The field definition that was at initial position iOldFieldPos will be
+@@ -419,7 +419,7 @@ updated to reflect the altered field. Ap
+ the OGRFeatureDefn used by a layer directly.
+ 
+ This function should not be called while there are feature objects in
+-existance that were obtained or created with the previous layer
++existence that were obtained or created with the previous layer
+ definition.
+ 
+ Not all drivers support this function. You can query a layer to check
+@@ -894,4 +894,4 @@ is passed, the ignored list is cleared.
+ OGRERR_NONE if all field names have been resolved (even if the driver
+ does not support this method) ";
+ 
+-}
+\ No newline at end of file
++}
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -6500,7 +6500,7 @@ on a real layer. Internally the FeatureD
+ to reflect the new field.  Applications should never modify the FeatureDefn
+ used by a layer directly.
+ <p>
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ <p>
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -6534,7 +6534,7 @@ on a real layer. Internally the FeatureD
+ to reflect the deleted field.  Applications should never modify the FeatureDefn
+ used by a layer directly.
+ <p>
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ <p>
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -6558,7 +6558,7 @@ on a real layer. Internally the FeatureD
+ to reflect the reordering of the fields.  Applications should never modify the FeatureDefn
+ used by a layer directly.
+ <p>
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ <p>
+ panMap is such that,for each field definition at position i after reordering,
+@@ -6592,7 +6592,7 @@ on a real layer. Internally the FeatureD
+ to reflect the reordering of the fields.  Applications should never modify the FeatureDefn
+ used by a layer directly.
+ <p>
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ <p>
+ The field definition that was at initial position iOldFieldPos will be moved at
+@@ -6623,7 +6623,7 @@ Internally the FeatureDefn for the layer
+ to reflect the altered field.  Applications should never modify the FeatureDefn
+ used by a layer directly.
+ <p>
+-This method should not be called while there are feature objects in existance that
++This method should not be called while there are feature objects in existence that
+ were obtained or created with the previous layer definition.
+ <p>
+ Not all drivers support this method. You can query a layer to check if it supports it
+@@ -9380,7 +9380,7 @@ public class FeatureDefn:public FeatureD
+  * function directly, but use Layer.<a href="Layer.html#CreateField(org.gdal.ogr.FieldDefn)">CreateField()</a> instead.
+  * <p>
+  * This method should only be called while there are no Feature
+- * objects in existance based on this FeatureDefn.  The FieldDefn
++ * objects in existence based on this FeatureDefn.  The FieldDefn
+  * passed in is copied, and remains the responsibility of the caller.
+  *
+  * @param defn the definition of the new field.
+@@ -11223,7 +11223,7 @@ public class SpatialReference:public int
+  * Set attribute value in spatial reference.
+  * <p>
+  * Missing intermediate nodes in the path will be created if not already
+- * in existance.  If the attribute has no children one will be created and
++ * in existence.  If the attribute has no children one will be created and
+  * assigned the value otherwise the zeroth child will be assigned the value.
+  *
+  * @param name full path to attribute to be set.  For instance
+--- a/swig/python/extensions/ogr_wrap.cpp
++++ b/swig/python/extensions/ogr_wrap.cpp
+@@ -24714,7 +24714,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"directly.\n"
+ 		"\n"
+ 		"This function should not be called while there are feature objects in\n"
+-		"existance that were obtained or created with the previous layer\n"
++		"existence that were obtained or created with the previous layer\n"
+ 		"definition.\n"
+ 		"\n"
+ 		"Not all drivers support this function. You can query a layer to check\n"
+@@ -24751,7 +24751,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"used by a layer directly.\n"
+ 		"\n"
+ 		"This function should not be called while there are feature objects in\n"
+-		"existance that were obtained or created with the previous layer\n"
++		"existence that were obtained or created with the previous layer\n"
+ 		"definition.\n"
+ 		"\n"
+ 		"Not all drivers support this function. You can query a layer to check\n"
+@@ -24791,7 +24791,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"OGRFeatureDefn used by a layer directly.\n"
+ 		"\n"
+ 		"This function should not be called while there are feature objects in\n"
+-		"existance that were obtained or created with the previous layer\n"
++		"existence that were obtained or created with the previous layer\n"
+ 		"definition.\n"
+ 		"\n"
+ 		"The field definition that was at initial position iOldFieldPos will be\n"
+@@ -24839,7 +24839,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"OGRFeatureDefn used by a layer directly.\n"
+ 		"\n"
+ 		"This function should not be called while there are feature objects in\n"
+-		"existance that were obtained or created with the previous layer\n"
++		"existence that were obtained or created with the previous layer\n"
+ 		"definition.\n"
+ 		"\n"
+ 		"panMap is such that,for each field definition at position i after\n"
+@@ -24884,7 +24884,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"the OGRFeatureDefn used by a layer directly.\n"
+ 		"\n"
+ 		"This function should not be called while there are feature objects in\n"
+-		"existance that were obtained or created with the previous layer\n"
++		"existence that were obtained or created with the previous layer\n"
+ 		"definition.\n"
+ 		"\n"
+ 		"Not all drivers support this function. You can query a layer to check\n"
+@@ -25961,7 +25961,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"function directly, but use OGR_L_CreateField() instead.\n"
+ 		"\n"
+ 		"This function should only be called while there are no OGRFeature\n"
+-		"objects in existance based on this OGRFeatureDefn. The OGRFieldDefn\n"
++		"objects in existence based on this OGRFeatureDefn. The OGRFieldDefn\n"
+ 		"passed in is copied, and remains the responsibility of the caller.\n"
+ 		"\n"
+ 		"This function is the same as the C++ method\n"
+--- a/swig/python/osgeo/ogr.py
++++ b/swig/python/osgeo/ogr.py
+@@ -1766,7 +1766,7 @@ class Layer(MajorObject):
+         directly.
+ 
+         This function should not be called while there are feature objects in
+-        existance that were obtained or created with the previous layer
++        existence that were obtained or created with the previous layer
+         definition.
+ 
+         Not all drivers support this function. You can query a layer to check
+@@ -1806,7 +1806,7 @@ class Layer(MajorObject):
+         used by a layer directly.
+ 
+         This function should not be called while there are feature objects in
+-        existance that were obtained or created with the previous layer
++        existence that were obtained or created with the previous layer
+         definition.
+ 
+         Not all drivers support this function. You can query a layer to check
+@@ -1849,7 +1849,7 @@ class Layer(MajorObject):
+         OGRFeatureDefn used by a layer directly.
+ 
+         This function should not be called while there are feature objects in
+-        existance that were obtained or created with the previous layer
++        existence that were obtained or created with the previous layer
+         definition.
+ 
+         The field definition that was at initial position iOldFieldPos will be
+@@ -1900,7 +1900,7 @@ class Layer(MajorObject):
+         OGRFeatureDefn used by a layer directly.
+ 
+         This function should not be called while there are feature objects in
+-        existance that were obtained or created with the previous layer
++        existence that were obtained or created with the previous layer
+         definition.
+ 
+         panMap is such that,for each field definition at position i after
+@@ -1948,7 +1948,7 @@ class Layer(MajorObject):
+         the OGRFeatureDefn used by a layer directly.
+ 
+         This function should not be called while there are feature objects in
+-        existance that were obtained or created with the previous layer
++        existence that were obtained or created with the previous layer
+         definition.
+ 
+         Not all drivers support this function. You can query a layer to check
+@@ -3553,7 +3553,7 @@ class FeatureDefn(_object):
+         function directly, but use OGR_L_CreateField() instead.
+ 
+         This function should only be called while there are no OGRFeature
+-        objects in existance based on this OGRFeatureDefn. The OGRFieldDefn
++        objects in existence based on this OGRFeatureDefn. The OGRFieldDefn
+         passed in is copied, and remains the responsibility of the caller.
+ 
+         This function is the same as the C++ method
diff --git a/debian/patches/instantiate-typo.patch b/debian/patches/instantiate-typo.patch
new file mode 100644
index 0000000..1d0d405
--- /dev/null
+++ b/debian/patches/instantiate-typo.patch
@@ -0,0 +1,285 @@
+Description: Fix 'instanciate' typo, replace with 'instantiate'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/NEWS
++++ b/NEWS
+@@ -4512,7 +4512,7 @@ PostgreSQL driver:
+  * If the PG_USE_BASE64 configuration option is set to YES, geometries will be
+    requested as BASE64 encoded EWKB instead of canonical HEX encoded EWKB.
+    (useful when bandwidth is the limiting factor)
+- * Don't instanciate layer defn at layer creation. This can speed up
++ * Don't instantiate layer defn at layer creation. This can speed up
+    significantly database opening when they are many tables and the user just
+    needs to fetch one with GetLayerByName().
+  * Implement efficient OGRLayer::GetName() and OGRLayer::GetGeomType()
+--- a/apps/ogr2ogr.cpp
++++ b/apps/ogr2ogr.cpp
+@@ -2739,7 +2739,7 @@ static OGRLayer* GetLayerAndOverwriteIfN
+     if( pbErrorOccured )
+         *pbErrorOccured = FALSE;
+ 
+-    /* GetLayerByName() can instanciate layers that would have been */
++    /* GetLayerByName() can instantiate layers that would have been */
+     /* 'hidden' otherwise, for example, non-spatial tables in a */
+     /* Postgis-enabled database, so this apparently useless command is */
+     /* not useless... (#4012) */
+--- a/apps/ogrlineref.cpp
++++ b/apps/ogrlineref.cpp
+@@ -171,7 +171,7 @@ static OGRLayer* SetupTargetLayer(OGRLay
+     /*      Find the layer.                                                 */
+     /* -------------------------------------------------------------------- */
+ 
+-    /* GetLayerByName() can instanciate layers that would have been */
++    /* GetLayerByName() can instantiate layers that would have been */
+     /* 'hidden' otherwise, for example, non-spatial tables in a */
+     /* Postgis-enabled database, so this apparently useless command is */
+     /* not useless... (#4012) */
+--- a/data/osmconf.ini
++++ b/data/osmconf.ini
+@@ -66,7 +66,7 @@ z_order_sql="SELECT (CASE [highway] WHEN
+ 
+ [multipolygons]
+ # common attributes
+-# note: for multipolygons, osm_id=yes instanciates a osm_id field for the id of relations
++# note: for multipolygons, osm_id=yes instantiates a osm_id field for the id of relations
+ # and a osm_way_id field for the id of closed ways. Both fields are exclusively set.
+ osm_id=yes
+ osm_version=no
+--- a/frmts/gtiff/geotiff.cpp
++++ b/frmts/gtiff/geotiff.cpp
+@@ -12453,7 +12453,7 @@ GTiffDataset::CreateCopy( const char * p
+         if (poDS->nOverviewCount != nSrcOverviews)
+         {
+             CPLError(CE_Failure, CPLE_AppDefined,
+-                     "Did only manage to instanciate %d overview levels, whereas source contains %d",
++                     "Did only manage to instantiate %d overview levels, whereas source contains %d",
+                      poDS->nOverviewCount, nSrcOverviews);
+             eErr = CE_Failure;
+         }
+--- a/frmts/gtiff/libtiff/tif_dirread.c
++++ b/frmts/gtiff/libtiff/tif_dirread.c
+@@ -3767,7 +3767,7 @@ TIFFReadDirectory(TIFF* tif)
+ 					uint32 countrequired;
+ 					uint32 incrementpersample;
+ 					uint16* value=NULL;
+-                    /* It would be dangerous to instanciate those tag values */
++                    /* It would be dangerous to instantiate those tag values */
+                     /* since if td_bitspersample has not yet been read (due to */
+                     /* unordered tags), it could be read afterwards with a */
+                     /* values greater than the default one (1), which may cause */
+--- a/frmts/jpeg/jpgdataset.cpp
++++ b/frmts/jpeg/jpgdataset.cpp
+@@ -1386,7 +1386,7 @@ void JPGDatasetCommon::InitInternalOverv
+     bHasInitInternalOverviews = TRUE;
+ 
+ /* -------------------------------------------------------------------- */
+-/*      Instanciate on-the-fly overviews (if no external ones).         */
++/*      Instantiate on-the-fly overviews (if no external ones).         */
+ /* -------------------------------------------------------------------- */
+     if( nScaleFactor == 1 && GetRasterBand(1)->GetOverviewCount() == 0 )
+     {
+--- a/frmts/postgisraster/postgisrasterdataset.cpp
++++ b/frmts/postgisraster/postgisrasterdataset.cpp
+@@ -64,7 +64,7 @@ CPL_C_END
+             During a IRasterIO() query,
+             i) we will do a SQL query to retrieve the PKID of tiles that intersect the query window.
+             ii) If some tiles are not registered as sources, then do a SQL query to fetch their metadata
+-            and instanciate them and register them.
++            and instantiate them and register them.
+             iii) If some tiles are not cached, then determine if the query window is not too big (w.r.t. GDAL cache),
+             and if not, then do a SQL query to fetch their raster column.
+ 
+--- a/frmts/vrt/vrtdataset.cpp
++++ b/frmts/vrt/vrtdataset.cpp
+@@ -1361,7 +1361,7 @@ CPLErr VRTDataset::IRasterIO( GDALRWFlag
+         void             *pProgressDataGlobal = psExtraArg->pProgressData;
+ 
+         /* Use the last band, because when sources reference a GDALProxyDataset, they */
+-        /* don't necessary instanciate all underlying rasterbands */
++        /* don't necessary instantiate all underlying rasterbands */
+         VRTSourcedRasterBand* poBand = (VRTSourcedRasterBand* )papoBands[nBands - 1];
+         for(int iSource = 0; eErr == CE_None && iSource < poBand->nSources; iSource++)
+         {
+--- a/ogr/ogrfeaturestyle.cpp
++++ b/ogr/ogrfeaturestyle.cpp
+@@ -667,7 +667,7 @@ int OGR_SM_GetPartCount(OGRStyleMgrH hSM
+  *
+  * This method is the same as the C function OGR_SM_GetPart().
+  *
+- * This method instanciates a new object that should be freed with OGR_ST_Destroy().
++ * This method instantiates a new object that should be freed with OGR_ST_Destroy().
+  *
+  * @param nPartId the part number (0-based index).
+  * @param pszStyleString (optional) the style string on which to operate.
+@@ -720,7 +720,7 @@ OGRStyleTool *OGRStyleMgr::GetPart(int n
+  *
+  * This function is the same as the C++ method OGRStyleMgr::GetPart().
+  *
+- * This function instanciates a new object that should be freed with OGR_ST_Destroy().
++ * This function instantiates a new object that should be freed with OGR_ST_Destroy().
+  *
+  * @param hSM handle to the style manager.
+  * @param nPartId the part number (0-based index).
+--- a/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
++++ b/ogr/ogrsf_frmts/libkml/ogrlibkmlgeometry.cpp
+@@ -571,7 +571,7 @@ OGRGeometry *kml2geom_rec (
+         poKmlMultiGeometry = AsMultiGeometry ( poKmlGeometry );
+         nGeom = poKmlMultiGeometry->get_geometry_array_size (  );
+ 
+-        /* Detect subgeometry type to instanciate appropriate Multi geometry type */
++        /* Detect subgeometry type to instantiate appropriate Multi geometry type */
+         kmldom::KmlDomType type = kmldom::Type_Unknown;
+         for ( i = 0; i < nGeom; i++ ) {
+             poKmlTmpGeometry = poKmlMultiGeometry->get_geometry_array_at ( i );
+--- a/ogr/ogrsf_frmts/mitab/mitab.h
++++ b/ogr/ogrsf_frmts/mitab/mitab.h
+@@ -1017,7 +1017,7 @@ class ITABFeatureSymbol
+  *
+  * TABFeature will be used as a base class for all the feature classes.
+  *
+- * This class will also be used to instanciate objects with no Geometry
++ * This class will also be used to instantiate objects with no Geometry
+  * (i.e. type TAB_GEOM_NONE) which is a valid case in MapInfo.
+  *
+  * The logic to read/write the object from/to the .DAT and .MAP files is also
+--- a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
++++ b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+@@ -1473,7 +1473,7 @@ OGRPGDataSource::ICreateLayer( const cha
+         osSQLLayerName += pszTableName;
+     }
+ 
+-    /* GetLayerByName() can instanciate layers that would have been */
++    /* GetLayerByName() can instantiate layers that would have been */
+     /* 'hidden' otherwise, for example, non-spatial tables in a */
+     /* Postgis-enabled database, so this apparently useless command is */
+     /* not useless... (#4012) */
+--- a/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp
++++ b/ogr/ogrsf_frmts/vrt/ogrvrtdatasource.cpp
+@@ -168,7 +168,7 @@ OGRLayer*  OGRVRTDataSource::Instanciate
+     if( poSrcLayer == NULL )
+     {
+         CPLError( CE_Failure, CPLE_AppDefined,
+-                  "Cannot instanciate source layer" );
++                  "Cannot instantiate source layer" );
+         return NULL;
+     }
+ 
+--- a/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
++++ b/ogr/ogrsf_frmts/vrt/ogrvrtlayer.cpp
+@@ -804,7 +804,7 @@ try_again:
+         }
+         }
+ 
+-        /* Instanciate real geometry fields from VRT properties */
++        /* Instantiate real geometry fields from VRT properties */
+         poFeatureDefn->SetGeomType(wkbNone);
+         for( size_t i = 0; i < apoGeomFieldProps.size(); i ++ )
+         {
+--- a/port/cpl_multiproc.h
++++ b/port/cpl_multiproc.h
+@@ -123,10 +123,10 @@ CPL_C_END
+ 
+ #ifdef __cplusplus
+ 
+-/* Instanciates the mutex if not already done. The parameter x should be a (void**)  */
++/* Instantiates the mutex if not already done. The parameter x should be a (void**)  */
+ #define CPLMutexHolderD(x)  CPLMutexHolder oHolder(x,1000.0,__FILE__,__LINE__);
+ 
+-/* Instanciates the mutex with options if not already done. */
++/* Instantiates the mutex with options if not already done. */
+ /* The parameter x should be a (void**)  */
+ #define CPLMutexHolderExD(x, nOptions)  CPLMutexHolder oHolder(x,1000.0,__FILE__,__LINE__,nOptions);
+ 
+@@ -143,7 +143,7 @@ class CPL_DLL CPLMutexHolder
+ 
+   public:
+ 
+-    /* Instanciates the mutex if not already done */
++    /* Instantiates the mutex if not already done */
+     CPLMutexHolder( CPLMutex **phMutex, double dfWaitInSeconds = 1000.0,
+                     const char *pszFile = __FILE__,
+                     int nLine = __LINE__,
+@@ -158,7 +158,7 @@ class CPL_DLL CPLMutexHolder
+     ~CPLMutexHolder();
+ };
+ 
+-/* Instanciates the lock if not already done. The parameter x should be a (CPLLock**) */
++/* Instantiates the lock if not already done. The parameter x should be a (CPLLock**) */
+ #define CPLLockHolderD(x, eType)  CPLLockHolder oHolder(x,eType,__FILE__,__LINE__);
+ 
+ /* This variant assumes the the lock has already been created. If not, it will */
+@@ -174,7 +174,7 @@ class CPL_DLL CPLLockHolder
+ 
+   public:
+ 
+-    /* Instanciates the lock if not already done */
++    /* Instantiates the lock if not already done */
+     CPLLockHolder( CPLLock **phSpin, CPLLockType eType,
+                     const char *pszFile = __FILE__,
+                     int nLine = __LINE__);
+--- a/swig/java/apps/ogr2ogr.java
++++ b/swig/java/apps/ogr2ogr.java
+@@ -1194,7 +1194,7 @@ public class ogr2ogr
+     /*      Find the layer.                                                 */
+     /* -------------------------------------------------------------------- */
+ 
+-        /* GetLayerByName() can instanciate layers that would have been */
++        /* GetLayerByName() can instantiate layers that would have been */
+         /* 'hidden' otherwise, for example, non-spatial tables in a */
+         /* Postgis-enabled database, so this apparently useless command is */
+         /* not useless... (#4012) */
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -8179,7 +8179,7 @@ public class Geometry:public Geometry(in
+ /** 
+  * Create a new geometry.
+  * <p>
+- * The geometry can be instanciated by 4 different and exclusive way :
++ * The geometry can be instantiated by 4 different and exclusive way :
+  * <ul>
+  * <li> By specifying the geometry type (ogr.wkbPoint, etc..)</li>
+  * <li> By specifying the well known text representation (wkt)</li>
+--- a/swig/python/samples/ogr2ogr.py
++++ b/swig/python/samples/ogr2ogr.py
+@@ -1244,7 +1244,7 @@ def SetupTargetLayer( poSrcDS, poSrcLaye
+ #/*      Find the layer.                                                 */
+ #/* -------------------------------------------------------------------- */
+ 
+-    #/* GetLayerByName() can instanciate layers that would have been */
++    #/* GetLayerByName() can instantiate layers that would have been */
+     #*/ 'hidden' otherwise, for example, non-spatial tables in a */
+     #*/ Postgis-enabled database, so this apparently useless command is */
+     #/* not useless... (#4012) */
+--- a/gcore/gdaldllmain.cpp
++++ b/gcore/gdaldllmain.cpp
+@@ -79,7 +79,7 @@ void GDALDestroy(void)
+     bInGDALGlobalDestructor = FALSE;
+ 
+     /* See https://trac.osgeo.org/gdal/ticket/6139 */
+-    /* Needed in case no driver manager has been instanciated */
++    /* Needed in case no driver manager has been instantiated */
+     CPLFreeConfig();
+     CPLFinalizeTLS();
+     CPLCleanupMasterMutex();
+--- a/ogr/ogr_arch.dox
++++ b/ogr/ogr_arch.dox
+@@ -240,7 +240,7 @@ A GDALDriver object is instantiated for
+ The GDALDriver objects are registered with the GDALDriverManager, a
+ singleton class that is normally used to open new datasets.<p>
+ 
+-It is intended that a new GDALDriver object is instanciated and define function
++It is intended that a new GDALDriver object is instantiated and define function
+ pointers for operations like Identify(), Open() for each
+ file format to be supported (along with a file format specific 
+ GDALDataset, and OGRLayer classes).<p>
+--- a/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp
++++ b/ogr/ogrsf_frmts/mitab/mitab_imapinfofile.cpp
+@@ -318,7 +318,7 @@ OGRFeature *IMapInfoFile::GetNextFeature
+ /**********************************************************************
+  *                   IMapInfoFile::CreateTABFeature()
+  *
+- * Instanciate a TABFeature* from a OGRFeature* (or NULL on error)
++ * Instantiate a TABFeature* from a OGRFeature* (or NULL on error)
+  **********************************************************************/
+ 
+ TABFeature* IMapInfoFile::CreateTABFeature(OGRFeature *poFeature)
diff --git a/debian/patches/outputting-typo.patch b/debian/patches/outputting-typo.patch
new file mode 100644
index 0000000..e16fdbf
--- /dev/null
+++ b/debian/patches/outputting-typo.patch
@@ -0,0 +1,173 @@
+Description: Fix 'outputing' typo, replace with 'outputting'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/NEWS
++++ b/NEWS
+@@ -2929,7 +2929,7 @@ Utilities:
+  * gdalinfo: add '-sd num' option to report subdataset with the specified number.
+  * gdalinfo: add '-proj4' option to gdalinfo, to report a PROJ.4 string for the CRS
+  * gdal_translate: propagate INTERLEAVE metadata to intermediate VRT dataset
+- * gdal_translate: force quiet mode when outputing to /vsistdout/
++ * gdal_translate: force quiet mode when outputting to /vsistdout/
+  * gdalwarp: Disable CENTER_LONG rewrapping for cutline (#3932)
+  * gdalwarp: add -refine_gcps option to discard outliers GCPs before warping (#4143)
+  * gdalwarp: add warning if user specifies several of -order, -tps, -rpc or -geoloc options
+@@ -2959,7 +2959,7 @@ Multi-driver topics:
+  * Port DOQ1, DOQ2, ELAS, Idrisi, L1B, NDF, NWT_GRD, NWT_GRC, USGSDEM to VSI virtual file API
+  * PAM-enable BT and BLX drivers
+  * Implement Identify() for AAIGrid, ACE2, DTED, NWT_GRD, NWT_GRC, WMS, WCS, JDEM and BSB drivers
+- * Make GIF, JPEG and PNG drivers return a non NULL dataset when outputing to /vsistdout/
++ * Make GIF, JPEG and PNG drivers return a non NULL dataset when outputting to /vsistdout/
+  * HFA and GTiff: add explicit error message when trying to add external overviews when there are already internal overviews (#4044)
+  * Initialize overview manager to support external overviews for AAIGRID, DIPX, ELAS, GXF, FIT, FITS, GMT, GRIB, GSAG, GSBG, GS7BG, ILWIS, L1B, LCP, Leveller, NWT_GRD, NWT_GRC, RIK, SDTS and SAGA
+ 
+@@ -3055,7 +3055,7 @@ GeoRaster driver:
+  * Fix loading of small images, FlushCache issue (#4363)
+ 
+ GIF driver:
+- * Make CreateCopy() more friendly with outputing in /vsistdout/
++ * Make CreateCopy() more friendly with outputting in /vsistdout/
+ 
+ GRIB driver:
+  * Fix grid vs cell-center convention (#2637)
+@@ -4259,7 +4259,7 @@ Core:
+  * Make the GetStyleTable() SetStyleTable() SetStyleTableDirectly() methods on
+    datasources and layers virtual (#2978)
+  * Add OGRSFDriverRegistrar::DeregisterDriver() and OGRDeregisterDriver()
+- * Improve detection of rounding errors when outputing coordinates as text with
++ * Improve detection of rounding errors when outputting coordinates as text with
+    OGRMakeWktCoordinate()
+  * OGR SQL: allow comparing datetime columns in WHERE clause
+  * OGR indexing: re-use .ind file in read-write mode when calling CreateIndex()
+--- a/alg/gdalwarper.cpp
++++ b/alg/gdalwarper.cpp
+@@ -904,7 +904,7 @@ GDALWarpDstAlphaMasker( void *pMaskFuncA
+  * polygon.
+  *
+  * - OPTIMIZE_SIZE: This defaults to FALSE, but may be set to TRUE when
+- * outputing typically to a compressed dataset (GeoTIFF with COMPRESSED creation
++ * outputting typically to a compressed dataset (GeoTIFF with COMPRESSED creation
+  * option set for example) for achieving a smaller file size. This is achieved
+  * by writing at once data aligned on full blocks of the target dataset, which
+  * avoids partial writes of compressed blocks and lost space when they are rewritten
+@@ -916,8 +916,8 @@ GDALWarpDstAlphaMasker( void *pMaskFuncA
+  * warping. If not set, computation will be done in a single thread.
+  *
+  * - STREAMABLE_OUTPUT: (GDAL >= 2.0) This defaults to FALSE, but may be set to TRUE when
+- * outputing typically to a streamed file. The gdalwarp utility automatically
+- * sets this option when outputing to /vsistdout/ or a named pipe (on Unix).
++ * outputting typically to a streamed file. The gdalwarp utility automatically
++ * sets this option when outputting to /vsistdout/ or a named pipe (on Unix).
+  * This option has performance impacts for some reprojections.
+  * Note: band interleaved output is not currently supported by the warping algorithm in
+  * a streamable compabible way.
+--- a/apps/gdalwarp.cpp
++++ b/apps/gdalwarp.cpp
+@@ -238,7 +238,7 @@ use the -overwrite option.
+ Polygon cutlines may be used as a mask to restrict the area of the destination file
+ that may be updated, including blending.  If the OGR layer containing the cutline
+ features has no explicit SRS, the cutline features must be in the SRS of the
+-destination file. When outputing to a not yet existing target dataset,
++destination file. When outputting to a not yet existing target dataset,
+ its extent will be the one of the original raster unless -te or -crop_to_cutline are
+ specified.
+ 
+--- a/frmts/aaigrid/aaigriddataset.cpp
++++ b/frmts/aaigrid/aaigriddataset.cpp
+@@ -1232,7 +1232,7 @@ GDALDataset * AAIGDataset::CreateCopy(
+ /*      Re-open dataset, and copy any auxiliary pam information.         */
+ /* -------------------------------------------------------------------- */
+ 
+-    /* If outputing to stdout, we can't reopen it, so we'll return */
++    /* If outputting to stdout, we can't reopen it, so we'll return */
+     /* a fake dataset to make the caller happy */
+     CPLPushErrorHandler(CPLQuietErrorHandler);
+     GDALPamDataset* poDS = (GDALPamDataset*) GDALOpen(pszFilename, GA_ReadOnly);
+--- a/frmts/gif/gifdataset.cpp
++++ b/frmts/gif/gifdataset.cpp
+@@ -635,7 +635,7 @@ GIFDataset::CreateCopy( const char * psz
+ /*      Re-open dataset, and copy any auxiliary pam information.         */
+ /* -------------------------------------------------------------------- */
+ 
+-    /* If outputing to stdout, we can't reopen it, so we'll return */
++    /* If outputting to stdout, we can't reopen it, so we'll return */
+     /* a fake dataset to make the caller happy */
+     CPLPushErrorHandler(CPLQuietErrorHandler);
+     poDS = (GDALPamDataset*) GDALOpen(pszFilename, GA_ReadOnly);
+--- a/frmts/jpeg/jpgdataset.cpp
++++ b/frmts/jpeg/jpgdataset.cpp
+@@ -3580,7 +3580,7 @@ JPGDataset::CreateCopy( const char * psz
+ /*      Re-open dataset, and copy any auxiliary pam information.         */
+ /* -------------------------------------------------------------------- */
+ 
+-    /* If outputing to stdout, we can't reopen it, so we'll return */
++    /* If outputting to stdout, we can't reopen it, so we'll return */
+     /* a fake dataset to make the caller happy */
+     if( CSLTestBoolean(CPLGetConfigOption("GDAL_OPEN_AFTER_COPY", "YES")) )
+     {
+--- a/frmts/png/pngdataset.cpp
++++ b/frmts/png/pngdataset.cpp
+@@ -1890,7 +1890,7 @@ PNGDataset::CreateCopy( const char * psz
+ /*      Re-open dataset, and copy any auxiliary pam information.         */
+ /* -------------------------------------------------------------------- */
+ 
+-    /* If outputing to stdout, we can't reopen it, so we'll return */
++    /* If outputting to stdout, we can't reopen it, so we'll return */
+     /* a fake dataset to make the caller happy */
+     if( CSLTestBoolean(CPLGetConfigOption("GDAL_OPEN_AFTER_COPY", "YES")) )
+     {
+--- a/frmts/vrt/vrtsources.cpp
++++ b/frmts/vrt/vrtsources.cpp
+@@ -1924,7 +1924,7 @@ CPLErr VRTComplexSource::RasterIOInterna
+     if( eScalingType == VRT_SCALING_LINEAR && bNoDataSet == FALSE && dfScaleRatio == 0)
+     {
+ /* -------------------------------------------------------------------- */
+-/*      Optimization when outputing a constant value                    */
++/*      Optimization when outputting a constant value                   */
+ /*      (used by the -addalpha option of gdalbuildvrt)                  */
+ /* -------------------------------------------------------------------- */
+         pafData = NULL;
+--- a/frmts/webp/webpdataset.cpp
++++ b/frmts/webp/webpdataset.cpp
+@@ -805,7 +805,7 @@ WEBPDataset::CreateCopy( const char * ps
+ /* -------------------------------------------------------------------- */
+     GDALOpenInfo oOpenInfo(pszFilename, GA_ReadOnly);
+ 
+-    /* If outputing to stdout, we can't reopen it, so we'll return */
++    /* If outputting to stdout, we can't reopen it, so we'll return */
+     /* a fake dataset to make the caller happy */
+     CPLPushErrorHandler(CPLQuietErrorHandler);
+     WEBPDataset *poDS = (WEBPDataset*) WEBPDataset::Open( &oOpenInfo );
+--- a/frmts/xyz/xyzdataset.cpp
++++ b/frmts/xyz/xyzdataset.cpp
+@@ -1156,7 +1156,7 @@ GDALDataset* XYZDataset::CreateCopy( con
+     poXYZ_DS->nRasterYSize = nYSize;
+     poXYZ_DS->nBands = 1;
+     poXYZ_DS->SetBand( 1, new XYZRasterBand( poXYZ_DS, 1, eReqDT ) );
+-    /* If outputing to stdout, we can't reopen it --> silence warning */
++    /* If outputting to stdout, we can't reopen it --> silence warning */
+     CPLPushErrorHandler(CPLQuietErrorHandler);
+     poXYZ_DS->fp = VSIFOpenL( pszFilename, "rb" );
+     CPLPopErrorHandler();
+--- a/man/man1/gdalwarp.1
++++ b/man/man1/gdalwarp.1
+@@ -140,7 +140,7 @@ The destination file name\&.
+ .PP
+ Mosaicing into an existing output file is supported if the output file already exists\&. The spatial extent of the existing file will not be modified to accommodate new data, so you may have to remove it in that case, or use the -overwrite option\&.
+ .PP
+-Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending\&. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the SRS of the destination file\&. When outputing to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified\&.
++Polygon cutlines may be used as a mask to restrict the area of the destination file that may be updated, including blending\&. If the OGR layer containing the cutline features has no explicit SRS, the cutline features must be in the SRS of the destination file\&. When outputting to a not yet existing target dataset, its extent will be the one of the original raster unless -te or -crop_to_cutline are specified\&.
+ .SH "EXAMPLE"
+ .PP
+ For instance, an eight bit spot scene stored in GeoTIFF with control points mapping the corners to lat/long could be warped to a UTM projection with a command like this:
+--- a/swig/python/samples/build_jp2_from_xml.py
++++ b/swig/python/samples/build_jp2_from_xml.py
+@@ -315,7 +315,7 @@ def parse_jp2_box(xml_tree, out_f, src_j
+ 
+         vrt_ds = gdal.Open(serialized_xml_content)
+         if vrt_ds is None:
+-            print('Cannot decode VRTDataset. Outputing empty content')
++            print('Cannot decode VRTDataset. Outputting empty content')
+             binary_content = ''
+         else:
+             gdal.GetDriverByName('GTiff').CreateCopy('/vsimem/out.tif', vrt_ds)
diff --git a/debian/patches/position-typo.patch b/debian/patches/position-typo.patch
new file mode 100644
index 0000000..900dfb6
--- /dev/null
+++ b/debian/patches/position-typo.patch
@@ -0,0 +1,78 @@
+Description: Fix 'postion' typo, replace with 'position'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/apps/ogr_utilities.dox
++++ b/apps/ogr_utilities.dox
+@@ -566,7 +566,7 @@ format. Also some information writed to
+ <dt> <b>-of</b><em>field_name</em>:</dt><dd> The field name for storing the 
+     uniq values of input lines</dd>
+ <dt> <b>-s</b><em>step</em>:</dt><dd> The part size in linear units</dd>
+-<dt> <b>-get_pos</b>:</dt><dd> Return linear referenced postion for input X, Y</dd>
++<dt> <b>-get_pos</b>:</dt><dd> Return linear referenced position for input X, Y</dd>
+ <dt> <b>-x</b><em>long</em>:</dt><dd> Input X coordinate</dd>
+ <dt> <b>-y</b><em>lat</em>:</dt><dd> Input Y coordinate</dd>
+ <dt> <b>-get_coord</b>:</dt><dd> Return point on path for input linear distance</dd>
+--- a/apps/ogrlineref.cpp
++++ b/apps/ogrlineref.cpp
+@@ -114,7 +114,7 @@ static void Usage(const char* pszAdditio
+         " -lf field_name: Field name for uniq paths in layer (optional)\n"
+         " -p src_repers_datasource_name: Datasource of repers name\n"
+         " -pn layer_name: Layer name in datasource (optional)\n"
+-        " -pm pos_field_name: Line postion field name\n"
++        " -pm pos_field_name: Line position field name\n"
+         " -pf field_name: Field name for correspondence repers of separate paths in layer (optional)\n"
+         " -r src_parts_datasource_name: Parts datasource name\n"
+         " -rn layer_name: Layer name in datasource (optional)\n"
+--- a/frmts/hdf4/hdf-eos/EHapi.c
++++ b/frmts/hdf4/hdf-eos/EHapi.c
+@@ -1702,7 +1702,7 @@ EHinsertmeta(int32 sdInterfaceID, char *
+     char           *metaArr[2];	/* Array of metadata positions */
+     char           *colon;	/* Colon position */
+     char           *colon2;	/* 2nd colon position */
+-    char           *slash;	/* Slash postion */
++    char           *slash;	/* Slash position */
+     char           *utlstr;	/* Utility string */
+     char           *utlstr2;	/* Utility string 2 */
+ 
+@@ -2301,8 +2301,8 @@ EHinsertmeta(int32 sdInterfaceID, char *
+     /* --------------------------------------- */
+     seglen = strlen(utlstr);
+ 
+-    /* Get offset of entry postion within existing metadata */
+-    /* ---------------------------------------------------- */
++    /* Get offset of entry position within existing metadata */
++    /* ----------------------------------------------------- */
+     offset = metaptr - metabuf;
+ 
+ 
+--- a/frmts/netcdf/netcdfdataset.cpp
++++ b/frmts/netcdf/netcdfdataset.cpp
+@@ -4378,7 +4378,7 @@ GDALDataset *netCDFDataset::Open( GDALOp
+     int          nVarID=-1;
+ 
+     int          nTmpFormat=NCDF_FORMAT_NONE;
+-    int          *panBandDimPos=NULL;         // X, Y, Z postion in array
++    int          *panBandDimPos=NULL;         // X, Y, Z position in array
+     int          *panBandZLev=NULL;
+     int          *paDimIds=NULL;
+     size_t       xdim, ydim;
+@@ -5325,7 +5325,7 @@ netCDFDataset::CreateCopy( const char *
+     int status = NC_NOERR;
+ 
+     int nDim = 2;
+-    int          *panBandDimPos=NULL;         // X, Y, Z postion in array
++    int          *panBandDimPos=NULL;         // X, Y, Z position in array
+     int          *panBandZLev=NULL;
+     int          *panDimIds=NULL;
+     int          *panDimVarIds=NULL;
+--- a/man/man1/ogrlineref.1
++++ b/man/man1/ogrlineref.1
+@@ -75,7 +75,7 @@ The field name for storing the uniq valu
+ .IP "\fB\fB-s\fP\fIstep\fP:\fP" 1c
+ The part size in linear units 
+ .IP "\fB\fB-get_pos\fP:\fP" 1c
+-Return linear referenced postion for input X, Y 
++Return linear referenced position for input X, Y 
+ .IP "\fB\fB-x\fP\fIlong\fP:\fP" 1c
+ Input X coordinate 
+ .IP "\fB\fB-y\fP\fIlat\fP:\fP" 1c
diff --git a/debian/patches/responsibility-typo.patch b/debian/patches/responsibility-typo.patch
new file mode 100644
index 0000000..f352cd2
--- /dev/null
+++ b/debian/patches/responsibility-typo.patch
@@ -0,0 +1,67 @@
+Description: Fix 'responsiblity' typo, replace with 'responsibility'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ogr/ogr_srsnode.cpp
++++ b/ogr/ogr_srsnode.cpp
+@@ -342,7 +342,7 @@ void OGR_SRSNode::SetValue( const char *
+ /**
+  * Make a duplicate of this node, and it's children.
+  *
+- * @return a new node tree, which becomes the responsiblity of the caller.
++ * @return a new node tree, which becomes the responsibility of the caller.
+  */
+ 
+ OGR_SRSNode *OGR_SRSNode::Clone() const
+--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
++++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
+@@ -703,7 +703,7 @@ by the OGRSFDriverManager.
+  \brief Fetch the next available feature from this layer.
+ 
+  The returned feature
+- becomes the responsiblity of the caller to delete with OGRFeature::DestroyFeature(). It is critical that
++ becomes the responsibility of the caller to delete with OGRFeature::DestroyFeature(). It is critical that
+  all features associated with an OGRLayer (more specifically an 
+  OGRFeatureDefn) be deleted before that layer/datasource is deleted.
+ 
+@@ -735,7 +735,7 @@ by the OGRSFDriverManager.
+  \brief Fetch the next available feature from this layer.
+ 
+  The returned feature
+- becomes the responsiblity of the caller to delete with OGR_F_Destroy().  It is critical that
++ becomes the responsibility of the caller to delete with OGR_F_Destroy().  It is critical that
+  all features associated with an OGRLayer (more specifically an 
+  OGRFeatureDefn) be deleted before that layer/datasource is deleted.
+ 
+--- a/swig/include/python/docs/ogr_layer_docs.i
++++ b/swig/include/python/docs/ogr_layer_docs.i
+@@ -181,7 +181,7 @@ OGR_L_GetNextFeature(OGRLayerH hLayer)
+ 
+ Fetch the next available feature from this layer.
+ 
+-The returned feature becomes the responsiblity of the caller to delete
++The returned feature becomes the responsibility of the caller to delete
+ with OGR_F_Destroy(). It is critical that all features associated with
+ an OGRLayer (more specifically an OGRFeatureDefn) be deleted before
+ that layer/datasource is deleted.
+--- a/swig/python/extensions/ogr_wrap.cpp
++++ b/swig/python/extensions/ogr_wrap.cpp
+@@ -24357,7 +24357,7 @@ static PyMethodDef SwigMethods[] = {
+ 		"\n"
+ 		"Fetch the next available feature from this layer.\n"
+ 		"\n"
+-		"The returned feature becomes the responsiblity of the caller to delete\n"
++		"The returned feature becomes the responsibility of the caller to delete\n"
+ 		"with OGR_F_Destroy(). It is critical that all features associated with\n"
+ 		"an OGRLayer (more specifically an OGRFeatureDefn) be deleted before\n"
+ 		"that layer/datasource is deleted.\n"
+--- a/swig/python/osgeo/ogr.py
++++ b/swig/python/osgeo/ogr.py
+@@ -1380,7 +1380,7 @@ class Layer(MajorObject):
+ 
+         Fetch the next available feature from this layer.
+ 
+-        The returned feature becomes the responsiblity of the caller to delete
++        The returned feature becomes the responsibility of the caller to delete
+         with OGR_F_Destroy(). It is critical that all features associated with
+         an OGRLayer (more specifically an OGRFeatureDefn) be deleted before
+         that layer/datasource is deleted.
diff --git a/debian/patches/retrieve-typo.patch b/debian/patches/retrieve-typo.patch
new file mode 100644
index 0000000..c1e1ebb
--- /dev/null
+++ b/debian/patches/retrieve-typo.patch
@@ -0,0 +1,14 @@
+Description: Fix 'retrive' typo, replace with 'retrieve'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/frmts/raw/ehdrdataset.cpp
++++ b/frmts/raw/ehdrdataset.cpp
+@@ -1605,7 +1605,7 @@ GDALDataset *EHdrDataset::Open( GDALOpen
+             }
+             else
+             {
+-                CPLError( CE_Warning, CPLE_NotSupported, "Cannot retrive projection from IMAGE.REP");
++                CPLError( CE_Warning, CPLE_NotSupported, "Cannot retrieve projection from IMAGE.REP");
+             }
+         }
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 85423ad..6c50974 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,11 @@ spatialite
 java.opt
 perl-vendor
 occurred-typo.patch
+responsibility-typo.patch
+existence-typo.patch
+position-typo.patch
+outputting-typo.patch
+retrieve-typo.patch
+instantiate-typo.patch
+supported-typo.patch
+transform-typo.patch
diff --git a/debian/patches/supported-typo.patch b/debian/patches/supported-typo.patch
new file mode 100644
index 0000000..503072f
--- /dev/null
+++ b/debian/patches/supported-typo.patch
@@ -0,0 +1,69 @@
+Description: Fix 'suported' typo, replace with 'supported'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/configure.in
++++ b/configure.in
+@@ -120,7 +120,7 @@ AC_CHECK_TYPES([int8, int16, int32],,,
+ 
+ dnl We need the following lines for libtiff too.
+ HAVE_IEEEFP=1
+-AC_DEFINE_UNQUOTED(HAVE_IEEEFP, $HAVE_IEEEFP, [Define as 0 or 1 according to the floating point format suported by the machine])
++AC_DEFINE_UNQUOTED(HAVE_IEEEFP, $HAVE_IEEEFP, [Define as 0 or 1 according to the floating point format supported by the machine])
+ 
+ dnl Check the native cpu bit order (also libtiff stuff).
+ AC_MSG_CHECKING([native cpu bit order])
+--- a/frmts/gtiff/libtiff/tif_config.h.wince
++++ b/frmts/gtiff/libtiff/tif_config.h.wince
+@@ -12,7 +12,7 @@
+ 
+ /* Compatibility stuff. */
+ 
+-/* Define as 0 or 1 according to the floating point format suported by the
++/* Define as 0 or 1 according to the floating point format supported by the
+    machine */
+ #define HAVE_IEEEFP 1
+ 
+--- a/frmts/netcdf/netcdfdataset.cpp
++++ b/frmts/netcdf/netcdfdataset.cpp
+@@ -6243,7 +6243,7 @@ void NCDFWriteProjAttribs( const OGR_SRS
+                             else {
+                                 CPLError( CE_Failure, CPLE_NotSupported, 
+                                           "NetCDF driver export of LCC-1SP with no standard_parallel1 "
+-                                          "and no latitude_of_origin is not suported (bug #3324).");
++                                          "and no latitude_of_origin is not supported (bug #3324).");
+                             }
+                         }                      
+                     }
+--- a/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
++++ b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
+@@ -889,7 +889,7 @@ double OGRWAsPLayer::AvgZ( OGRGeometry *
+     case wkbMultiPolygon25D:
+         return AvgZ( static_cast< OGRGeometryCollection * >(poGeom) );
+     default: 
+-        CPLError( CE_Warning, CPLE_NotSupported, "Unsuported geometry type in OGRWAsPLayer::AvgZ()");
++        CPLError( CE_Warning, CPLE_NotSupported, "Unsupported geometry type in OGRWAsPLayer::AvgZ()");
+         break;
+     }
+     return 0; /* avoid warning */
+--- a/port/cpl_config.h.in
++++ b/port/cpl_config.h.in
+@@ -58,7 +58,7 @@
+ /* Define if you have the iconv() function and it works. */
+ #undef HAVE_ICONV
+ 
+-/* Define as 0 or 1 according to the floating point format suported by the
++/* Define as 0 or 1 according to the floating point format supported by the
+    machine */
+ #undef HAVE_IEEEFP
+ 
+--- a/port/cpl_config.h.vc
++++ b/port/cpl_config.h.vc
+@@ -88,7 +88,7 @@
+ /* Set the native cpu bit order */
+ #define HOST_FILLORDER FILLORDER_LSB2MSB
+ 
+-/* Define as 0 or 1 according to the floating point format suported by the
++/* Define as 0 or 1 according to the floating point format supported by the
+    machine */
+ #define HAVE_IEEEFP 1
+ 
diff --git a/debian/patches/transform-typo.patch b/debian/patches/transform-typo.patch
new file mode 100644
index 0000000..b85fa19
--- /dev/null
+++ b/debian/patches/transform-typo.patch
@@ -0,0 +1,65 @@
+Description: Fix 'tranform' typo, replace with 'transform'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/NEWS
++++ b/NEWS
+@@ -465,7 +465,7 @@ Algorithms:
+  * Warper: fix integer overflow when reprojecting into an area with (part of) bounds completely outside of the source projection (#5789)
+  * Warper: add min,max,med,q1 and q3 resampling algorithms (#5868)
+  * Warper: add a SRC_COORD_PRECISION warping option to help getting more reproducable output when -wm parameter changes (#5925)
+- * Warper: fix failure in GDALSuggestedWarpOut2() when top-left and bottom-right corners tranform to the same point (#5980)
++ * Warper: fix failure in GDALSuggestedWarpOut2() when top-left and bottom-right corners transform to the same point (#5980)
+  * GDALReprojectImage(): takes into account nodata values set on destination dataset
+  * Median cut and dithering: optimizations and enhancements to deal with 8-bit precision (only if using internal interface for now)
+  * rasterfill: add option to specify driver to use for temporary files
+--- a/frmts/grib/degrib18/degrib/tdlpack.cpp
++++ b/frmts/grib/degrib18/degrib/tdlpack.cpp
+@@ -48,9 +48,9 @@ TDLP_TableType TDLP_V_Table[4] = {
+ };
+ 
+ TDLP_TableType TDLP_T_Table[3] = {
+-   /* 0 */ {0, "No nolinear tranform"},
++   /* 0 */ {0, "No nolinear transform"},
+    /* 1 */ {1, "Square transform"},
+-   /* 2 */ {2, "Square root tranform"},
++   /* 2 */ {2, "Square root transform"},
+ };
+ 
+ TDLP_TableType TDLP_Oper_Table[9] = {
+--- a/frmts/ingr/IngrTypes.cpp
++++ b/frmts/ingr/IngrTypes.cpp
+@@ -301,9 +301,9 @@ void CPL_STDCALL INGR_GetTransMatrix( IN
+         return;
+     }
+ 
+-    // -------------------------------------------------------------
+-    // Calculate Concatened Tranformation Matrix based on Orientation
+-    // -------------------------------------------------------------
++    // ---------------------------------------------------------------
++    // Calculate Concatened Transformation Matrix based on Orientation
++    // ---------------------------------------------------------------
+ 
+     double adfConcat[16];
+    
+--- a/frmts/netcdf/netcdfdataset.cpp
++++ b/frmts/netcdf/netcdfdataset.cpp
+@@ -3553,7 +3553,7 @@ CPLErr netCDFDataset::AddProjectionVars(
+                          adfGeoTransform[i] );
+                 strcat( szGeoTransform, szTemp );
+             }
+-            CPLDebug( "GDAL_netCDF", "szGeoTranform = %s", szGeoTransform );
++            CPLDebug( "GDAL_netCDF", "szGeoTransform = %s", szGeoTransform );
+             
+             // if ( strlen(pszProj4Defn) > 0 ) {
+             //     nc_put_att_text( cdfid, NCDFVarID, "proj4",
+--- a/frmts/png/libpng/png.h
++++ b/frmts/png/libpng/png.h
+@@ -1399,7 +1399,7 @@ struct png_struct_def
+ #endif
+ 
+ #if defined(PNG_READ_SHIFT_SUPPORTED) || defined(PNG_WRITE_SHIFT_SUPPORTED)
+-   png_color_8 shift PNG_DEPSTRUCT;         /* shift for significant bit tranformation */
++   png_color_8 shift PNG_DEPSTRUCT;         /* shift for significant bit transformation */
+ #endif
+ 
+ #if defined(PNG_tRNS_SUPPORTED) || defined(PNG_READ_BACKGROUND_SUPPORTED) \

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



More information about the Pkg-grass-devel mailing list