[ossim] 01/02: Update spelling-errors.patch to fix 'directories' typo.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository ossim.

commit a6020b657d50890188f8cf8d40c4ce04dfa4f7c3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Oct 26 12:07:40 2016 +0200

    Update spelling-errors.patch to fix 'directories' typo.
---
 debian/changelog                        |  1 +
 debian/libossim1.lintian-overrides      |  3 +++
 debian/patches/fix-ossim-trac-2354.diff |  5 ++---
 debian/patches/series                   |  2 +-
 debian/patches/spelling-errors.patch    | 33 +++++++++++++++++++++++++++------
 5 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ca9c363..ccf5fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ossim (1.8.20.3+ds-6) UNRELEASED; urgency=medium
 
   * Team upload.
   * Change libcurl4-dev alternative to libcurl-ssl-dev.
+  * Update spelling-errors.patch to fix 'directories' typo.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 30 Aug 2016 13:20:14 +0200
 
diff --git a/debian/libossim1.lintian-overrides b/debian/libossim1.lintian-overrides
index ad8c459..1acb5e1 100644
--- a/debian/libossim1.lintian-overrides
+++ b/debian/libossim1.lintian-overrides
@@ -5,3 +5,6 @@ libossim1: no-symbols-control-file usr/lib/libossim.so.*
 libossim1: spelling-error-in-binary usr/lib/libossim.so.* PROCES PROCESS
 libossim1: spelling-error-in-binary usr/lib/libossim.so.* CONTROLL CONTROL
 
+# False positive: fieldDefn->FindSubfieldDefn("NAM");
+libossim1: spelling-error-in-binary usr/lib/libossim.so.* nam name
+
diff --git a/debian/patches/fix-ossim-trac-2354.diff b/debian/patches/fix-ossim-trac-2354.diff
index eb7e32b..b24dd82 100644
--- a/debian/patches/fix-ossim-trac-2354.diff
+++ b/debian/patches/fix-ossim-trac-2354.diff
@@ -6,7 +6,7 @@ Bug: https://trac.osgeo.org/ossim/ticket/2354
 
 --- a/ossim/src/ossim/elevation/ossimElevManager.cpp
 +++ b/ossim/src/ossim/elevation/ossimElevManager.cpp
-@@ -643,14 +643,26 @@
+@@ -643,14 +643,26 @@ std::ostream& ossimElevManager::print(os
           << "\nm_useGeoidIfNullFlag = "<<m_useGeoidIfNullFlag
           << "\nm_currentDatabaseIdx = "<<m_currentDatabaseIdx
           << "\nm_dbRoundRobin.size = "<<m_dbRoundRobin.size();
@@ -35,10 +35,9 @@ Bug: https://trac.osgeo.org/ossim/ticket/2354
  }
  
  
-diff -burN diff/ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp ossim-1.8.20-3/ossim/src/ossim/elevation/ossimElevSource.cpp
 --- a/ossim/src/ossim/elevation/ossimElevSource.cpp
 +++ b/ossim/src/ossim/elevation/ossimElevSource.cpp
-@@ -269,8 +269,9 @@
+@@ -269,8 +269,9 @@ std::ostream& ossimElevSource::print(std
           << "\ntheMaxHeightAboveMSL = "<<theMaxHeightAboveMSL
           << "\ntheNullHeightValue = "<<theNullHeightValue
           << "\ntheSeaLevelValue = "<<theSeaLevelValue
diff --git a/debian/patches/series b/debian/patches/series
index 8defd13..1b20f13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,6 @@ message-typo.patch
 output-typo.patch
 accommodate-typo.patch
 extension-typo.patch
-spelling-errors.patch
 fix-ossim-trac-2354.diff
 requested-typo.patch
+spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
index a877c0a..41830ed 100644
--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
@@ -1,10 +1,11 @@
 Description: Fix spelling errors.
- Ammount     -> Amount
- Defualt     -> Default
- repaced     -> replaced
- availabe    -> available
- returing    -> returning
- initilizing -> initializing
+ * Ammount     -> Amount
+ * Defualt     -> Default
+ * repaced     -> replaced
+ * availabe    -> available
+ * returing    -> returning
+ * initilizing -> initializing
+ * direcories  -> directories
 Author: Bas Couwenberg <sebastic at debian.org>
 
 --- a/ossim/src/apps/ossim-pixelflip/ossim-pixelflip.cpp
@@ -73,3 +74,23 @@ Author: Bas Couwenberg <sebastic at debian.org>
        }
     }
     if(traceDebug())
+--- a/ossim/src/ossim/support_data/ossimTiffInfo.cpp
++++ b/ossim/src/ossim/support_data/ossimTiffInfo.cpp
+@@ -318,7 +318,7 @@ std::ostream& ossimTiffInfo::print(std::
+          if(traceDebug())
+          {
+             ossimNotify(ossimNotifyLevel_WARN)
+-               << MODULE << " FATAL error reading number of direcories."
++               << MODULE << " FATAL error reading number of directories."
+                << std::endl;
+          }
+          str.close();
+@@ -743,7 +743,7 @@ std::ostream& ossimTiffInfo::print(std::
+          if(traceDebug())
+          {
+             ossimNotify(ossimNotifyLevel_WARN)
+-               << MODULE << " FATAL error reading number of direcories."
++               << MODULE << " FATAL error reading number of directories."
+                << std::endl;
+          }
+          return outStr;

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