This is an automated email from the git hooks/post-receive script. jff-guest pushed a commit to branch master in repository simutrans.
commit 3b61765a7b8f4b5b98e29f82740f1a0af5941c12 Author: Jörg Frings-Fürst <[email protected]> Date: Mon Jan 1 14:18:08 2018 +0100 Correct typos --- debian/changelog | 6 ++-- debian/copyright | 2 +- debian/patches/0005-typo.patch | 63 +++++++++++++++++++++++++++++++++++++++++- debian/simutrans.6 | 2 +- 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05696a4..42f2c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,9 +15,9 @@ simutrans (120.2.2-3) UNRELEASED; urgency=medium * debian/makeobj.6: - Correct typo. * Declare compliance with Debian Policy 4.1.3 (No changes needed). - * New *.lintian-overrides to override the "spelling-error-in-copyright - GNU Public License" warning. - + * New *.lintian-overrides to override the "spelling-error-in-copyright" + warning. + * Refresh patches/0005-typo.patch. -- Jörg Frings-Fürst <[email protected]> Mon, 01 Jan 2018 10:37:52 +0100 diff --git a/debian/copyright b/debian/copyright index 3bbf98e..5ee6e53 100644 --- a/debian/copyright +++ b/debian/copyright @@ -53,7 +53,7 @@ Comment: Files: debian/* Copyright: 2008-2012 Ansgar Burchardt <[email protected]> - 2015-2017 Jörg Frings-Fürst <[email protected]> + 2015-2018 Jörg Frings-Fürst <[email protected]> 2015-2017 Markus Koschany <[email protected]> License: Artistic-1.0 diff --git a/debian/patches/0005-typo.patch b/debian/patches/0005-typo.patch index 35d8939..7e07d3e 100644 --- a/debian/patches/0005-typo.patch +++ b/debian/patches/0005-typo.patch @@ -1,6 +1,6 @@ Description: Correct typos Author: Jörg Frings-Fürst <[email protected]> -Last-Update: 2016-02-07 +Last-Update: 2018-01-01 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/gui/money_frame.cc @@ -51,3 +51,64 @@ Index: trunk/simtool.h bool is_init_network_save() const OVERRIDE { return true; } char const* check_pos(player_t*, koord3d) OVERRIDE; char const* work(player_t* const player, koord3d const k) OVERRIDE { return tool_set_slope_work(player, k, atoi(default_param)); } +Index: trunk/network/network_cmd_ingame.cc +=================================================================== +--- trunk.orig/network/network_cmd_ingame.cc ++++ trunk/network/network_cmd_ingame.cc +@@ -1204,7 +1204,7 @@ void nwc_tool_t::do_command(karte_t *wel + tool->exit(player); + } + else { +- err = "Init was not succesfull, returned false."; ++ err = "Init was not successful, returned false."; + } + + // callback to script here +Index: trunk/script/api/api_command.cc +=================================================================== +--- trunk.orig/script/api/api_command.cc ++++ trunk/script/api/api_command.cc +@@ -33,7 +33,7 @@ SQInteger command_constructor(HSQUIRRELV + SQInteger param<call_tool_init>::push(HSQUIRRELVM vm, call_tool_init v) + { + if (v.error) { +- return sq_raise_error(vm, *v.error ? v.error : "Strange error occured"); ++ return sq_raise_error(vm, *v.error ? v.error : "Strange error occurred"); + } + // create tool, if necessary, delete on exit + std::auto_ptr<tool_t> our_tool; +@@ -160,7 +160,7 @@ tool_t * call_tool_base_t::create_tool() + SQInteger param<call_tool_work>::push(HSQUIRRELVM vm, call_tool_work v) + { + if (v.error) { +- return sq_raise_error(vm, *v.error ? v.error : "Strange error occured"); ++ return sq_raise_error(vm, *v.error ? v.error : "Strange error occurred"); + } + // create tool, if necessary, delete on exit + std::auto_ptr<tool_t> our_tool; +Index: trunk/simtool.cc +=================================================================== +--- trunk.orig/simtool.cc ++++ trunk/simtool.cc +@@ -6141,7 +6141,7 @@ bool tool_make_stop_public_t::init( play + + const char* tool_make_stop_public_t::get_tooltip(const player_t *) const + { +- sprintf(toolstr, translator::translate("Make way or stop public (will join with neighbours), %i times maintainance"), welt->get_settings().cst_make_public_months); ++ sprintf(toolstr, translator::translate("Make way or stop public (will join with neighbours), %i times maintenance"), welt->get_settings().cst_make_public_months); + return toolstr; + } + +Index: trunk/makeobj/makeobj.cc +=================================================================== +--- trunk.orig/makeobj/makeobj.cc ++++ trunk/makeobj/makeobj.cc +@@ -163,7 +163,7 @@ int main(int argc, char* argv[]) + " with QUIET as first arg copyright message will be omitted\n" + "\n" + " with VERBOSE as first arg also unused lines\n" +- " and unassinged entrys are printed\n" ++ " and unassinged entries are printed\n" + "\n" + " DEBUG dumps extended information about the pak process.\n" + " Source: interpreted line from .dat file\n" diff --git a/debian/simutrans.6 b/debian/simutrans.6 index 1a4e887..268919d 100644 --- a/debian/simutrans.6 +++ b/debian/simutrans.6 @@ -38,7 +38,7 @@ Run Simutrans in free playing mode (you cannot go bankrupt). Turn sound off. .TP \fB\-objects \fIpath -Use alterative PAK file set located in \fIpath\fP. The path \fBmust\fP +Use alternative PAK file set located in \fIpath\fP. The path \fBmust\fP end with a /. .SH SEE ALSO /usr/share/doc/simutrans, http://www.simutrans.com/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
