[SCM] transportation simulator branch, master, updated. debian/102.2.1.ds1-1-10-g05b309a

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit e094f2f7b9398a03cf9b8fec176787eca14a03c0
Author: Ansgar Burchardt <ansgar at 43-1.org>
Date:   Fri Mar 12 09:16:21 2010 +0900

    Correct spelling errors.
    
    Correct spelling errors pointed out by lintian.
    
    Signed-off-by: Ansgar Burchardt <ansgar at 43-1.org>

diff --git a/debian/patches/series b/debian/patches/series
index cbce4aa..f97f2d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 revert-svn-1937.diff
 path-for-game-data.diff
 config.diff
+spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
new file mode 100644
index 0000000..4d08ab0
--- /dev/null
+++ b/debian/patches/spelling.patch
@@ -0,0 +1,116 @@
+From: Ansgar Burchardt <ansgar at 43-1.org>
+Date: Fri, 12 Mar 2010 08:27:08 +0900
+Forwarded: http://forum.simutrans.com/index.php?topic=4674.0
+Subject: Correct spelling errors
+
+This patch corrects several spelling errors pojnted out by lintian.
+There is one more error that is also present in translations and was not corrected:
+"artifical" (instead of "artificial").
+--- simutrans.orig/boden/wege/schiene.h
++++ simutrans/boden/wege/schiene.h
+@@ -25,7 +25,7 @@
+ {
+ protected:
+ 	/**
+-	* Bound when this block was sucessfully reserved by the convoi
++	* Bound when this block was successfully reserved by the convoi
+ 	* @author prissi
+ 	*/
+ 	convoihandle_t reserved;
+--- simutrans.orig/dataobj/network.h
++++ simutrans/dataobj/network.h
+@@ -54,7 +54,7 @@
+ /* do appropriate action for network server:
+  * - either connect to a new client
+  * - recieve commands
+- * returns len of recieved bytes, or when negative a negative socket number
++ * returns len of received bytes, or when negative a negative socket number
+  */
+ SOCKET network_check_activity(int timeout, char *buf, int &len );
+ 
+--- simutrans.orig/font.cc
++++ simutrans/font.cc
+@@ -313,7 +313,7 @@
+ 
+ 		fnt->screen_width[32] = 4;
+ 		fnt->char_data[CHARACTER_LEN*32 + CHARACTER_LEN-1] = 0;	// space width
+-		fprintf(stderr, "%s sucessfully loaded as old format prop font!\n", fname);
++		fprintf(stderr, "%s successfully loaded as old format prop font!\n", fname);
+ 		return true;
+ 	}
+ 
+--- simutrans.orig/gui/fahrplan_gui.cc
++++ simutrans/gui/fahrplan_gui.cc
+@@ -75,7 +75,7 @@
+ void fahrplan_gui_t::gimme_short_stop_name(cbuffer_t &buf, karte_t *welt, const spieler_t *sp, const schedule_t *fpl, int i, int max_chars)
+ {
+ 	if(i<0  ||  fpl==NULL  ||  i>=fpl->get_count()) {
+-		dbg->warning("void fahrplan_gui_t::gimme_stop_name()","tried to recieved unused entry %i in schedule %p.",i,fpl);
++		dbg->warning("void fahrplan_gui_t::gimme_stop_name()","tried to receive unused entry %i in schedule %p.",i,fpl);
+ 		return;
+ 	}
+ 	const linieneintrag_t& entry = fpl->eintrag[i];
+--- simutrans.orig/player/ai.cc
++++ simutrans/player/ai.cc
+@@ -141,7 +141,7 @@
+ 			dbg->message("ai_t::call_general_tool()","failed for tool %i at (%s) because of \"%s\"", tool, pos.get_str(), err );
+ 		}
+ 		else {
+-			dbg->message("ai_t::call_general_tool()","not succesful for tool %i at (%s)", tool, pos.get_str() );
++			dbg->message("ai_t::call_general_tool()","not successful for tool %i at (%s)", tool, pos.get_str() );
+ 		}
+ 	}
+ 	werkzeug_t::general_tool[tool]->default_param = old_param;
+--- simutrans.orig/simfab.cc
++++ simutrans/simfab.cc
+@@ -455,7 +455,7 @@
+ 
+ 	file->rdwr_byte(rotate, "\n");
+ 
+-	// now rebuilt information for recieved goods
++	// now rebuilt information for received goods
+ 	file->rdwr_long(eingang_count, "\n");
+ 	for(i=0; i<eingang_count; i++) {
+ 		ware_production_t dummy;
+--- simutrans.orig/simutrans/history.txt
++++ simutrans/simutrans/history.txt
+@@ -1816,7 +1816,7 @@
+ 4-Nov-2005 (prissi)
+ 	FIX: loading old maps with obsolete docks
+ 	FIX: no route next to attraction should now have a more meaningful number (so you can better guess how much you have to transport)
+-	FIX: mail from attractions and factories again 4x recieved mail
++	FIX: mail from attractions and factories again 4x received mail
+ 	CHANGE: some further small optimizations for faster drawing of dialoges
+ 	CHANGE: vehicles now sorted in depot by intro year and engine type
+ 3-Nov-2005 (mip)
+@@ -6212,7 +6212,7 @@
+          - FIX: midi playlist displays message
+                 "Musicplaying disabled/not available" if either no MIDI
+                 files could be loaded or if the soundcard could not be
+-                initialized succesfully
++                initialized successfully
+          - FIX: Song name in playlist is updated if a new song starts
+                 playing
+ 
+--- simutrans.orig/simutrans/text/en/list.txt
++++ simutrans/simutrans/text/en/list.txt
+@@ -3,7 +3,7 @@
+ <h1><strong>Lists</strong></h1>
+ 
+ <p>
+-<strong>Lists</strong> has options to open controls for information about the current status of the game (and also a control to adjust relative income recieved from the transport of different <a href="goods_filter.txt">goods, passengers & mail</a>).
++<strong>Lists</strong> has options to open controls for information about the current status of the game (and also a control to adjust relative income received from the transport of different <a href="goods_filter.txt">goods, passengers & mail</a>).
+ </p>
+ <p>
+ Information is available for a player in lists about: <a href="station.txt">Stops</a>; <a href="convoiinfo.txt">Convoys</a>; <a href="citywindow.txt">urban areas</a>; incomes received from different <a href="goods_filter.txt">goods</a>, passengers & mail; <a href="industry_info.txt">industry</a>; and tourist attractions.
+--- simutrans.orig/simworld.cc
++++ simutrans/simworld.cc
+@@ -5171,7 +5171,7 @@
+ 
+ #if 0
+ 		if(  umgebung_t::networkmode  ) {
+-			// did we recieved a new command?
++			// did we receive a new command?
+ 			len_last_command = sizeof(network_buffer);
+ 			SOCKET s = network_check_activity( min(5u,next_step_time-dr_time()), network_buffer, len_last_command );
+ 			if(  s!=INVALID_SOCKET  &&  !network_check_server_connection()  ) {

-- 
transportation simulator