[scummvm-tools] 03/05: New upstream release.

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository scummvm-tools.

commit b1716d0fae909ce7f3e81c2df1c19d6579958aa4
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Mar 18 13:40:33 2016 +0100

    New upstream release.
---
 debian/changelog                    |  6 ++++++
 debian/patches/series               |  1 -
 debian/patches/spelling-fixes.patch | 39 -------------------------------------
 3 files changed, 6 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f4a595..3e48085 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scummvm-tools (1.8.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release, including spelling-fixes.patch.
+
+ -- Stephen Kitt <skitt at debian.org>  Fri, 18 Mar 2016 13:36:21 +0100
+
 scummvm-tools (1.7.0-1) unstable; urgency=low
 
   * Initial release. Closes: #653617.
diff --git a/debian/patches/series b/debian/patches/series
index 883dd81..6e0f914 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-spelling-fixes.patch
 compilation-fixes.patch
 tests-missing-data.patch
 tests-broken.patch
diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch
deleted file mode 100644
index 307591e..0000000
--- a/debian/patches/spelling-fixes.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Spelling fixes
-Author: Stephen Kitt <skitt at debian.org>
-Forwarded: https://github.com/scummvm/scummvm-tools/pull/8
-
-As suggested by Lintian:
-* excutable -> executable
-* occured -> occurred
-
---- a/gui/pages.cpp
-+++ b/gui/pages.cpp
-@@ -888,7 +888,7 @@
- 
- 	/*
- 	"\nMP3 mode params:\n"
--	" --lame-path <path> Path to the lame excutable to use (default: lame)\n"
-+	" --lame-path <path> Path to the lame executable to use (default: lame)\n"
- 	" -b <rate>    <rate> is the target bitrate(ABR)/minimal bitrate(VBR) (default:" minBitrDef_str "%d)\n"
- 	" -B <rate>    <rate> is the maximum VBR/ABR bitrate (default:%" maxBitrDef_str ")\n"
- 	" --vbr        LAME uses the VBR mode (default)\n"
-@@ -1522,7 +1522,7 @@
- 		_success = true;
- 	} catch (ToolException &err) {
- 		wxMutexLocker lock(_output.mutex);
--		_output.buffer = _output.buffer + "\nFatal Error Occured: " + err.what() + "\n";
-+		_output.buffer = _output.buffer + "\nFatal Error Occurred: " + err.what() + "\n";
- 	}
- 	_finished = true;
- 	return NULL;
---- a/compress.cpp
-+++ b/compress.cpp
-@@ -1163,7 +1163,7 @@
- 
- 	if (_supportedFormats & AUDIO_MP3) {
- 		os << "\nMP3 mode params:\n";
--		os << " --lame-path <path> Path to the lame excutable to use (default:lame)\n";
-+		os << " --lame-path <path> Path to the lame executable to use (default:lame)\n";
- 		os << " -b <rate>    <rate> is the minimal bitrate (default:unset)\n";
- 		os << " -B <rate>    <rate> is the maximum bitrate (default:unset)\n";
- 		os << " --vbr        LAME uses the VBR mode (default)\n";

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