This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository stella.
commit 288bf3aad5d9c409c2a91dec583e990013cec6ab Author: Stephen Kitt <[email protected]> Date: Mon Feb 5 22:22:44 2018 +0100 New upstream release --- debian/changelog | 8 ++++- debian/patches/series | 1 - debian/patches/spelling-fixes.patch | 64 ------------------------------------- 3 files changed, 7 insertions(+), 66 deletions(-) diff --git a/debian/changelog b/debian/changelog index c7f23f6..e01c7ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +stella (5.1-1) UNRELEASED; urgency=medium + + * New upstream release, merging spelling-fixes.patch. + + -- Stephen Kitt <[email protected]> Mon, 05 Feb 2018 21:56:25 +0100 + stella (5.0.2-1) unstable; urgency=medium * New upstream release. @@ -387,7 +393,7 @@ stella (2.2-1) unstable; urgency=low stella (1.4.1-1) unstable; urgency=low - * Added debian-menus script to create menu files based on rom images. + * Added debian-menus script to create menu files based on rom images. * New upstream release. * This Release and 1.2-1.2 NMU (Closes: #174998, #190958, #262493, #263406) diff --git a/debian/patches/series b/debian/patches/series index 5259d5d..d938fff 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -spelling-fixes.patch evdev-joystick-flags.patch diff --git a/debian/patches/spelling-fixes.patch b/debian/patches/spelling-fixes.patch deleted file mode 100644 index 2b38a88..0000000 --- a/debian/patches/spelling-fixes.patch +++ /dev/null @@ -1,64 +0,0 @@ -Description: Spelling fixes -Author: Stephen Kitt <[email protected]> - ---- a/src/emucore/Settings.cxx -+++ b/src/emucore/Settings.cxx -@@ -530,7 +530,7 @@ - << "; Format MUST be as follows:" << endl - << "; command = value" << endl - << ";" << endl -- << "; Commmands are the same as those specified on the commandline," << endl -+ << "; Commands are the same as those specified on the commandline," << endl - << "; without the '-' character." << endl - << ";" << endl - << "; Values are the same as those allowed on the commandline." << endl ---- a/docs/debugger.html -+++ b/docs/debugger.html -@@ -939,7 +939,7 @@ - - <p>The 'Compare' button is used to compare the given value using all - addresses currently highlighted. This may be an absolute number (such as 2), --or a comparitive number (such as -1). Using a '+' or '-' operator -+or a comparative number (such as -1). Using a '+' or '-' operator - means 'search addresses for values that have changed by that amount'.</p> - <p>The 'Reset' button resets the entire operation; it clears the highlighted - addresses and allows another search.</p> ---- a/src/debugger/gui/RamWidget.cxx -+++ b/src/debugger/gui/RamWidget.cxx -@@ -385,11 +385,11 @@ - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - string RamWidget::doCompare(const string& str) - { -- bool comparitiveSearch = false; -+ bool comparativeSearch = false; - int searchVal = 0, offset = 0; - - if(str.length() == 0) -- return "Enter an absolute or comparitive value"; -+ return "Enter an absolute or comparative value"; - - // Do some pre-processing on the string - string::size_type pos = str.find_first_of("+-", 0); -@@ -399,11 +399,11 @@ - return "Input must be [+|-]NUM"; - } - -- // A comparitive search searches memory for locations that have changed by -+ // A comparative search searches memory for locations that have changed by - // the specified amount, vs. for exact values - if(str[0] == '+' || str[0] == '-') - { -- comparitiveSearch = true; -+ comparativeSearch = true; - bool negative = false; - if(str[0] == '-') - negative = true; -@@ -427,7 +427,7 @@ - - for(uInt32 i = 0; i < mySearchAddr.size(); ++i) - { -- if(comparitiveSearch) -+ if(comparativeSearch) - { - searchVal = mySearchValue[i] + offset; - if(searchVal < 0 || searchVal > 255) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
