[gdal] 01/03: Add patches for various typos.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Wed Feb 10 19:38:49 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gdal.
commit 5f848034d1e2e6bd1a49e83825e546debd9b3d98
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 22 15:07:18 2016 +0100
Add patches for various typos.
---
debian/changelog | 1 +
debian/patches/existence-typo.patch | 569 +++++++++++++++++++++++
debian/patches/instantiate-typo.patch | 230 +++++++++
debian/patches/occurred-typo.patch | 771 +++++++++++++++++++++++++++++++
debian/patches/outputting-typo.patch | 151 ++++++
debian/patches/position-typo.patch | 78 ++++
debian/patches/responsibility-typo.patch | 67 +++
debian/patches/retrieve-typo.patch | 14 +
debian/patches/series | 9 +
debian/patches/supported-typo.patch | 69 +++
debian/patches/transform-typo.patch | 65 +++
11 files changed, 2024 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index c0378ed..00f5c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gdal (1.11.3+dfsg-3) UNRELEASED; urgency=medium
* Update Vcs-Git URL to use HTTPS.
* Add upstream patch to fix crash with SQLite 3.10.0.
+ * Add patches for various typos.
-- Bas Couwenberg <sebastic at debian.org> Wed, 10 Feb 2016 17:00:34 +0100
diff --git a/debian/patches/existence-typo.patch b/debian/patches/existence-typo.patch
new file mode 100644
index 0000000..0091fc3
--- /dev/null
+++ b/debian/patches/existence-typo.patch
@@ -0,0 +1,569 @@
+Description: Fix 'existance' typo, replace with 'existence'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/frmts/vrt/vrtdataset.h
++++ b/frmts/vrt/vrtdataset.h
+@@ -253,7 +253,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
+@@ -352,7 +352,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().
+@@ -382,7 +382,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().
+@@ -409,7 +409,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().
+ *
+@@ -450,7 +450,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().
+ *
+@@ -477,7 +477,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().
+ *
+@@ -524,7 +524,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().
+ *
+@@ -654,7 +654,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().
+@@ -688,7 +688,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().
+@@ -717,7 +717,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().
+ *
+@@ -759,7 +759,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/generic/ogrsfdriverregistrar.cpp
++++ b/ogr/ogrsf_frmts/generic/ogrsfdriverregistrar.cpp
+@@ -169,7 +169,7 @@ void OGRCleanupAll()
+ *
+ * This static method should be used to fetch the singleton
+ * registrar. It will create a registrar if there is not already
+- * one in existance.
++ * one in existence.
+ *
+ * @return the current driver registrar.
+ */
+--- a/ogr/ogrsf_frmts/ogrsf_frmts.dox
++++ b/ogr/ogrsf_frmts/ogrsf_frmts.dox
+@@ -2690,7 +2690,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
+@@ -2719,7 +2719,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
+@@ -2748,7 +2748,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
+@@ -2776,7 +2776,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
+@@ -2804,7 +2804,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,
+@@ -2839,7 +2839,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,
+@@ -2877,7 +2877,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
+@@ -2914,7 +2914,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
+@@ -2949,7 +2949,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
+@@ -2981,7 +2981,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
+@@ -3016,7 +3016,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
+@@ -3047,7 +3047,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
+@@ -770,7 +770,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/ogr/wcts/html/index.html
++++ b/ogr/wcts/html/index.html
+@@ -64,7 +64,7 @@ for user interface to WCTS services and
+
+ <h2>Other WCTS Implementations</h2>
+
+-Currently there is only one other WCTS implementation in existance. That
++Currently there is only one other WCTS implementation in existence. That
+ is the one done by <a href="http://www.lat-lon.de">lat/lon</a>, the folks
+ that write the WCTS document. That implementation is also open source, and
+ can be found within the <a href="http://www.deegree.org">deegree</a> project.
+--- a/port/cpl_conv.cpp
++++ b/port/cpl_conv.cpp
+@@ -2488,7 +2488,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
+@@ -2501,7 +2501,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_strtod.cpp
++++ b/port/cpl_strtod.cpp
+@@ -116,7 +116,7 @@ double CPLAtofDelim(const char *nptr, ch
+ * custom delimiter.
+ *
+ * IMPORTANT NOTE.
+- * Existance of this function does not mean you should always use it.
++ * Existence of this function does not mean you should always use it.
+ * Sometimes you should use standard locale aware atof(3) and its family. When
+ * you need to process the user's input (for example, command line parameters)
+ * use atof(3), because user works in localized environment and her input will
+--- a/port/cpl_vsi_mem.cpp
++++ b/port/cpl_vsi_mem.cpp
+@@ -869,7 +869,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
+@@ -21580,7 +21580,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"
+@@ -21617,7 +21617,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"
+@@ -21657,7 +21657,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"
+@@ -21705,7 +21705,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"
+@@ -21750,7 +21750,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"
+@@ -22770,7 +22770,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
+@@ -1580,7 +1580,7 @@ class Layer(_object):
+ 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
+@@ -1620,7 +1620,7 @@ class Layer(_object):
+ 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
+@@ -1663,7 +1663,7 @@ class Layer(_object):
+ 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
+@@ -1714,7 +1714,7 @@ class Layer(_object):
+ 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
+@@ -1762,7 +1762,7 @@ class Layer(_object):
+ 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
+@@ -3247,7 +3247,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..63b327d
--- /dev/null
+++ b/debian/patches/instantiate-typo.patch
@@ -0,0 +1,230 @@
+Description: Fix 'instanciate' typo, replace with 'instantiate'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/NEWS
++++ b/NEWS
+@@ -3746,7 +3746,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
+@@ -2571,7 +2571,7 @@ static TargetLayerInfo* SetupTargetLayer
+ /* 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/apps/ogrlineref.cpp
++++ b/apps/ogrlineref.cpp
+@@ -170,7 +170,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
+@@ -55,7 +55,7 @@ ignore=created_by,converted_by,source,ti
+
+ [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
+@@ -9758,7 +9758,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
+@@ -1201,7 +1201,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
+@@ -1317,7 +1317,7 @@ CPLErr VRTDataset::IRasterIO( GDALRWFlag
+
+ CPLErr eErr = CE_None;
+ /* 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
+@@ -573,7 +573,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
+@@ -1035,7 +1035,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
+@@ -1310,7 +1310,7 @@ OGRPGDataSource::CreateLayer( const char
+ 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
+@@ -160,7 +160,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
+@@ -788,7 +788,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
+@@ -86,7 +86,7 @@ CPL_C_END
+
+ #ifdef __cplusplus
+
+-/* Instanciates the mutex if not already done */
++/* Instantiates the mutex if not already done */
+ #define CPLMutexHolderD(x) CPLMutexHolder oHolder(x,1000.0,__FILE__,__LINE__);
+
+ /* This variant assumes the the mutex has already been created. If not, it will */
+@@ -102,7 +102,7 @@ class CPL_DLL CPLMutexHolder
+
+ public:
+
+- /* Instanciates the mutex if not already done */
++ /* Instantiates the mutex if not already done */
+ CPLMutexHolder( void **phMutex, double dfWaitInSeconds = 1000.0,
+ 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) */
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
new file mode 100644
index 0000000..9b66db4
--- /dev/null
+++ b/debian/patches/occurred-typo.patch
@@ -0,0 +1,771 @@
+Description: Fix 'occured' typo, replace with 'occurred'.
+ Also fix 'occurance' typo, replace with 'occurrence'.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://trac.osgeo.org/gdal/ticket/6324
+
+--- a/NEWS
++++ b/NEWS
+@@ -899,7 +899,7 @@ Core:
+ * introduce OGRLayer::FindFieldIndex() / OGR_L_FindFieldIndex() to lookup potentially laundered field names (RFC 42)
+ * OGR SQL: upgrade to support RFC 41 (multiple geometry fields)
+ * OGR SQL: more stricter checks
+- * OGR SQL: make parsing error report a usefull hint where the syntax error occured
++ * OGR SQL: make parsing error report a usefull hint where the syntax error occurred
+ * OGR SQL: fix thread-safety of swq_op_registrar::GetOperator() (#5196)
+ * OGR SQL: support not explicitely specifying AS keyword for aliasing a column spec
+ * OGR SQL: don't call CONCAT(a_column ...) or SUBSTR(a_column ...) as a_column
+@@ -2139,7 +2139,7 @@ Core:
+ * Fix performance problem when serializing huge color tables, metadata, CategoryNames and GCPs to VRT/PAM (#3961)
+ * Be careful about Nan complex values getting histogram, avoid locale issues with statistics metadata
+ * GDALRasterBand::IRasterIO() default implementation : don't try to use full-res band if I/O failed on the appropriate overview band (for WMS errors)
+- * RasterIO: Return earlier when a write error occured while flushing dirty block
++ * RasterIO: Return earlier when a write error occurred while flushing dirty block
+ * GDAL_DISABLE_READDIR_ON_OPEN can be set to EMPTY_DIR to avoid reading the dir, but it set an empty dir to avoid looking for auxiliary files
+ * Use sibling file list to look for .aux.xml, .aux, .ovr, world files, tab files
+ * Add GDALFindAssociatedFile() (#4008)
+--- a/alg/gdalwarper.cpp
++++ b/alg/gdalwarper.cpp
+@@ -1397,7 +1397,7 @@ GDALWarpOptions * CPL_STDCALL GDALDeseri
+ }
+
+ /* -------------------------------------------------------------------- */
+-/* If any error has occured, cleanup else return success. */
++/* If any error has occurred, cleanup else return success. */
+ /* -------------------------------------------------------------------- */
+ if( CPLGetLastErrorNo() != CE_None )
+ {
+--- a/apps/testepsg.cpp
++++ b/apps/testepsg.cpp
+@@ -115,7 +115,7 @@ int main( int nArgc, char ** papszArgv )
+ {
+ if( oSRS.SetFromUserInput(papszArgv[i]) != OGRERR_NONE )
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Error occured translating %s.\n",
++ "Error occurred translating %s.\n",
+ papszArgv[i] );
+ else
+ {
+--- a/frmts/bsb/bsb_read.c
++++ b/frmts/bsb/bsb_read.c
+@@ -844,7 +844,7 @@ int BSBReadScanline( BSBInfo *psInfo, in
+ /* For reasons that are unclear, some scanlines are exactly one */
+ /* pixel short (such as in the BSB 3.0 354704.KAP product from */
+ /* NDI/CHS) but are otherwise OK. Just add a zero if this */
+-/* appear to have occured. */
++/* appear to have occurred. */
+ /* -------------------------------------------------------------------- */
+ if( iPixel == psInfo->nXSize - 1 )
+ pabyScanlineBuf[iPixel++] = 0;
+--- a/frmts/epsilon/epsilondataset.cpp
++++ b/frmts/epsilon/epsilondataset.cpp
+@@ -900,7 +900,7 @@ EpsilonDatasetCreateCopy( const char * p
+ (char*) pszFilter, eMode))
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Error occured when encoding block (%d, %d)",
++ "Error occurred when encoding block (%d, %d)",
+ nBlockXOff, nBlockYOff);
+ eErr = CE_Failure;
+ }
+@@ -921,7 +921,7 @@ EpsilonDatasetCreateCopy( const char * p
+ (char*) pszFilter, eMode))
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "Error occured when encoding block (%d, %d)",
++ "Error occurred when encoding block (%d, %d)",
+ nBlockXOff, nBlockYOff);
+ eErr = CE_Failure;
+ }
+--- a/frmts/gtiff/libtiff/tif_ojpeg.c
++++ b/frmts/gtiff/libtiff/tif_ojpeg.c
+@@ -1381,7 +1381,7 @@ OJPEGReadHeaderInfoSec(TIFF* tif)
+ static int
+ OJPEGReadHeaderInfoSecStreamDri(TIFF* tif)
+ {
+- /* this could easilly cause trouble in some cases... but no such cases have occured sofar */
++ /* this could easilly cause trouble in some cases... but no such cases have occurred sofar */
+ static const char module[]="OJPEGReadHeaderInfoSecStreamDri";
+ OJPEGState* sp=(OJPEGState*)tif->tif_data;
+ uint16 m;
+--- a/frmts/hdf4/hdf-eos/SWapi.c
++++ b/frmts/hdf4/hdf-eos/SWapi.c
+@@ -10266,8 +10266,8 @@ SWdetach(int32 swathID)
+
+ if (abs(match[0]) == 1)
+ {
+- /* Two Dimensional Array (no merging has occured) */
+- /* ---------------------------------------------- */
++ /* Two Dimensional Array (no merging has occurred) */
++ /* ----------------------------------------------- */
+ dims[0] = abs(match[1]);
+ dims[1] = abs(match[2]);
+
+--- a/frmts/iso8211/ddfrecord.cpp
++++ b/frmts/iso8211/ddfrecord.cpp
+@@ -738,7 +738,7 @@ int DDFRecord::GetIntSubfield( const cha
+ /* -------------------------------------------------------------------- */
+ /* Return the extracted value. */
+ /* */
+-/* Assume an error has occured if no bytes are consumed. */
++/* Assume an error has occurred if no bytes are consumed. */
+ /* -------------------------------------------------------------------- */
+ int nConsumedBytes = 0;
+ int nResult = poSFDefn->ExtractIntData( pachData, nBytesRemaining,
+--- a/frmts/raw/envidataset.cpp
++++ b/frmts/raw/envidataset.cpp
+@@ -2300,7 +2300,7 @@ GDALDataset *ENVIDataset::Open( GDALOpen
+ {
+ delete poDS;
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Int overflow occured.");
++ "Int overflow occurred.");
+ return NULL;
+ }
+
+--- a/frmts/raw/genbindataset.cpp
++++ b/frmts/raw/genbindataset.cpp
+@@ -806,7 +806,7 @@ GDALDataset *GenBinDataset::Open( GDALOp
+ {
+ delete poDS;
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Int overflow occured.");
++ "Int overflow occurred.");
+ return NULL;
+ }
+
+--- a/frmts/raw/lcpdataset.cpp
++++ b/frmts/raw/lcpdataset.cpp
+@@ -297,7 +297,7 @@ GDALDataset *LCPDataset::Open( GDALOpenI
+
+ if (nWidth > INT_MAX / iPixelSize)
+ {
+- CPLError( CE_Failure, CPLE_AppDefined, "Int overflow occured");
++ CPLError( CE_Failure, CPLE_AppDefined, "Int overflow occurred");
+ delete poDS;
+ return NULL;
+ }
+--- a/frmts/raw/mffdataset.cpp
++++ b/frmts/raw/mffdataset.cpp
+@@ -961,7 +961,7 @@ GDALDataset *MFFDataset::Open( GDALOpenI
+ {
+ if (poDS->GetRasterXSize() > INT_MAX / nPixelOffset)
+ {
+- CPLError( CE_Warning, CPLE_AppDefined, "Int overflow occured... skipping");
++ CPLError( CE_Warning, CPLE_AppDefined, "Int overflow occurred... skipping");
+ nSkipped++;
+ VSIFCloseL(fpRaw);
+ continue;
+--- a/frmts/raw/pnmdataset.cpp
++++ b/frmts/raw/pnmdataset.cpp
+@@ -258,7 +258,7 @@ GDALDataset *PNMDataset::Open( GDALOpenI
+ if (nWidth > INT_MAX / iPixelSize)
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Int overflow occured.");
++ "Int overflow occurred.");
+ delete poDS;
+ return NULL;
+ }
+@@ -272,7 +272,7 @@ GDALDataset *PNMDataset::Open( GDALOpenI
+ if (nWidth > INT_MAX / (3 * iPixelSize))
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Int overflow occured.");
++ "Int overflow occurred.");
+ delete poDS;
+ return NULL;
+ }
+--- a/frmts/rmf/rmflzw.cpp
++++ b/frmts/rmf/rmflzw.cpp
+@@ -92,7 +92,7 @@ static void LZWUpdateTab(LZWStringTab *p
+ nNext = nLocal;
+ else
+ {
+- // If collision has occured
++ // If collision has occurred
+ while ( (nNext = poCodeTab[nLocal].iNext) != 0 )
+ nLocal = nNext;
+
+--- a/frmts/sdts/sdtspolygonreader.cpp
++++ b/frmts/sdts/sdtspolygonreader.cpp
+@@ -209,7 +209,7 @@ void SDTSRawPolygon::AddEdgeToRing( int
+ * direction of rings.
+ *
+ * @return TRUE if all rings assembled without problems or FALSE if a problem
+- * occured. If a problem occurs rings are still formed from all lines, but
++ * occurred. If a problem occurs rings are still formed from all lines, but
+ * some of the rings will not be closed, and rings will have no particular
+ * order or direction.
+ */
+--- a/gcore/gdal_misc.cpp
++++ b/gcore/gdal_misc.cpp
+@@ -2758,7 +2758,7 @@ GDALDataset *GDALFindAssociatedAuxFile(
+ /* file. Check that we are the dependent file of the aux */
+ /* file, or if we aren't verify that the dependent file does */
+ /* not exist, likely mean it is us but some sort of renaming */
+-/* has occured. */
++/* has occurred. */
+ /* -------------------------------------------------------------------- */
+ CPLString osJustFile = CPLGetFilename(pszBasename); // without dir
+ CPLString osAuxFilename = CPLResetExtension(pszBasename, pszAuxSuffixLC);
+--- a/gcore/gdaldefaultasync.cpp
++++ b/gcore/gdaldefaultasync.cpp
+@@ -89,7 +89,7 @@ GDALAsyncReader::~GDALAsyncReader()
+ * activity pending.
+ * - GARIO_ERROR: Something has gone wrong. The asynchronous request should
+ * be ended.
+- * - GARIO_COMPLETE: An update has occured and there is no more pending work
++ * - GARIO_COMPLETE: An update has occurred and there is no more pending work
+ * on this request. The request should be ended and the buffer used.
+ *
+ * @param dfTimeout the number of seconds to wait for additional updates. Use
+--- a/gcore/gdalrasterband.cpp
++++ b/gcore/gdalrasterband.cpp
+@@ -202,7 +202,7 @@ CPLErr GDALRasterBand::RasterIO( GDALRWF
+ if( eRWFlag == GF_Write && eFlushBlockErr != CE_None )
+ {
+ ReportError(eFlushBlockErr, CPLE_AppDefined,
+- "An error occured while writing a dirty block");
++ "An error occurred while writing a dirty block");
+ CPLErr eErr = eFlushBlockErr;
+ eFlushBlockErr = CE_None;
+ return eErr;
+@@ -521,7 +521,7 @@ CPLErr GDALRasterBand::WriteBlock( int n
+ if( eFlushBlockErr != CE_None )
+ {
+ ReportError(eFlushBlockErr, CPLE_AppDefined,
+- "An error occured while writing a dirty block");
++ "An error occurred while writing a dirty block");
+ CPLErr eErr = eFlushBlockErr;
+ eFlushBlockErr = CE_None;
+ return eErr;
+@@ -855,7 +855,7 @@ CPLErr GDALRasterBand::FlushCache()
+ if (eFlushBlockErr != CE_None)
+ {
+ ReportError(eFlushBlockErr, CPLE_AppDefined,
+- "An error occured while writing a dirty block");
++ "An error occurred while writing a dirty block");
+ eFlushBlockErr = CE_None;
+ }
+
+@@ -4901,9 +4901,9 @@ unsigned char* GDALRasterBand::GetIndexC
+ /************************************************************************/
+
+ /**
+- * \brief Store that an error occured while writing a dirty block.
++ * \brief Store that an error occurred while writing a dirty block.
+ *
+- * This function stores the fact that an error occured while writing a dirty
++ * This function stores the fact that an error occurred while writing a dirty
+ * block from GDALRasterBlock::FlushCacheBlock(). Indeed when dirty blocks are
+ * flushed when the block cache get full, it is not convenient/possible to
+ * report that a dirty block could not be written correctly. This function
+--- a/gcore/overview.cpp
++++ b/gcore/overview.cpp
+@@ -1630,9 +1630,9 @@ GDALRegenerateOverviews( GDALRasterBandH
+ /* amount of computation. */
+ /* -------------------------------------------------------------------- */
+
+- /* In case the mask made be computed from another band of the dataset, */
++ /* In case the mask made be computed from another band of the dataset, */
+ /* we can't use cascaded generation, as the computation of the overviews */
+- /* of the band used for the mask band may not have yet occured (#3033) */
++ /* of the band used for the mask band may not have yet occurred (#3033) */
+ if( (EQUALN(pszResampling,"AVER",4) || EQUALN(pszResampling,"GAUSS",5)) && nOverviewCount > 1
+ && !(bUseNoDataMask && nMaskFlags != GMF_NODATA))
+ return GDALRegenerateCascadingOverviews( poSrcBand,
+--- a/gcore/rasterio.cpp
++++ b/gcore/rasterio.cpp
+@@ -74,7 +74,7 @@ CPLErr GDALRasterBand::IRasterIO( GDALRW
+ if( eRWFlag == GF_Write && eFlushBlockErr != CE_None )
+ {
+ CPLError(eFlushBlockErr, CPLE_AppDefined,
+- "An error occured while writing a dirty block");
++ "An error occurred while writing a dirty block");
+ CPLErr eErr = eFlushBlockErr;
+ eFlushBlockErr = CE_None;
+ return eErr;
+--- a/ogr/ogr_srsnode.cpp
++++ b/ogr/ogr_srsnode.cpp
+@@ -770,7 +770,7 @@ void OGR_SRSNode::MakeValueSafe()
+ * argument.
+ *
+ * @return returns OGRERR_NONE unless something bad happens. There is no
+- * indication returned about whether any replacement occured.
++ * indication returned about whether any replacement occurred.
+ */
+
+ OGRErr OGR_SRSNode::applyRemapper( const char *pszNode,
+--- a/ogr/ogrgeometry.cpp
++++ b/ogr/ogrgeometry.cpp
+@@ -3660,7 +3660,7 @@ int OGR_G_Centroid( OGRGeometryH hGeom,
+ *
+ * @param hGeom the geometry to operate on.
+ * @return a point guaranteed to lie on the surface or NULL if an error
+- * occured.
++ * occurred.
+ *
+ * @since OGR 1.10
+ */
+--- a/ogr/ogrsf_frmts/bna/ogrbnaparser.cpp
++++ b/ogr/ogrsf_frmts/bna/ogrbnaparser.cpp
+@@ -121,7 +121,7 @@ and http://64.145.236.125/forum/topic.as
+ /* We allow that couples of coordinates on the same line may be separated only by spaces */
+ /* (instead of being separated by a comma) */
+
+-#define STRING_NOT_TERMINATED "string not terminated when end of line occured"
++#define STRING_NOT_TERMINATED "string not terminated when end of line occurred"
+ #define MISSING_FIELDS "missing fields"
+ #define BAD_INTEGER_NUMBER_FORMAT "bad integer number format"
+ #define BAD_FLOAT_NUMBER_FORMAT "bad float number format"
+--- a/ogr/ogrsf_frmts/ntf/ntfrecord.cpp
++++ b/ogr/ogrsf_frmts/ntf/ntfrecord.cpp
+@@ -170,7 +170,7 @@ int NTFRecord::ReadPhysicalLine( FILE *f
+ else
+ {
+ CPLError( CE_Failure, CPLE_AppDefined,
+- "Low level read error occured while reading NTF file." );
++ "Low level read error occurred while reading NTF file." );
+ return -2;
+ }
+ }
+--- a/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
++++ b/ogr/ogrsf_frmts/openfilegdb/filegdbtable.cpp
+@@ -56,7 +56,7 @@ namespace OpenFileGDB
+
+ void FileGDBTablePrintError(const char* pszFile, int nLineNumber)
+ {
+- CPLError(CE_Failure, CPLE_AppDefined, "Error occured in %s at line %d",
++ CPLError(CE_Failure, CPLE_AppDefined, "Error occurred in %s at line %d",
+ pszFile, nLineNumber);
+ }
+
+--- a/ogr/ogrsf_frmts/osm/gpb.h
++++ b/ogr/ogrsf_frmts/osm/gpb.h
+@@ -41,7 +41,7 @@
+ #ifdef DEBUG_GPB_ERRORS
+ static void error_occured(int nLine)
+ {
+- CPLError(CE_Failure, CPLE_AppDefined, "Parsing error occured at line %d", nLine);
++ CPLError(CE_Failure, CPLE_AppDefined, "Parsing error occurred at line %d", nLine);
+ }
+
+ #define GOTO_END_ERROR do { error_occured(__LINE__); goto end_error; } while(0)
+--- a/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
++++ b/ogr/ogrsf_frmts/osm/ogrosmdatasource.cpp
+@@ -3607,7 +3607,7 @@ int OGROSMDataSource::ParseNextChunk(int
+ else
+ {
+ CPLError(CE_Failure, CPLE_AppDefined,
+- "An error occured during the parsing of data around byte " CPL_FRMT_GUIB,
++ "An error occurred during the parsing of data around byte " CPL_FRMT_GUIB,
+ OSM_GetBytesRead(psParser));
+
+ bStopParsing = TRUE;
+--- a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
++++ b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
+@@ -2388,7 +2388,7 @@ OGRLayer * OGRPGDataSource::ExecuteSQL(
+ }
+
+ /* -------------------------------------------------------------------- */
+-/* Generate an error report if an error occured. */
++/* Generate an error report if an error occurred. */
+ /* -------------------------------------------------------------------- */
+ if( !hResult ||
+ (PQresultStatus(hResult) == PGRES_NONFATAL_ERROR
+--- a/ogr/ogrsf_frmts/pg/ogrpgutility.cpp
++++ b/ogr/ogrsf_frmts/pg/ogrpgutility.cpp
+@@ -79,7 +79,7 @@ PGresult *OGRPG_PQexec(PGconn *conn, con
+ CPLDebug("PG", "PQexecParams(%s) = %s%s", query, pszRetCode, szNTuples);
+
+ /* -------------------------------------------------------------------- */
+-/* Generate an error report if an error occured. */
++/* Generate an error report if an error occurred. */
+ /* -------------------------------------------------------------------- */
+ if ( !hResult || (PQresultStatus(hResult) == PGRES_NONFATAL_ERROR ||
+ PQresultStatus(hResult) == PGRES_FATAL_ERROR ) )
+--- a/ogr/ogrsf_frmts/shape/shape2ogr.cpp
++++ b/ogr/ogrsf_frmts/shape/shape2ogr.cpp
+@@ -1336,7 +1336,7 @@ OGRErr SHPWriteOGRFeature( SHPHandle hSH
+ if( nCounter <= 10 )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "Value %.18g of field %s with 0 decimal of feature %ld is bigger than 2^53. Precision loss likely occured or going to happen.%s",
++ "Value %.18g of field %s with 0 decimal of feature %ld is bigger than 2^53. Precision loss likely occurred or going to happen.%s",
+ dfVal, poFieldDefn->GetNameRef(), poFeature->GetFID(),
+ (nCounter == 10) ? " This warning will not be emitted anymore." : "");
+ nCounter ++;
+--- a/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
++++ b/ogr/ogrsf_frmts/sqlite/ogrsqliteexecutesql.cpp
+@@ -645,7 +645,7 @@ CPL_UNUSED
+ if( rc != SQLITE_OK )
+ {
+ CPLDebug("SQLITE",
+- "Error occured during spatial index creation : %s",
++ "Error occurred during spatial index creation : %s",
+ sqlite3_errmsg(hDB));
+ }
+ #else // ENABLE_VIRTUAL_OGR_SPATIAL_INDEX
+@@ -701,7 +701,7 @@ CPL_UNUSED
+ else
+ {
+ CPLDebug("SQLITE",
+- "Error occured during spatial index creation : %s",
++ "Error occurred during spatial index creation : %s",
+ sqlite3_errmsg(hDB));
+ rc = sqlite3_exec( hDB, "ROLLBACK", NULL, NULL, NULL );
+ }
+--- a/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp
++++ b/ogr/ogrsf_frmts/tiger/tigercompletechain.cpp
+@@ -488,7 +488,7 @@ int TigerCompleteChain::AddShapePoints(
+
+ nShapeRecId = GetShapeRecordId( nRecordId, nTLID );
+
+- // -2 means an error occured.
++ // -2 means an error occurred.
+ if( nShapeRecId == -2 )
+ return FALSE;
+
+--- a/ogr/osr_cs_wkt.c
++++ b/ogr/osr_cs_wkt.c
+@@ -47,7 +47,7 @@ void osr_cs_wkt_error( osr_cs_wkt_parse_
+ int i, n;
+ char* szPtr;
+ sprintf(context->szErrorMsg,
+- "Parsing error : %s. Error occured around:\n", msg );
++ "Parsing error : %s. Error occurred around:\n", msg );
+ n = context->pszLastSuccess - context->pszInput;
+
+ szPtr = context->szErrorMsg + strlen(context->szErrorMsg);
+--- a/ogr/swq.cpp
++++ b/ogr/swq.cpp
+@@ -36,7 +36,7 @@
+ void swqerror( swq_parse_context *context, const char *msg )
+ {
+ CPLString osMsg;
+- osMsg.Printf( "SQL Expression Parsing Error: %s. Occured around :\n", msg );
++ osMsg.Printf( "SQL Expression Parsing Error: %s. Occurred around :\n", msg );
+
+ int i;
+ int n = context->pszLastValid - context->pszInput;
+--- a/port/cpl_error.cpp
++++ b/port/cpl_error.cpp
+@@ -134,7 +134,7 @@ void* CPL_STDCALL CPLGetErrorHandlerUser
+ * The eErrClass argument can have the value CE_Warning indicating that the
+ * message is an informational warning, CE_Failure indicating that the
+ * action failed, but that normal recover mechanisms will be used or
+- * CE_Fatal meaning that a fatal error has occured, and that CPLError()
++ * CE_Fatal meaning that a fatal error has occurred, and that CPLError()
+ * should not return.
+ *
+ * The default behaviour of CPLError() is to report errors to stderr,
+--- a/port/cpl_odbc.cpp
++++ b/port/cpl_odbc.cpp
+@@ -761,7 +761,7 @@ short CPLODBCStatement::GetColNullable(
+ * be considered reliable on all drivers.
+ *
+ * Currently it isn't clear how to determine whether an error or a normal
+- * out of data condition has occured if Fetch() fails.
++ * out of data condition has occurred if Fetch() fails.
+ *
+ * @param nOrientation One of SQL_FETCH_NEXT, SQL_FETCH_LAST, SQL_FETCH_PRIOR,
+ * SQL_FETCH_ABSOLUTE, or SQL_FETCH_RELATIVE (default is SQL_FETCH_NEXT).
+--- a/port/cpl_spawn.cpp
++++ b/port/cpl_spawn.cpp
+@@ -119,7 +119,7 @@ int CPLSpawn(const char * const papszArg
+ GByte* pData = VSIGetMemFileBuffer(osName.c_str(), &nDataLength, TRUE);
+ if( nDataLength > 0 )
+ pData[nDataLength-1] = '\0';
+- if( pData && strstr((const char*)pData, "An error occured while forking process") != NULL )
++ if( pData && strstr((const char*)pData, "An error occurred while forking process") != NULL )
+ bDisplayErr = TRUE;
+ if( pData && bDisplayErr )
+ CPLError(CE_Failure, CPLE_AppDefined, "[%s error] %s", papszArgv[0], pData);
+--- a/port/cpl_string.cpp
++++ b/port/cpl_string.cpp
+@@ -1142,7 +1142,7 @@ const char *CSLFetchNameValue(char **pap
+ * @param papszStrList the string list to search.
+ * @param pszName the key value to look for (case insensitive).
+ *
+- * @return -1 on failure or the list index of the first occurance
++ * @return -1 on failure or the list index of the first occurrence
+ * matching the given key.
+ */
+
+@@ -2083,7 +2083,7 @@ CPLValueType CPLGetValueType(const char*
+ \verbatim
+ char szDest[5];
+ if (CPLStrlcpy(szDest, "abcde", sizeof(szDest)) >= sizeof(szDest))
+- fprintf(stderr, "truncation occured !\n");
++ fprintf(stderr, "truncation occurred !\n");
+ \endverbatim
+
+ * @param pszDest destination buffer
+@@ -2135,7 +2135,7 @@ size_t CPLStrlcpy(char* pszDest, const c
+ char szDest[5];
+ CPLStrlcpy(szDest, "ab", sizeof(szDest));
+ if (CPLStrlcat(szDest, "cde", sizeof(szDest)) >= sizeof(szDest))
+- fprintf(stderr, "truncation occured !\n");
++ fprintf(stderr, "truncation occurred !\n");
+ \endverbatim
+
+ * @param pszDest destination buffer. Must be NUL terminated before running CPLStrlcat
+--- a/port/cpl_virtualmem.cpp
++++ b/port/cpl_virtualmem.cpp
+@@ -66,7 +66,7 @@
+ - mremap() with 5 args is Linux specific. It is used when the user callback is invited
+ to fill a page, we currently mmap() a writable page, let it filled it,
+ and afterwards mremap() that temporary page onto the location where the
+- fault occured.
++ fault occurred.
+ If we have no mremap(), the workaround is to pause other threads that
+ consume the current view while we are updating the faulted page, otherwise
+ a non-paused thread could access a page that is in the middle of being
+--- a/port/cpl_vsil.cpp
++++ b/port/cpl_vsil.cpp
+@@ -750,7 +750,7 @@ size_t VSIFWriteL( const void *pBuffer,
+ /**
+ * \brief Test for end of file.
+ *
+- * Returns TRUE (non-zero) if an end-of-file condition occured during the
++ * Returns TRUE (non-zero) if an end-of-file condition occurred during the
+ * previous read operation. The end-of-file flag is cleared by a successfull
+ * VSIFSeekL() call.
+ *
+--- a/swig/csharp/gdal/gdal_wrap.cpp
++++ b/swig/csharp/gdal/gdal_wrap.cpp
+@@ -708,7 +708,7 @@ void GDAL_GCP_set_Id( GDAL_GCP *gcp, con
+
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeDatasetRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nBands, int* bandMap, int nBandMapArrayLength,
+@@ -966,7 +966,7 @@ int GDALDatasetShadow_RasterCount_get( G
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeBandRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nPixelSpace, int nLineSpace,
+--- a/swig/include/Band.i
++++ b/swig/include/Band.i
+@@ -36,7 +36,7 @@
+
+
+ %{
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeBandRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nPixelSpace, int nLineSpace,
+--- a/swig/include/Dataset.i
++++ b/swig/include/Dataset.i
+@@ -29,7 +29,7 @@
+ *****************************************************************************/
+
+ %{
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeDatasetRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nBands, int* bandMap, int nBandMapArrayLength,
+--- a/swig/java/javadoc.java
++++ b/swig/java/javadoc.java
+@@ -190,7 +190,7 @@ public class gdal:public static int SetE
+ * The msg_class argument can have the value gdalconst.CE_Warning indicating that the
+ * message is an informational warning, gdalconst.CE_Failure indicating that the
+ * action failed, but that normal recover mechanisms will be used or
+- * CE_Fatal meaning that a fatal error has occured, and that Error()
++ * CE_Fatal meaning that a fatal error has occurred, and that Error()
+ * should not return.
+ * <p>
+ * The default behaviour of Error() is to report errors to stderr,
+--- a/swig/perl/gdal_wrap.cpp
++++ b/swig/perl/gdal_wrap.cpp
+@@ -2259,7 +2259,7 @@ CreateArrayFromDoubleArray( double *firs
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeDatasetRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nBands, int* bandMap, int nBandMapArrayLength,
+@@ -2607,7 +2607,7 @@ int GDALDatasetShadow_RasterCount_get( G
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeBandRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nPixelSpace, int nLineSpace,
+--- a/swig/php/gdal_wrap.cpp
++++ b/swig/php/gdal_wrap.cpp
+@@ -1438,7 +1438,7 @@ t_output_helper( zval **target, zval *o)
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeDatasetRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nBands, int* bandMap, int nBandMapArrayLength,
+@@ -1784,7 +1784,7 @@ int GDALDatasetShadow_RasterCount_get( G
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeBandRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nPixelSpace, int nLineSpace,
+--- a/swig/python/extensions/gdal_wrap.cpp
++++ b/swig/python/extensions/gdal_wrap.cpp
+@@ -3843,7 +3843,7 @@ SWIGINTERN void CPLVirtualMemShadow_Pin(
+ CPLVirtualMemPin(self->vmem, start_addr, nsize, bWriteOp);
+ }
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeDatasetRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nBands, int* bandMap, int nBandMapArrayLength,
+@@ -4364,7 +4364,7 @@ int GDALDatasetShadow_RasterCount_get( G
+ }
+
+
+-/* Returned size is in bytes or 0 if an error occured */
++/* Returned size is in bytes or 0 if an error occurred */
+ static
+ GIntBig ComputeBandRasterIOSize (int buf_xsize, int buf_ysize, int nPixelSize,
+ int nPixelSpace, int nLineSpace,
+--- a/swig/python/samples/ogr_layer_algebra.py
++++ b/swig/python/samples/ogr_layer_algebra.py
+@@ -430,7 +430,7 @@ def main(argv = None):
+ output_ds = None
+
+ if ret != 0:
+- print('An error occured during %s operation' % op_str)
++ print('An error occurred during %s operation' % op_str)
+ return 1
+
+ return 0
+--- a/swig/python/samples/ogrupdate.py
++++ b/swig/python/samples/ogrupdate.py
+@@ -437,7 +437,7 @@ def ogrupdate_process(src_layer, dst_lay
+ if ret != 0:
+ if not skip_failures:
+ if gdal.GetLastErrorMsg() == '':
+- print('An error occured during feature insertion/update. Interrupting processing.')
++ print('An error occurred during feature insertion/update. Interrupting processing.')
+ ret = 1
+ break
+ else:
+--- a/frmts/grib/degrib18/degrib/grib1tab.cpp
++++ b/frmts/grib/degrib18/degrib/grib1tab.cpp
+@@ -8114,14 +8114,14 @@ GRIB1ParmTable parm_table_afwa_010[256]
+ /* 147 */ {"MXABH", "Max Absolute Humidity", "g/m^3", UC_NONE},
+ /* 148 */ {"MNABH", "Min Absolute Humidity", "g/m^3", UC_NONE},
+ /* 149 */ {"MNPREC", "Min Precipitation", "mm", UC_NONE},
+- /* 150 */ {"NEWND", "NE Wind Direction Occurance", "%", UC_NONE},
+- /* 151 */ {"EWND", "E Wind Direction Occurance", "%", UC_NONE},
+- /* 152 */ {"SEWND", "SE Wind Direction Occurance", "%", UC_NONE},
+- /* 153 */ {"SWND", "S Wind Direction Occurance", "%", UC_NONE},
+- /* 154 */ {"SWWND", "SW Wind Direction Occurance", "%", UC_NONE},
+- /* 155 */ {"WWND", "W Wind Direction Occurance", "%", UC_NONE},
+- /* 156 */ {"NWWND", "NW Wind Direction Occurance", "%", UC_NONE},
+- /* 157 */ {"NWND", "N Wind Direction Occurance", "%", UC_NONE},
++ /* 150 */ {"NEWND", "NE Wind Direction Occurrence", "%", UC_NONE},
++ /* 151 */ {"EWND", "E Wind Direction Occurrence", "%", UC_NONE},
++ /* 152 */ {"SEWND", "SE Wind Direction Occurrence", "%", UC_NONE},
++ /* 153 */ {"SWND", "S Wind Direction Occurrence", "%", UC_NONE},
++ /* 154 */ {"SWWND", "SW Wind Direction Occurrence", "%", UC_NONE},
++ /* 155 */ {"WWND", "W Wind Direction Occurrence", "%", UC_NONE},
++ /* 156 */ {"NWWND", "NW Wind Direction Occurrence", "%", UC_NONE},
++ /* 157 */ {"NWND", "N Wind Direction Occurrence", "%", UC_NONE},
+ /* 158 */ {"NEWSP", "NE Wind Speed", "m/s", UC_NONE},
+ /* 159 */ {"EWSP", "E Wind Speed", "m/s", UC_NONE},
+ /* 160 */ {"SEWSP", "SE Wind Speed", "m/s", UC_NONE},
+--- a/frmts/iso8211/ddffield.cpp
++++ b/frmts/iso8211/ddffield.cpp
+@@ -208,7 +208,7 @@ int DDFField::GetRepeatCount()
+ return 1;
+
+ /* -------------------------------------------------------------------- */
+-/* The occurance count depends on how many copies of this */
++/* The occurrence count depends on how many copies of this */
+ /* field's list of subfields can fit into the data space. */
+ /* -------------------------------------------------------------------- */
+ if( poDefn->GetFixedWidth() )
+--- a/frmts/iso8211/iso8211.h
++++ b/frmts/iso8211/iso8211.h
+@@ -268,7 +268,7 @@ class CPL_ODLL DDFFieldDefn
+
+ /**
+ * Information from the DDR record describing one subfield of a DDFFieldDefn.
+- * All subfields of a field will occur in each occurance of that field
++ * All subfields of a field will occur in each occurrence of that field
+ * (as a DDFField) in a DDFRecord. Subfield's actually contain formatted
+ * data (as instances within a record).
+ */
+--- a/frmts/nitf/frmt_nitf_advanced.html
++++ b/frmts/nitf/frmt_nitf_advanced.html
+@@ -34,7 +34,7 @@ The SLOC_ROW and SLOC_COL values are the
+ to the base (SALVL) image. The CCS_ROW/COL values are relative to the common
+ coordinate system. The _SDLVL is the display level.
+ The DATA is the raw CGM data with "backslash quotable" escaping
+-applied. All occurances of ASCII zero will be translated to '\0', and all
++applied. All occurrences of ASCII zero will be translated to '\0', and all
+ backslashes and double quotes will be backslashed escaped. The
+ CPLUnescapeString() function can be used to unescape the data into binary
+ format using scheme CPLES_BackslashQuotable. <p>
+--- a/frmts/raw/fastdataset.cpp
++++ b/frmts/raw/fastdataset.cpp
+@@ -847,7 +847,7 @@ GDALDataset *FASTDataset::Open( GDALOpen
+ pszSecond = "GAIN%d";
+ }
+
+- // Now search for the first number occurance after that string
++ // Now search for the first number occurrence after that string
+ for ( i = 1; i <= poDS->nBands; i++ )
+ {
+ char *pszValue = NULL;
+--- a/ogr/ogrsf_frmts/csv/drv_csv.html
++++ b/ogr/ogrsf_frmts/csv/drv_csv.html
+@@ -52,7 +52,7 @@ if there's no other potential separator
+ Otherwise it will default to comma as separator.</p>
+
+ <p>Complex attribute values (such as those containing commas, quotes or newlines)
+-may be placed in double quotes. Any occurances of double quotes within
++may be placed in double quotes. Any occurrences of double quotes within
+ the quoted string should be doubled up to "escape" them.</p>
+
+ <p>The driver attempts to treat the first line of the file as a list of field
+--- a/ogr/wcts/html/install.html
++++ b/ogr/wcts/html/install.html
+@@ -113,7 +113,7 @@ wcts_capabilities.xml.0.1.0. It should
+ the nature of the service being setup. In particular, the ContactInformation
+ should be updated to refer to whoever is setting up the service. Also, all
+ the service URLs all need to be updated to reflect the url for the service
+-as it is being installed. Change each occurance of
++as it is being installed. Change each occurrence of
+ "http://maps.gdal.org/cgi-bin/ogrwcts?to the appropriate value. <p>
+
+ <pre>
+--- a/vb6/README.TXT
++++ b/vb6/README.TXT
+@@ -23,7 +23,7 @@ Quick Test Run
+ 1) VB6 needs to be launched in such a way that it can find the gdal12vb.dll.
+ This could be accomplished by having VB6 run in the same directory as the
+ DLL, or by copying the DLL into windows\system32 or by editing GDALCore.bas
+- and changing all occurances of "gdal12vb.dll" to a full path to the DLL.
++ and changing all occurrences of "gdal12vb.dll" to a full path to the DLL.
+
+ But for the test app to run, you need to have the sample files in the
+ current directory, so you might as well just make a shortcut copy of your
diff --git a/debian/patches/outputting-typo.patch b/debian/patches/outputting-typo.patch
new file mode 100644
index 0000000..28b6e71
--- /dev/null
+++ b/debian/patches/outputting-typo.patch
@@ -0,0 +1,151 @@
+Description: Fix 'outputing' typo, replace with 'outputting'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/NEWS
++++ b/NEWS
+@@ -2163,7 +2163,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
+@@ -2193,7 +2193,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
+
+@@ -2289,7 +2289,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)
+@@ -3493,7 +3493,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
+@@ -832,7 +832,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
+--- a/apps/gdalwarp.cpp
++++ b/apps/gdalwarp.cpp
+@@ -212,7 +212,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
+@@ -1216,7 +1216,7 @@ GDALDataset * AAIGDataset::CreateCopy(
+ /* Re-open dataset, and copy any auxilary 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
+@@ -791,7 +791,7 @@ GIFDataset::CreateCopy( const char * psz
+ /* Re-open dataset, and copy any auxilary 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
+@@ -2976,7 +2976,7 @@ JPGDataset::CreateCopy( const char * psz
+ /* Re-open dataset, and copy any auxilary 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
+@@ -1722,7 +1722,7 @@ PNGDataset::CreateCopy( const char * psz
+ /* Re-open dataset, and copy any auxilary 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
+@@ -1705,7 +1705,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
+@@ -794,7 +794,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
+@@ -1178,7 +1178,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
+@@ -124,7 +124,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:
diff --git a/debian/patches/position-typo.patch b/debian/patches/position-typo.patch
new file mode 100644
index 0000000..95c908d
--- /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
+@@ -503,7 +503,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
+@@ -113,7 +113,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
+@@ -4339,7 +4339,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;
+@@ -5277,7 +5277,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
+@@ -76,7 +76,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..99f3877
--- /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
+@@ -1438,7 +1438,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.
+
+@@ -1461,7 +1461,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
+@@ -21223,7 +21223,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
+@@ -1194,7 +1194,7 @@ class Layer(_object):
+
+ 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..a1626e7
--- /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
+@@ -1600,7 +1600,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 a329723..1963336 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,4 +29,13 @@ hardening
recommanded-typo
perl-vendor
libkml-pkgconfig
+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
sqlite-3.10.0
diff --git a/debian/patches/supported-typo.patch b/debian/patches/supported-typo.patch
new file mode 100644
index 0000000..7b969ba
--- /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
+@@ -6188,7 +6188,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
+@@ -778,7 +778,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
+@@ -49,7 +49,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
+@@ -86,7 +86,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..6c4e454
--- /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
+@@ -13,7 +13,7 @@ The 1.11.3 release is a bug fix release.
+
+ == Algorithms ==
+ * gdal_grid: fix crash in optimized mode with GCC 4.4 on 64bit (#5987)
+- * Fix failure in GDALSuggestedWarpOut2() when computing output image size in case the top-left and bottom-right corners tranform to the same point (#5980)
++ * Fix failure in GDALSuggestedWarpOut2() when computing output image size in case the top-left and bottom-right corners transform to the same point (#5980)
+ * Rasterize: add check to avoid burning negative x values (#5641)
+
+ == GDAL core ==
+--- 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
+@@ -3544,7 +3544,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
+@@ -1391,7 +1391,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