[SCM] gerbera/master: Refresh spelling patch and forward upstream
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Sat Sep 23 17:48:12 UTC 2017
The following commit has been merged in the master branch:
commit de5ff557d974034bc627ecf5335fc81e6bc5d608
Author: James Cowgill <jcowgill at debian.org>
Date: Wed May 31 22:10:21 2017 +0100
Refresh spelling patch and forward upstream
diff --git a/debian/patches/0001_fix_spelling_errors.patch b/debian/patches/0001_fix_spelling_errors.patch
index 025b930..b9bd3ce 100644
--- a/debian/patches/0001_fix_spelling_errors.patch
+++ b/debian/patches/0001_fix_spelling_errors.patch
@@ -1,11 +1,12 @@
Description: Fix spelling errors.
Fix the spelling errors mentioned by lintian.
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
-Last-Update: 2012-03-24
+Applied-Upstream: https://github.com/v00d00/gerbera/commit/529bdade73bc7c2c1a6e9919110a345ab8a76d75
+Last-Update: 2017-05-31
--- a/src/web_request_handler.h
+++ b/src/web_request_handler.h
-@@ -150,7 +150,7 @@
+@@ -149,7 +149,7 @@ public:
IN enum UpnpOpenFileMode mode,
IN zmm::String range);
@@ -14,76 +15,3 @@ Last-Update: 2012-03-24
virtual void process() = 0;
/// \brief builds full path to a script for the given relative filename
---- a/src/youtube_service.cc
-+++ b/src/youtube_service.cc
-@@ -337,7 +337,7 @@
- return temp;
- else
- throw _Exception(_("Tag <") + xml->getName() +
-- _("> is missing the requred \"") + attrname +
-+ _("> is missing the required \"") + attrname +
- _("\" attribute!"));
- return nil;
- }
-@@ -350,7 +350,7 @@
- itmp = temp.toInt();
- else
- throw _Exception(_("Tag <") + xml->getName() +
-- _("> is missing the requred \"") + attrname +
-+ _("> is missing the required \"") + attrname +
- _("\" attribute!"));
-
- if (itmp < 1)
---- a/src/online_service.cc
-+++ b/src/online_service.cc
-@@ -98,7 +98,7 @@
- return temp;
- else
- throw _Exception(getServiceName() + _(": Tag <") + xml->getName() +
-- _("> is missing the requred \"") + attrname +
-+ _("> is missing the required \"") + attrname +
- _("\" attribute!"));
- return nil;
- }
-@@ -111,7 +111,7 @@
- itmp = temp.toInt();
- else
- throw _Exception(getServiceName() + _(": Tag <") + xml->getName() +
-- _("> is missing the requred \"") + attrname +
-+ _("> is missing the required \"") + attrname +
- _("\" attribute!"));
-
- if (itmp < 1)
---- a/src/main.cc
-+++ b/src/main.cc
-@@ -197,7 +197,7 @@
- break;
-
- case 'd':
-- log_debug("Starting in deamon mode...");
-+ log_debug("Starting in daemon mode...");
- daemon = true;
- break;
-
---- a/src/storage/sql_storage.h
-+++ b/src/storage/sql_storage.h
-@@ -242,7 +242,7 @@
- void addToInsertBuffer(zmm::Ref<zmm::StringBuffer> query);
- void flushInsertBuffer(bool dontLock = false);
-
-- /* insert buffer functions to be overriden by implementing classes */
-+ /* insert buffer functions to be overridden by implementing classes */
- virtual void _addToInsertBuffer(zmm::Ref<zmm::StringBuffer> query) = 0;
- virtual void _flushInsertBuffer() = 0;
-
---- a/src/storage/sql_storage.cc
-+++ b/src/storage/sql_storage.cc
-@@ -136,7 +136,7 @@
- void SQLStorage::init()
- {
- if (table_quote_begin == '\0' || table_quote_end == '\0')
-- throw _Exception(_("quote vars need to be overriden!"));
-+ throw _Exception(_("quote vars need to be overridden!"));
-
- Ref<StringBuffer> buf(new StringBuffer());
- *buf << SQL_QUERY_FOR_STRINGBUFFER;
--
gerbera packaging
More information about the pkg-multimedia-commits
mailing list