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

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

commit a3dfe53fe4185b552cdec358edab849686105cb9
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Tue Aug 18 23:05:07 2015 +0200

    Add patch to fix 'existent' typo.
---
 debian/changelog                   |   1 +
 debian/libgdal20.lintian-overrides |   4 ++
 debian/patches/existant-typo       | 110 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |   1 +
 4 files changed, 116 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6227c20..f9f539e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ gdal (2.0.0+dfsg-1) UNRELEASED; urgency=medium
     Breaks/Replaces.
   * Change virtual package from libgdal.so.1-<major>.<minor>.<patch> format
     to gdal-abi-<major>-<minor>-<patch> format.
+  * Add patch to fix 'existent' typo.
 
  -- Bas Couwenberg <sebas...@debian.org>  Fri, 19 Jun 2015 00:17:11 +0200
 
diff --git a/debian/libgdal20.lintian-overrides 
b/debian/libgdal20.lintian-overrides
index d1cbab6..4ce6589 100644
--- a/debian/libgdal20.lintian-overrides
+++ b/debian/libgdal20.lintian-overrides
@@ -1,2 +1,6 @@
 # False positive on: {136, "Socialist Republic of Viet Nam"},
 libgdal20: spelling-error-in-binary * Nam Name
+
+# False positive on: DontUseExceptions
+libgdal20: spelling-error-in-binary * Dont Don't
+
diff --git a/debian/patches/existant-typo b/debian/patches/existant-typo
new file mode 100644
index 0000000..dbee0e2
--- /dev/null
+++ b/debian/patches/existant-typo
@@ -0,0 +1,110 @@
+Description: Fix 'existant' typo, replace with 'existent'.
+Author: Bas Couwenberg <sebas...@debian.org>
+
+--- a/frmts/envisat/EnvisatFile.c
++++ b/frmts/envisat/EnvisatFile.c
+@@ -1387,7 +1387,7 @@ int EnvisatFile_ReadDatasetChunk( Envisa
+ {
+     if( ds_index < 0 || ds_index >= self->ds_count )
+     {
+-        SendError( "Attempt to read non-existant dataset in "
++        SendError( "Attempt to read non-existent dataset in "
+                    "EnvisatFile_ReadDatasetChunk()" );
+         return FAILURE;
+     }
+@@ -1452,7 +1452,7 @@ int EnvisatFile_WriteDatasetRecord( Envi
+ 
+     if( ds_index < 0 || ds_index >= self->ds_count )
+     {
+-        SendError( "Attempt to write non-existant dataset in "
++        SendError( "Attempt to write non-existent dataset in "
+                    "EnvisatFile_WriteDatasetRecord()" );
+         return FAILURE;
+     }
+@@ -1569,7 +1569,7 @@ int EnvisatFile_ReadDatasetRecordChunk(
+ 
+     if( ds_index < 0 || ds_index >= self->ds_count )
+     {
+-        SendError( "Attempt to read non-existant dataset in "
++        SendError( "Attempt to read non-existent dataset in "
+                    "EnvisatFile_ReadDatasetRecordChunk()" );
+         return FAILURE;
+     }
+--- a/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
++++ b/frmts/pcidsk/sdk/channel/cpcidskchannel.cpp
+@@ -200,7 +200,7 @@ PCIDSKChannel *CPCIDSKChannel::GetOvervi
+     EstablishOverviewInfo();
+ 
+     if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
+-        ThrowPCIDSKException( "Non existant overview (%d) requested.", 
++        ThrowPCIDSKException( "Non existent overview (%d) requested.", 
+                               overview_index );
+ 
+     if( overview_bands[overview_index] == NULL )
+@@ -231,7 +231,7 @@ bool CPCIDSKChannel::IsOverviewValid( in
+     EstablishOverviewInfo();
+ 
+     if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
+-        ThrowPCIDSKException( "Non existant overview (%d) requested.", 
++        ThrowPCIDSKException( "Non existent overview (%d) requested.", 
+                               overview_index );
+ 
+     int sis_id, validity=0;
+@@ -252,7 +252,7 @@ std::string CPCIDSKChannel::GetOverviewR
+     EstablishOverviewInfo();
+ 
+     if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
+-        ThrowPCIDSKException( "Non existant overview (%d) requested.", 
++        ThrowPCIDSKException( "Non existent overview (%d) requested.", 
+                               overview_index );
+ 
+     int sis_id, validity=0;
+@@ -275,7 +275,7 @@ void CPCIDSKChannel::SetOverviewValidity
+     EstablishOverviewInfo();
+ 
+     if( overview_index < 0 || overview_index >= (int) overview_infos.size() )
+-        ThrowPCIDSKException( "Non existant overview (%d) requested.", 
++        ThrowPCIDSKException( "Non existent overview (%d) requested.", 
+                               overview_index );
+ 
+     int sis_id, validity=0;
+--- a/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
++++ b/frmts/pcidsk/sdk/channel/ctiledchannel.cpp
+@@ -358,7 +358,7 @@ int CTiledChannel::ReadBlock( int block_
+ 
+     if( block_index < 0 || block_index >= tile_count )
+     {
+-        ThrowPCIDSKException( "Requested non-existant block (%d)", 
++        ThrowPCIDSKException( "Requested non-existent block (%d)", 
+                               block_index );
+     }
+ 
+@@ -516,7 +516,7 @@ int CTiledChannel::WriteBlock( int block
+ 
+     if( block_index < 0 || block_index >= tile_count )
+     {
+-        ThrowPCIDSKException( "Requested non-existant block (%d)", 
++        ThrowPCIDSKException( "Requested non-existent block (%d)", 
+                               block_index );
+     }
+ 
+--- a/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
++++ b/frmts/pcidsk/sdk/segment/cpcidskbitmap.cpp
+@@ -238,7 +238,7 @@ int CPCIDSKBitmap::ReadBlock( int block_
+ 
+     if( block_index < 0 || block_index >= GetBlockCount() )
+     {
+-        ThrowPCIDSKException( "Requested non-existant block (%d)", 
++        ThrowPCIDSKException( "Requested non-existent block (%d)", 
+                               block_index );
+     }
+ /* -------------------------------------------------------------------- */
+@@ -343,7 +343,7 @@ int CPCIDSKBitmap::GetOverviewCount()
+ PCIDSKChannel *CPCIDSKBitmap::GetOverview( CPL_UNUSED int i )
+ {
+     // The %d is ignored in the exception.
+-    ThrowPCIDSKException("Non-existant overview %d requested on bitmap 
segment.");
++    ThrowPCIDSKException("Non-existent overview %d requested on bitmap 
segment.");
+     return NULL;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b73070..9fef244 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ java.opt
 initalize-typo
 hardening
 perl-vendor
+existant-typo

-- 
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

Reply via email to