[pkg-fgfs-crew] [flightgear] 01/01: * Remove spelling.diff again after discussion with upstream.

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository flightgear.

commit 6620e2411f7e83e91f0a15ab3f8f3b8c7151aa61
Author: Markus Wanner <markus at bluegap.ch>
Date:   Mon Sep 23 22:19:46 2013 +0200

    * Remove spelling.diff again after discussion with upstream.
---
 debian/changelog             |    1 -
 debian/patches/series        |    1 -
 debian/patches/spelling.diff |   89 ------------------------------------------
 3 files changed, 91 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fe74b23..a5937aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ flightgear (2.12.0-1) UNRELEASED; urgency=low
   * Adjust dependencies on simgear and flightgear-data for 2.12.
   * Drop patches terrasync.patch, CVE-2012-2090.diff, CVE-2013-2091.diff,
     and bug1117.diff. These got applied upstream.
-  * Add spelling.diff to fix 'compatability' vs 'compatibility'.
 
  --
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 34abff9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling.diff
diff --git a/debian/patches/spelling.diff b/debian/patches/spelling.diff
deleted file mode 100644
index 9f94194..0000000
--- a/debian/patches/spelling.diff
+++ /dev/null
@@ -1,89 +0,0 @@
---- a/package/debian/rules
-+++ b/package/debian/rules
-@@ -5,7 +5,7 @@
- # Uncomment this to turn on verbose mode.
- #export DH_VERBOSE=1
- 
--# This is the debhelper compatability version to use.
-+# This is the debhelper compatibility version to use.
- export DH_COMPAT=3
- 
- CFLAGS=-O2 $(DEBUGFLAGS)
---- a/src/Instrumentation/gps.cxx
-+++ b/src/Instrumentation/gps.cxx
-@@ -137,7 +137,7 @@
-   _northSouthVelocity = _gpsNode->getChild("ns-velocity-msec", 0, true);
-   
- // waypoints
--  // for compatability, alias selected course down to wp/wp[1]/desired-course-deg
-+  // for compatibility, alias selected course down to wp/wp[1]/desired-course-deg
-   SGPropertyNode* wp1Crs = _currentWayptNode->getChild("desired-course-deg", 0, true);
-   wp1Crs->alias(_gpsNode->getChild("desired-course-deg", 0, true));
- 
-@@ -776,7 +776,7 @@
-     return;
-   }
-  
--  // compatability feature - allow the route-manager / GPS to drive the
-+  // compatibility feature - allow the route-manager / GPS to drive the
-   // generic autopilot heading hold *in leg mode only* 
-   
-   bool drive = _mode == "leg";
---- a/src/Instrumentation/instrument_mgr.cxx
-+++ b/src/Instrumentation/instrument_mgr.cxx
-@@ -177,10 +177,10 @@
- 
-         } else if (( name == "transponder" ) || ( name == "KT-70" )) {
-             if  (name == "KT-70") {
--                SG_LOG(SG_INSTR, SG_WARN, "KT-70 legacy instrument compatability. "
-+                SG_LOG(SG_INSTR, SG_WARN, "KT-70 legacy instrument compatibility. "
-                        "Please update aircraft to use transponder directly");
--                // force configuration into compatability mode
--                node->setBoolValue("kt70-compatability", true);
-+                // force configuration into compatibility mode
-+                node->setBoolValue("kt70-compatibility", true);
-             }
-             set_subsystem( id, new Transponder( node ), 0.2 );
- 
---- a/src/Instrumentation/transponder.cxx
-+++ b/src/Instrumentation/transponder.cxx
-@@ -56,7 +56,7 @@
- {
-     _requiredBusVolts = node->getDoubleValue("bus-volts", 8.0);
-     _altitudeSourcePath = node->getStringValue("encoder-path", "/instrumentation/altimeter");
--    _kt70Compat = node->getBoolValue("kt70-compatability", false);
-+    _kt70Compat = node->getBoolValue("kt70-compatibility", false);
- }
- 
- 
-@@ -142,7 +142,7 @@
-                             &Transponder::getStandbyAnnunciator );
-         _tiedProperties.Tie("annunciators/reply", this,
-                             &Transponder::getReplyAnnunciator );
--    } // of kt70 backwards compatability
-+    } // of kt70 backwards compatibility
- }
- 
- void Transponder::unbind()
---- a/src/Instrumentation/transponder.hxx
-+++ b/src/Instrumentation/transponder.hxx
-@@ -60,7 +60,7 @@
-         KNOB_ALT
-     };
-     
--    // annunciators, for KT-70 compatability only
-+    // annunciators, for KT-70 compatibility only
-     // these should be replaced with conditionals in the instrument
-     bool getFLAnnunciator() const;
-     bool getAltAnnunciator() const;
---- a/src/Navaids/NavDataCache.cxx
-+++ b/src/Navaids/NavDataCache.cxx
-@@ -23,7 +23,7 @@
- # include "config.h"
- #endif
- 
--// to ensure compatability between sqlite3_int64 and PositionedID,
-+// to ensure compatibility between sqlite3_int64 and PositionedID,
- // force the type used by sqlite to match PositionedID explicitly
- #define SQLITE_INT64_TYPE int64_t
- #define SQLITE_UINT64_TYPE uint64_t

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/flightgear.git