[stella] 04/06: Update spelling fixes

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository stella.

commit 31cf76b384176b09c654542c31d736412487eacd
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Nov 24 23:04:05 2016 +0100

    Update spelling fixes
---
 debian/changelog                    |  1 +
 debian/lintian-overrides            |  2 ++
 debian/patches/series               |  2 +-
 debian/patches/spelling-fix.patch   | 14 --------
 debian/patches/spelling-fixes.patch | 64 +++++++++++++++++++++++++++++++++++++
 5 files changed, 68 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2d4f238..67ed462 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 stella (4.7.3-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+  * Update spelling fixes.
 
  -- Stephen Kitt <skitt at debian.org>  Thu, 24 Nov 2016 22:48:02 +0100
 
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index f931aa0..9b89983 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -1 +1,3 @@
 stella: spelling-error-in-binary usr/bin/stella Flie File
+stella: spelling-error-in-binary usr/bin/stella Nothern Northern
+stella: spelling-error-in-binary usr/bin/stella Scolling Scrolling
diff --git a/debian/patches/series b/debian/patches/series
index ae6df3e..5259d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-spelling-fix.patch
+spelling-fixes.patch
 evdev-joystick-flags.patch
diff --git a/debian/patches/spelling-fix.patch b/debian/patches/spelling-fix.patch
deleted file mode 100644
index 09bf605..0000000
--- a/debian/patches/spelling-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Spelling fix
-Author: Stephen Kitt <skitt at debian.org>
-
---- a/src/emucore/Settings.cxx
-+++ b/src/emucore/Settings.cxx
-@@ -530,7 +530,7 @@
-       << ";  Format MUST be as follows:" << endl
-       << ";    command = value" << endl
-       << ";" << endl
--      << ";  Commmands are the same as those specified on the commandline," << endl
-+      << ";  Commands are the same as those specified on the commandline," << endl
-       << ";  without the '-' character." << endl
-       << ";" << endl
-       << ";  Values are the same as those allowed on the commandline." << endl
diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch
new file mode 100644
index 0000000..2b38a88
--- /dev/null
+++ b/debian/patches/spelling-fixes.patch
@@ -0,0 +1,64 @@
+Description: Spelling fixes
+Author: Stephen Kitt <skitt at debian.org>
+
+--- a/src/emucore/Settings.cxx
++++ b/src/emucore/Settings.cxx
+@@ -530,7 +530,7 @@
+       << ";  Format MUST be as follows:" << endl
+       << ";    command = value" << endl
+       << ";" << endl
+-      << ";  Commmands are the same as those specified on the commandline," << endl
++      << ";  Commands are the same as those specified on the commandline," << endl
+       << ";  without the '-' character." << endl
+       << ";" << endl
+       << ";  Values are the same as those allowed on the commandline." << endl
+--- a/docs/debugger.html
++++ b/docs/debugger.html
+@@ -939,7 +939,7 @@
+ 
+ <p>The 'Compare' button is used to compare the given value using all
+ addresses currently highlighted.  This may be an absolute number (such as 2),
+-or a comparitive number (such as -1).  Using a '+' or '-' operator
++or a comparative number (such as -1).  Using a '+' or '-' operator
+ means 'search addresses for values that have changed by that amount'.</p>
+ <p>The 'Reset' button resets the entire operation; it clears the highlighted
+ addresses and allows another search.</p>
+--- a/src/debugger/gui/RamWidget.cxx
++++ b/src/debugger/gui/RamWidget.cxx
+@@ -385,11 +385,11 @@
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ string RamWidget::doCompare(const string& str)
+ {
+-  bool comparitiveSearch = false;
++  bool comparativeSearch = false;
+   int searchVal = 0, offset = 0;
+ 
+   if(str.length() == 0)
+-    return "Enter an absolute or comparitive value";
++    return "Enter an absolute or comparative value";
+ 
+   // Do some pre-processing on the string
+   string::size_type pos = str.find_first_of("+-", 0);
+@@ -399,11 +399,11 @@
+     return "Input must be [+|-]NUM";
+   }
+ 
+-  // A comparitive search searches memory for locations that have changed by
++  // A comparative search searches memory for locations that have changed by
+   // the specified amount, vs. for exact values
+   if(str[0] == '+' || str[0] == '-')
+   {
+-    comparitiveSearch = true;
++    comparativeSearch = true;
+     bool negative = false;
+     if(str[0] == '-')
+       negative = true;
+@@ -427,7 +427,7 @@
+ 
+   for(uInt32 i = 0; i < mySearchAddr.size(); ++i)
+   {
+-    if(comparitiveSearch)
++    if(comparativeSearch)
+     {
+       searchVal = mySearchValue[i] + offset;
+       if(searchVal < 0 || searchVal > 255)

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