This is an automated email from the git hooks/post-receive script. jff-guest pushed a commit to branch master in repository simutrans.
commit 976700252400d3f9b1a15906295df8b0aceac8b7 Author: Jörg Frings-Fürst <[email protected]> Date: Sun Feb 7 10:58:40 2016 +0100 update d/p/0005-typo.patch --- debian/changelog | 1 + debian/patches/0005-typo.patch | 98 +++++++++++++++++++++++++++++++++++++++++- debian/patches/series | 2 +- 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fa55cd2..4039da3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,7 @@ simutrans (120.1.3+repack-1) UNRELEASED; urgency=low * debian/rules: - Add -lssl -lcrypto to LDFLAGS to prevent build error. * Update translations. + * Update debian/patches/0005-typo.patch. -- Jörg Frings-Fürst <[email protected]> Sat, 06 Feb 2016 05:34:17 +0100 diff --git a/debian/patches/0005-typo.patch b/debian/patches/0005-typo.patch index 46161a3..c719adc 100644 --- a/debian/patches/0005-typo.patch +++ b/debian/patches/0005-typo.patch @@ -1,5 +1,101 @@ Description: Correct typos Author: Jörg Frings-Fürst <[email protected]> -Last-Update: 2015-05-16 +Last-Update: 2016-02-07 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/gui/money_frame.cc +=================================================================== +--- trunk.orig/gui/money_frame.cc ++++ trunk/gui/money_frame.cc +@@ -368,7 +368,7 @@ money_frame_t::money_frame_t(player_t *p + headquarter.init(button_t::roundbox, "Configure AI", scr_coord(582-12-120, 0), scr_size(120, BUTTONSPACE)); + headquarter.add_listener(this); + add_component(&headquarter); +- headquarter.set_tooltip( "Configure AI setttings" ); ++ headquarter.set_tooltip( "Configure AI settings" ); + } + else if(old_level > 0 || hausbauer_t::get_headquarter(0,welt->get_timeline_year_month())!=NULL) { + +@@ -524,7 +524,7 @@ void money_frame_t::draw(scr_coord pos, + + headquarter.disable(); + if( player->get_ai_id()!=player_t::HUMAN ) { +- headquarter.set_tooltip( "Configure AI setttings" ); ++ headquarter.set_tooltip( "Configure AI settings" ); + headquarter.set_text( "Configure AI" ); + headquarter.enable(); + } +Index: trunk/network/network_file_transfer.cc +=================================================================== +--- trunk.orig/network/network_file_transfer.cc ++++ trunk/network/network_file_transfer.cc +@@ -115,7 +115,7 @@ const char *network_gameinfo(const char + } + nwc_gameinfo_t *nwgi = dynamic_cast<nwc_gameinfo_t*>(nwc); + if (nwgi==NULL) { +- err = "Protocoll error (expected NWC_GAMEINFO)"; ++ err = "Protocol error (expected NWC_GAMEINFO)"; + goto end; + } + if (nwgi->len==0) { +@@ -283,7 +283,7 @@ const char *network_send_file( uint32 cl + fclose(fp); + return NULL; + error: +- // an error occured: close file ++ // an error occurred: close file + fclose(fp); + return "Client closed connection during transfer"; + } +Index: trunk/script/script.cc +=================================================================== +--- trunk.orig/script/script.cc ++++ trunk/script/script.cc +@@ -52,7 +52,7 @@ void script_vm_t::errorfunc(HSQUIRRELVM + if (strcmp(s, "</error>")==0) { + help_frame_t *win = new help_frame_t(); + win->set_text(buf); +- win->set_name("Script error occured"); ++ win->set_name("Script error occurred"); + create_win( win, w_info, magic_none); + // find failed script + for(uint32 i=0; i<all_scripts.get_count(); i++) { +Index: trunk/squirrel/sqstdlib/sqstdstring.cc +=================================================================== +--- trunk.orig/squirrel/sqstdlib/sqstdstring.cc ++++ trunk/squirrel/sqstdlib/sqstdstring.cc +@@ -87,7 +87,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQIn + else { + n++; + if( nparam > sq_gettop(v) ) +- return sq_throwerror(v,_SC("not enough paramters for the given format string")); ++ return sq_throwerror(v,_SC("not enough parameters for the given format string")); + n = validate_format(v,fmt,format,n,w); + if(n < 0) return -1; + SQInteger addlen = 0; +Index: trunk/simfab.cc +=================================================================== +--- trunk.orig/simfab.cc ++++ trunk/simfab.cc +@@ -2299,7 +2299,7 @@ void fabrik_t::verteile_waren(const uint + // not connected? + const planquadrat_t *plan = welt->access(pos.get_2d()); + if( plan == NULL ) { +- dbg->fatal("fabrik_t::verteile_waren", "%s has not distibution target", get_name() ); ++ dbg->fatal("fabrik_t::verteile_waren", "%s has not distribution target", get_name() ); + } + if( plan->get_haltlist_count() == 0 ) { + return; +Index: trunk/simtool.h +=================================================================== +--- trunk.orig/simtool.h ++++ trunk/simtool.h +@@ -125,7 +125,7 @@ public: + * @author Hj. Malthaner + */ + static const char *tool_set_slope_work( player_t *player, koord3d pos, int slope ); +- char const* get_tooltip(player_t const*) const OVERRIDE { return tooltip_with_price("Built artifical slopes", welt->get_settings().cst_set_slope); } ++ char const* get_tooltip(player_t const*) const OVERRIDE { return tooltip_with_price("Built artificial slopes", welt->get_settings().cst_set_slope); } + 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)); } diff --git a/debian/patches/series b/debian/patches/series index 41aeeec..edee4e8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -#0005-typo.patch +0005-typo.patch 0105-revert-svn-1937.diff 0100-path_for_game-data.patch 0500-config.diff -- 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
