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

sebastic pushed a commit to branch experimental
in repository gdal.

commit d91f18a60c160e4799e3af48c9d3712806c939db
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/libgdal1i.lintian-overrides |   3 +
 debian/patches/existant-typo       | 110 +++++++++++++++++++++++++++++++++++++
 debian/patches/series              |   1 +
 4 files changed, 115 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 13e7314..a619f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ gdal (1.11.2+dfsg-1~exp5) UNRELEASED; urgency=medium
     - Strip trailing whitespace
     - Use range notation for copyright years
     - Add sbnsearch.c to MIT or LGPL-2+ section
+  * Add patch to fix 'existent' typo.
 
  -- Bas Couwenberg <sebas...@debian.org>  Sun, 28 Jun 2015 23:44:03 +0200
 
diff --git a/debian/libgdal1i.lintian-overrides 
b/debian/libgdal1i.lintian-overrides
index d790885..6e14799 100644
--- a/debian/libgdal1i.lintian-overrides
+++ b/debian/libgdal1i.lintian-overrides
@@ -7,3 +7,6 @@ libgdal1i: embedded-library *: tiff
 # False positive on: {136, "Socialist Republic of Viet Nam"},
 libgdal1i: spelling-error-in-binary * Nam Name
 
+# False positive on: DontUseExceptions
+libgdal1i: 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..860555d
--- /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
+@@ -1386,7 +1386,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;
+     }
+@@ -1451,7 +1451,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;
+     }
+@@ -1568,7 +1568,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
+@@ -359,7 +359,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 );
+     }
+ 
+@@ -517,7 +517,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 391702a..ba0fef6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,3 +28,4 @@ doc-brief
 hardening
 recommanded-typo
 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