[osgearth] 06/08: Drop spelling-errors.patch, applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository osgearth.

commit 128cf665f26fc83b18938d4338e54b4aca2b0241
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 25 07:36:39 2018 +0100

    Drop spelling-errors.patch, applied upstream.
---
 debian/changelog                     |  1 +
 debian/patches/series                |  1 -
 debian/patches/spelling-errors.patch | 29 -----------------------------
 3 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77f9cad..1e88b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osgearth (2.9~rc2+dfsg-1) UNRELEASED; urgency=medium
   * New upstream release candidate.
   * Update Files-Excluded for osgEarth 2.9rc2.
   * Don't explicitly disable FastDXT driver, disabled upstream.
+  * Drop spelling-errors.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 25 Jan 2018 07:34:19 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 653d515..0a55278 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 soversion.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 4c0f678..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix spelling errors.
- * Timout  -> Timeout
- * Argment -> Argument
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/gwaldron/osgearth/pull/1026
-Applied-Upstream: https://github.com/gwaldron/osgearth/commit/e11ae4a7b9a909ca88b3ce48c9be1e2223972a1d
-
---- a/src/osgEarth/ElevationPool.cpp
-+++ b/src/osgEarth/ElevationPool.cpp
-@@ -307,7 +307,7 @@ ElevationPool::getTile(const TileKey& ke
-     if ( !tile.valid() && OE_GET_TIMER(get) >= timeout )
-     {
-         // this means we timed out trying to fetch the map tile.
--        OE_TEST << LC << "Timout fetching tile " << key.str() << std::endl;
-+        OE_TEST << LC << "Timeout fetching tile " << key.str() << std::endl;
-     }
- 
-     if ( tile.valid() )
---- a/src/osgEarth/catch.hpp
-+++ b/src/osgEarth/catch.hpp
-@@ -4751,7 +4751,7 @@ namespace Catch {
-             ss << seed;
-             ss >> config.rngSeed;
-             if( ss.fail() )
--                throw std::runtime_error( "Argment to --rng-seed should be the word 'time' or a number" );
-+                throw std::runtime_error( "Argument to --rng-seed should be the word 'time' or a number" );
-         }
-     }
-     inline void setVerbosity( ConfigData& config, int level ) {

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