[SCM] ecasound/master: drop fix-spelling-error patch (merged upstream)

ghedo-guest at users.alioth.debian.org ghedo-guest at users.alioth.debian.org
Wed May 11 19:37:21 UTC 2011


The following commit has been merged in the master branch:
commit 075b9500750819e5454c257d819420ba25a8ab31
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Wed May 11 17:41:09 2011 +0200

    drop fix-spelling-error patch (merged upstream)

diff --git a/debian/patches/0002-fix-spelling-error.patch b/debian/patches/0002-fix-spelling-error.patch
deleted file mode 100644
index 0515b42..0000000
--- a/debian/patches/0002-fix-spelling-error.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-From: Alessandro Ghedini <al3xbio at gmail.com>
-Date: Fri, 21 Jan 2011 18:20:01 +0100
-Subject: [PATCH] fix spelling error
-
-Fix spelling error succesfully successfully found by lintian
----
- Documentation/programmers_guide/eci_doc.latex |    2 +-
- libecasound/eca-chainsetup-parser.cpp         |    8 ++++----
- libecasound/eca-chainsetup-parser.h           |    2 +-
- libecasound/eca-chainsetup.cpp                |    6 +++---
- libecasound/eca-chainsetup.h                  |    2 +-
- libecasound/eca-control-base.cpp              |    6 +++---
- libecasound/eca-object-factory_test.h         |    2 +-
- libecasound/eca-test-case.cpp                 |    2 +-
- libecasound/plugins/audioio_jack_manager.cpp  |    6 +++---
- 9 files changed, 18 insertions(+), 18 deletions(-)
-
-diff --git a/Documentation/programmers_guide/eci_doc.latex b/Documentation/programmers_guide/eci_doc.latex
-index a725ca4..226b0df 100644
---- a/Documentation/programmers_guide/eci_doc.latex
-+++ b/Documentation/programmers_guide/eci_doc.latex
-@@ -143,7 +143,7 @@ of last EIAM command. Otherwise returns false (= 0).
- 
- \item[last\_error()]
- Returns a string describing the last error. If the last EIAM command
--was executed succesfully, last\_error() returns an empty string.
-+was executed successfully, last\_error() returns an empty string.
- 
- \end{description}
- 
-diff --git a/libecasound/eca-chainsetup-parser.cpp b/libecasound/eca-chainsetup-parser.cpp
-index 1916439..a025b4e 100644
---- a/libecasound/eca-chainsetup-parser.cpp
-+++ b/libecasound/eca-chainsetup-parser.cpp
-@@ -65,7 +65,7 @@ ECA_CHAINSETUP_PARSER::ECA_CHAINSETUP_PARSER(ECA_CHAINSETUP* csetup)
-  * @pre argu.size() > 0
-  * @pre argu[0] == '-'
-  * 
-- * @post (option succesfully interpreted && interpret_result() ==  true) ||
-+ * @post (option successfully interpreted && interpret_result() ==  true) ||
-  *       (unknown or invalid option && interpret_result() != true)
-  */
- void ECA_CHAINSETUP_PARSER::interpret_option (const string& arg)
-@@ -85,7 +85,7 @@ void ECA_CHAINSETUP_PARSER::interpret_option (const string& arg)
-  *
-  * @pre argu.size() > 0
-  * @pre argu[0] == '-'
-- * @post (option succesfully interpreted && interpretation_result() ==  true) ||
-+ * @post (option successfully interpreted && interpretation_result() ==  true) ||
-  *       (unknown or invalid option && interpretation_result() == false)
-  */
- void ECA_CHAINSETUP_PARSER::interpret_global_option (const string& arg)
-@@ -107,7 +107,7 @@ void ECA_CHAINSETUP_PARSER::interpret_global_option (const string& arg)
-  * @pre argu.size() > 0
-  * @pre argu[0] == '-'
-  * 
-- * @post (option succesfully interpreted && interpretation_result() ==  true) ||
-+ * @post (option successfully interpreted && interpretation_result() ==  true) ||
-  *       (unknown or invalid option && interpretation_result() == false)
-  */
- void ECA_CHAINSETUP_PARSER::interpret_object_option (const string& arg)
-@@ -196,7 +196,7 @@ void ECA_CHAINSETUP_PARSER::interpret_options(const std::vector<string>& opts)
- 		kvu_numtostr(global_matches) +
- 		" of the expected " +
- 		kvu_numtostr(optcount) +
--		" parameters were recognized succesfully.");
-+		" parameters were recognized successfully.");
-   }
- }
- 
-diff --git a/libecasound/eca-chainsetup-parser.h b/libecasound/eca-chainsetup-parser.h
-index 689a35a..29a3992 100644
---- a/libecasound/eca-chainsetup-parser.h
-+++ b/libecasound/eca-chainsetup-parser.h
-@@ -29,7 +29,7 @@ class ECA_CHAINSETUP_PARSER {
-    * Returns the result of last call to interpret_option(), interpret_global_option() 
-    * or interpret_object_option().
-    *
--   * @result true if options interpreted succesfully, otherwise false
-+   * @result true if options interpreted successfully, otherwise false
-    */
-   bool interpret_result(void) const { return(interpret_result_rep); }
-   const std::string& interpret_result_verbose(void) const { return(interpret_result_verbose_rep); }
-diff --git a/libecasound/eca-chainsetup.cpp b/libecasound/eca-chainsetup.cpp
-index 7da4e6e..339e510 100644
---- a/libecasound/eca-chainsetup.cpp
-+++ b/libecasound/eca-chainsetup.cpp
-@@ -2208,7 +2208,7 @@ SAMPLE_SPECS::sample_pos_t ECA_CHAINSETUP::seek_position(SAMPLE_SPECS::sample_po
-  * @pre argu[0] == '-'
-  * @pre is_enabled() != true
-  * 
-- * @post (option succesfully interpreted && interpret_result() ==  true) ||
-+ * @post (option successfully interpreted && interpret_result() ==  true) ||
-  *       (unknown or invalid option && interpret_result() != true)
-  */
- void ECA_CHAINSETUP::interpret_option (const string& arg)
-@@ -2227,7 +2227,7 @@ void ECA_CHAINSETUP::interpret_option (const string& arg)
-  * @pre argu.size() > 0
-  * @pre argu[0] == '-'
-  * @pre is_enabled() != true
-- * @post (option succesfully interpreted && interpretation_result() ==  true) ||
-+ * @post (option successfully interpreted && interpretation_result() ==  true) ||
-  *       (unknown or invalid option && interpretation_result() == false)
-  */
- void ECA_CHAINSETUP::interpret_global_option (const string& arg)
-@@ -2247,7 +2247,7 @@ void ECA_CHAINSETUP::interpret_global_option (const string& arg)
-  * @pre argu[0] == '-'
-  * @pre is_enabled() != true
-  * 
-- * @post (option succesfully interpreted && interpretation_result() ==  true) ||
-+ * @post (option successfully interpreted && interpretation_result() ==  true) ||
-  *       (unknown or invalid option && interpretation_result() == false)
-  */
- void ECA_CHAINSETUP::interpret_object_option (const string& arg)
-diff --git a/libecasound/eca-chainsetup.h b/libecasound/eca-chainsetup.h
-index 1259877..48b196a 100644
---- a/libecasound/eca-chainsetup.h
-+++ b/libecasound/eca-chainsetup.h
-@@ -292,7 +292,7 @@ class ECA_CHAINSETUP : public ECA_CHAINSETUP_POSITION {
-    * Returns the result of last call to interpret_option(), interpret_global_option() 
-    * or interpret_object_option().
-    *
--   * @result true if options interpreted succesfully, otherwise false
-+   * @result true if options interpreted successfully, otherwise false
-    */
-   bool interpret_result(void) const { return cparser_rep.interpret_result(); }
-   const string& interpret_result_verbose(void) const { return cparser_rep.interpret_result_verbose(); }
-diff --git a/libecasound/eca-control-base.cpp b/libecasound/eca-control-base.cpp
-index de7454f..b9458ab 100644
---- a/libecasound/eca-control-base.cpp
-+++ b/libecasound/eca-control-base.cpp
-@@ -207,9 +207,9 @@ int ECA_CONTROL::run(bool batchmode)
- 	}
-       }
-       else {
--	/* engine was started succesfully (processing_started == true) */
-+	/* engine was started successfully (processing_started == true) */
- 	if (is_running() != true) {
--	  /* operation succesfully completed, exit from run() unless
-+	  /* operation successfully completed, exit from run() unless
- 	   * infinite operation is requested (batchmode) */
- 	  if (batchmode == true) break;
- 	}
-@@ -406,7 +406,7 @@ void ECA_CONTROL::close_engine(void)
-   }
- 
-   if (engine_exited_rep.get() == 1) {
--    ECA_LOG_MSG(ECA_LOGGER::system_objects, "Engine thread has exited succesfully.");
-+    ECA_LOG_MSG(ECA_LOGGER::system_objects, "Engine thread has exited successfully.");
-     delete engine_repp;
-     engine_repp = 0;
-     engine_exited_rep.set(0);
-diff --git a/libecasound/eca-object-factory_test.h b/libecasound/eca-object-factory_test.h
-index b44b16f..29938c5 100644
---- a/libecasound/eca-object-factory_test.h
-+++ b/libecasound/eca-object-factory_test.h
-@@ -99,7 +99,7 @@ void ECA_OBJECT_FACTORY_TEST::test_map(const ECA_OBJECT_MAP& objmap)
-       ECA_LOG_MSG(ECA_LOGGER::user_objects, 
- 		  "libecasound_tester: Object type \"" +
- 		  obj->name() +
--		  "\" succesfully created.");
-+		  "\" successfully created.");
-       
-       T* target = dynamic_cast<T*>(obj->new_expr());
-       test_object_types<T>(obj, target, "new_expr");
-diff --git a/libecasound/eca-test-case.cpp b/libecasound/eca-test-case.cpp
-index 5e69b29..2f5f2b2 100644
---- a/libecasound/eca-test-case.cpp
-+++ b/libecasound/eca-test-case.cpp
-@@ -90,7 +90,7 @@ string ECA_TEST_CASE::name(void) const
- }
- 
- /**
-- * Whether test was run succesfully.
-+ * Whether test was run successfully.
-  */
- bool ECA_TEST_CASE::success(void) const
- {
-diff --git a/libecasound/plugins/audioio_jack_manager.cpp b/libecasound/plugins/audioio_jack_manager.cpp
-index 06f09b2..1b7d703 100644
---- a/libecasound/plugins/audioio_jack_manager.cpp
-+++ b/libecasound/plugins/audioio_jack_manager.cpp
-@@ -1655,7 +1655,7 @@ void AUDIO_IO_JACK_MANAGER::write_samples(int client_id, void* target_buffer, lo
- /**
-  * Opens connection to the JACK server. Sets
-  * is_open() to 'true' if connection is 
-- * succesfully opened.
-+ * successfully opened.
-  *
-  * @pre is_open() != true
-  *
-@@ -1704,7 +1704,7 @@ void AUDIO_IO_JACK_MANAGER::open_server_connection(void)
- #endif
- 
-     ECA_LOG_MSG(ECA_LOGGER::user_objects, 
--		"Succesfully opened JACK server connection.");
-+		"Successfully opened JACK server connection.");
-   }
-   else {
-     ECA_LOG_MSG(ECA_LOGGER::info, "Error! Cannot connect to JACK server!");
-@@ -1741,7 +1741,7 @@ void AUDIO_IO_JACK_MANAGER::close_server_connection(void)
-   port_numbers_rep.clear();
- 
-   ECA_LOG_MSG(ECA_LOGGER::user_objects, 
--		"Succesfully closed JACK server connection.");
-+		"Successfully closed JACK server connection.");
- 
- #ifdef PROFILE_CALLBACK_EXECUTION
-   cerr << profile_callback_timer.to_string() << endl;
--- 
diff --git a/debian/patches/series b/debian/patches/series
index df8624e..4137db2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 0001-fix-manpages-errors.patch
-0002-fix-spelling-error.patch
 0003-build-shared-libecasound.patch
 0004-build-shared-libecasoundc.patch
 0005-build-shared-libkvutils.patch

-- 
ecasound packaging



More information about the pkg-multimedia-commits mailing list