[SCM] composite/master: Fix more spelling.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8ef5295170c9911e757d7f1fd2366b42eccf1ee4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jul 12 21:25:52 2016 +0200

    Fix more spelling.

diff --git a/debian/patches/01-spelling_errors.patch b/debian/patches/01-spelling_errors.patch
index 1fdfa1a..d23a4af 100644
--- a/debian/patches/01-spelling_errors.patch
+++ b/debian/patches/01-spelling_errors.patch
@@ -8,6 +8,8 @@ Forwarded: gabrbedd at gmail.com
  src/Tritium/src/Serialization.cpp |    2 +-
  4 files changed, 4 insertions(+), 4 deletions(-)
 
+Index: composite/data/xml/tritium-1.xsd
+===================================================================
 --- composite.orig/data/xml/tritium-1.xsd
 +++ composite/data/xml/tritium-1.xsd
 @@ -61,7 +61,7 @@
@@ -19,6 +21,8 @@ Forwarded: gabrbedd at gmail.com
        namespace above will be used until a non-backwards-compatable
        change is made.  For example, when first published the only
        elements was <presets>.  Because <tritium> has a lax
+Index: composite/src/Tritium/src/LocalFileMng.cpp
+===================================================================
 --- composite.orig/src/Tritium/src/LocalFileMng.cpp
 +++ composite/src/Tritium/src/LocalFileMng.cpp
 @@ -960,7 +960,7 @@ namespace Tritium
@@ -30,6 +34,8 @@ Forwarded: gabrbedd at gmail.com
                          .arg(filename) );
              return true;
          }
+Index: composite/src/Tritium/src/Preferences.cpp
+===================================================================
 --- composite.orig/src/Tritium/src/Preferences.cpp
 +++ composite/src/Tritium/src/Preferences.cpp
 @@ -68,7 +68,7 @@ Preferences::Preferences()
@@ -41,6 +47,8 @@ Forwarded: gabrbedd at gmail.com
  		QString sLadspaPath = QString::fromLocal8Bit(ladpath);
  		int pos;
  		while ( ( pos = sLadspaPath.indexOf( ":" ) ) != -1 ) {
+Index: composite/src/Tritium/src/Serialization.cpp
+===================================================================
 --- composite.orig/src/Tritium/src/Serialization.cpp
 +++ composite/src/Tritium/src/Serialization.cpp
 @@ -1402,7 +1402,7 @@ void SerializationQueue::handle_load_ins
@@ -52,3 +60,16 @@ Forwarded: gabrbedd at gmail.com
          // Only one layer.
          QString sFilename = LocalFileMng::readXmlString( instrumentNode, "filename", "" );
  
+Index: composite/src/composite-gui/PatternEditor/DrumPatternEditor.cpp
+===================================================================
+--- composite.orig/src/composite-gui/PatternEditor/DrumPatternEditor.cpp
++++ composite/src/composite-gui/PatternEditor/DrumPatternEditor.cpp
+@@ -88,7 +88,7 @@ void DrumPatternEditor::updateEditor()
+ 	// check engine state
+ 	int state = engine->getState();
+ 	if ( state != Engine::StateReady ) {
+-		ERRORLOG( "FIXME: skipping pattern editor update (state shoud be READY or PLAYING)" );
++		ERRORLOG( "FIXME: skipping pattern editor update (state should be READY or PLAYING)" );
+ 		return;
+ 	}
+ 

-- 
composite packaging