This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental-2.1
in repository gdal.
commit e9f50712b48ac322ee36403e5293f38ae34fa42a
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Jul 3 18:23:45 2016 +0200
Add patch to fix spelling errors.
---
debian/changelog | 1 +
debian/patches/series | 1 +
debian/patches/spelling-errors.patch | 79 ++++++++++++++++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2bddaf7..1ca5739 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ gdal (2.1.1~rc1+dfsg-1) UNRELEASED; urgency=medium
* Fix python3-gdal description, tools only included in python-gdal.
* Drop unused override for old-style-config-script-multiarch-path.
* Drop unused override for spelling-error-in-binary.
+ * Add patch to fix spelling errors.
-- Bas Couwenberg <sebas...@debian.org> Sun, 03 Jul 2016 16:53:09 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 2d184aa..d0d5927 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ java.opt
perl-vendor
privacy-breach-logo.patch
sort-files-in-static-library.patch
+spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch
b/debian/patches/spelling-errors.patch
new file mode 100644
index 0000000..8550d06
--- /dev/null
+++ b/debian/patches/spelling-errors.patch
@@ -0,0 +1,79 @@
+Description: Fix spelling errors.
+ Reseting -> Resetting
+ Overlaping -> Overlapping
+Author: Bas Couwenberg <sebas...@debian.org>
+Forwarded: not-needed
+
+--- a/NEWS
++++ b/NEWS
+@@ -772,7 +772,7 @@ PG driver:
+ * Add PRELUDE_STATEMENTS and CLOSING_STATEMENTS open option to be for
example able to specify options, like statement_timeout, with pg_bouncer
+ * Fix 2.0 regression when overwriting several existing PostGIS layers with
ogr2ogr (#6018)
+ * Update PG, PGDump and CartoDB drivers to correctly export POINT EMPTY for
PostGIS 2.2
+- * avoid reseting error potentially emitted by ExecuteSQL() (#6194)
++ * avoid resetting error potentially emitted by ExecuteSQL() (#6194)
+ * sanitize management of quoting for FID column at layer creation
+ * fix to get SRID on result layer with PostGIS 2.2
+ * in copy mode (the default on layer creation), do not truncate the
concatenated string list to the field width (#6356)
+--- a/ogr/ogrfielddefn.cpp
++++ b/ogr/ogrfielddefn.cpp
+@@ -280,7 +280,7 @@ void OGRFieldDefn::SetType( OGRFieldType
+ if( !OGR_AreTypeSubTypeCompatible(eTypeIn, eSubType) )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "Type and subtype of field definition are not compatible.
Reseting to OFSTNone");
++ "Type and subtype of field definition are not compatible.
Resetting to OFSTNone");
+ eSubType = OFSTNone;
+ }
+ eType = eTypeIn;
+@@ -366,7 +366,7 @@ void OGRFieldDefn::SetSubType( OGRFieldS
+ if( !OGR_AreTypeSubTypeCompatible(eType, eSubTypeIn) )
+ {
+ CPLError(CE_Warning, CPLE_AppDefined,
+- "Type and subtype of field definition are not compatible.
Reseting to OFSTNone");
++ "Type and subtype of field definition are not compatible.
Resetting to OFSTNone");
+ eSubType = OFSTNone;
+ }
+ else
+--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
++++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesdataset.cpp
+@@ -441,7 +441,7 @@ GDALDataset* OGRPLScenesDataset::OpenRas
+
+ CPLErrorReset();
+ poOutDS->SetDescription(poOpenInfo->pszFilename);
+- CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary
files before reseting the allowed extensions */
++ CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary
files before resetting the allowed extensions */
+ }
+
+ if( bUseVSICURL )
+--- a/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
++++ b/ogr/ogrsf_frmts/plscenes/ogrplscenesv1dataset.cpp
+@@ -652,7 +652,7 @@ retry:
+
+ CPLErrorReset();
+ poOutDS->SetDescription(poOpenInfo->pszFilename);
+- CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary
files before reseting the allowed extensions */
++ CSLDestroy(poOutDS->GetFileList()); /* so as to probe all auxiliary
files before resetting the allowed extensions */
+ }
+ else if( CPLGetLastErrorType() == CE_None )
+ {
+--- a/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
++++ b/ogr/ogrsf_frmts/wasp/ogrwasplayer.cpp
+@@ -496,7 +496,7 @@ OGRErr OGRWAsPLayer::WriteRoughness( OGR
+ OGREnvelope oErrorRegion = oZones[i].oEnvelope;
+ oErrorRegion.Intersect( oEnvelope );
+ CPLError(CE_Failure, CPLE_NotSupported,
+- "Overlaping polygons in rectangle (%.16g
%.16g, %.16g %.16g))",
++ "Overlapping polygons in rectangle (%.16g
%.16g, %.16g %.16g))",
+ oErrorRegion.MinX,
+ oErrorRegion.MinY,
+ oErrorRegion.MaxX,
+@@ -516,7 +516,7 @@ OGRErr OGRWAsPLayer::WriteRoughness( OGR
+ OGREnvelope oErrorRegion = oZones[i].oEnvelope;
+ oErrorRegion.Intersect( oEnvelope );
+ CPLError(CE_Failure, CPLE_NotSupported,
+- "Overlaping polygons in rectangle (%.16g
%.16g, %.16g %.16g))",
++ "Overlapping polygons in rectangle (%.16g
%.16g, %.16g %.16g))",
+ oErrorRegion.MinX,
+ oErrorRegion.MinY,
+ oErrorRegion.MaxX,
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/gdal.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
