[SCM] transportation simulator branch, master, updated. debian/102.2.2.ds1-1-21-g99a3ce9
Ansgar Burchardt
ansgar at debian.org
Wed Feb 16 23:38:39 UTC 2011
The following commit has been merged in the master branch:
commit dae9d0e625f2a0ad2fb5cedcae5d9e7f2ed79270
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Wed Feb 16 21:17:02 2011 +0100
Update patches.
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index c22776e..150d08f 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -4,42 +4,36 @@ Build configuration for Debian
--- simutrans.orig/makeobj/Makefile
+++ simutrans/makeobj/Makefile
-@@ -2,8 +2,8 @@
- #OSTYPE = beos
- #OSTYPE = cygwin
- #OSTYPE = freebsd
--#OSTYPE = linux
--OSTYPE = mingw
-+OSTYPE = linux
-+#OSTYPE = mingw
-
- LN= $(CC)
-
-@@ -14,9 +14,9 @@
+@@ -41,16 +41,16 @@
+ CXXFLAGS += -DUSE_HW -DUSE_C
endif
- ifeq ($(OSTYPE),linux)
-- LDLIBS=-lpng -lz -lstdc++ -lm
-- CFLAGS = -O
-- CXXFLAGS = -O
-+ LDLIBS=-lpng -lm
-+ CFLAGS += -W -Wall
-+ CXXFLAGS += -W -Wall
- endif
-
- ifeq ($(OSTYPE),beos)
-@@ -65,7 +65,7 @@
- all: makeobj
-
- makeobj: $(OBJECTS)
-- $(LN) $(CXXFLAGS) $(LDFLAGS) -o makeobj $(OBJECTS) $(LDLIBS)
-+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o makeobj $(OBJECTS) $(LDLIBS)
+-ifneq ($(OPTIMISE),)
+- CFLAGS += -O3 -fno-schedule-insns
+- CXXFLAGS += -O3 -fno-schedule-insns
+- ifneq ($(OSTYPE),mac)
+- CFLAGS += -minline-all-stringops
+- endif
+-else
+- CFLAGS += -O
+- CXXFLAGS += -O
+-endif
++#ifneq ($(OPTIMISE),)
++# CFLAGS += -O3 -fno-schedule-insns
++# CXXFLAGS += -O3 -fno-schedule-insns
++# ifneq ($(OSTYPE),mac)
++# CFLAGS += -minline-all-stringops
++# endif
++#else
++# CFLAGS += -O
++# CXXFLAGS += -O
++#endif
- clean:
- rm -f $(OBJECTS)
+ ifdef DEBUG
+ ifeq ($(shell expr $(DEBUG) \>= 1), 1)
--- /dev/null
+++ simutrans/config.default
-@@ -0,0 +1,60 @@
+@@ -0,0 +1,77 @@
+#
+# to compile:
+# copy this file to config.default and adjust the settings
@@ -50,18 +44,22 @@ Build configuration for Debian
+#BACKEND = sdl
+BACKEND = mixer_sdl
+#BACKEND = x11
++#BACKEND = posix
+
++#COLOUR_DEPTH = 0
+#COLOUR_DEPTH = 8
+COLOUR_DEPTH = 16
+
++#OSTYPE = amiga
+#OSTYPE = beos
+#OSTYPE = cygwin
+#OSTYPE = freebsd
++#OSTYPE = haiku
+OSTYPE = linux
+#OSTYPE = mingw
+#OSTYPE = mac
+
-+#DEBUG = 1 # Level 1-3, higher number means more debug-friendly, see Makefile
++#DEBUG = 3 # Level 1-3, higher number means more debug-friendly, see Makefile
+#OPTIMISE = 1 # Add umpteen optimisation flags
+#PROFILE = 1
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -73,88 +71,46 @@ Build configuration for Debian
+ DEBUG=1
+endif
+
-+# Define these as empty strings, if you don't have allegro/sdl-config
++#WITH_REVISION = 1 # adds the revision from svn; required for networkgames
++# if you do not use SVN, add -DREVISION="1234" to the FLAGS below
++
++# Define these as empty strings, if you don't have the respective config program
+#ALLEGRO_CONFIG = allegro-config
++#PNG_CONFIG = pkg-config libpng
+SDL_CONFIG = sdl-config
+
+#VERBOSE = 1
+
-+# Do not determine dependencies
-+# Header dependencies get NOT tracked this way, so if a header changes you're
-+# on your own (i.e. manually run a make clean)
-+# Uncomment this if this stage takes exceptionally long, which happens on some
-+# broken filesystems
-+# NO_DEPS = 1
-+
-+# Following flags exists
-+# DOUBLE_GROUNDS: Enables two height tiles
++# The following useful conditional compilation flags exist
++#
++# Needed to compile:
++# USE_C: no assembler for copying (required for not using GCC on x86)
++# SIM_BIG_ENDIAN: MUST be set for PPC/Motorola byte order! (old mac, amiga)
++#
++# Changing appearance:
++# USE_SOFTPOINTER: emulate mouse pointer (set automatically in Makefile)
+# HALF_HEIGHT: Enables half height tiles (8 pixel instead 16)
-+# OTTD_LIKE: Enables half height tiles and crossconnected industries; defaul folder pak.ttd/
++#
++# Useful for debugging:
++# DEBUG_ROUTES: show routing calculation information in minimap
++# SHOW_FORE_GRUND: show which objects are drawn as foreground
++# DEBUG_FLUSH_BUFFER: show the dirty areas on the screen
++#
++# Following flags alter game engine (and are off for standard builds)
++# OTTD_LIKE: Enables half height tiles and crossconnects all industries
++# AUTOMATIC_BRIDGES and AUTOMATIC_TUNNELS: will be built also for player
++# AUTOJOIN_PUBLIC: stations next to a public stop will be joined to it
++# MAX_CHOOSE_BLOCK_TILES=xxx: maximum distance between choose signal and a
++# target (undefined means no limit)
++# USE_DIFFERENT_WIND: different airplane approach directions over the map
+# DESTINATION_CITYCARS: Citycars can have a destination (not recommended)
-+# USE_C: no assembler for copying
-+# BIG_ENDIAN: MUST by set for PPC/Motorola byte order! (old mac, amiga)
-+# STEPS16: 16 steps per tile - nicer on pak64
-+FLAGS = -DSTEPS16
++#
++# In order to use the flags, add a line like this: (-Dxxx)
++# FLAGS = -DUSE_C
+
+ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+ FLAGS += -DUSE_C
+endif
-+
---- simutrans.orig/Makefile
-+++ simutrans/Makefile
-@@ -68,27 +68,27 @@
- SDL_CONFIG ?= sdl-config
-
-
--ifneq ($(OPTIMISE),)
-- ifneq ($(PROFILE),)
-- CFLAGS += -O3 -minline-all-stringops
-- CXXFLAGS += -O3
-- else
-- CFLAGS += -O3 -fomit-frame-pointer
-- CXXFLAGS += -O3 -fomit-frame-pointer
-- endif
-- ifneq ($(OSTYPE),mac)
-- CFLAGS += -minline-all-stringops
-- LDFLAGS += -ffunctions-sections
-- endif
--else
-- CFLAGS += -O
-- CXXFLAGS += -O
--endif
-+#ifneq ($(OPTIMISE),)
-+# ifneq ($(PROFILE),)
-+# CFLAGS += -O3 -minline-all-stringops
-+# CXXFLAGS += -O3
-+# else
-+# CFLAGS += -O3 -fomit-frame-pointer
-+# CXXFLAGS += -O3 -fomit-frame-pointer
-+# endif
-+# ifneq ($(OSTYPE),mac)
-+# CFLAGS += -minline-all-stringops
-+# LDFLAGS += -ffunctions-sections
-+# endif
-+#else
-+# CFLAGS += -O
-+# CXXFLAGS += -O
-+#endif
-
- ifdef DEBUG
- ifeq ($(shell expr $(DEBUG) \>= 1), 1)
-- CFLAGS += -g -DDEBUG
-- CXXFLAGS += -g -DDEBUG
-+ CFLAGS += -DDEBUG
-+ CXXFLAGS += -DDEBUG
- endif
- ifeq ($(shell expr $(DEBUG) \>= 2), 1)
- CFLAGS += -fno-inline
-@@ -433,5 +433,5 @@
-
-
- makeobj_prog:
-- $(MAKE) -e -C makeobj FLAGS="$(FLAGS)"
-+ $(MAKE) -C makeobj FLAGS="$(FLAGS)"
-
--- simutrans.orig/simtypes.h
+++ simutrans/simtypes.h
@@ -8,6 +8,13 @@
@@ -165,7 +121,7 @@ Build configuration for Debian
+#undef LITTLE_ENDIAN //endian.h gives these definitions we don't want
+#undef BIG_ENDIAN
+#if __BYTE_ORDER == __BIG_ENDIAN
-+ #define BIG_ENDIAN
++ #define SIM_BIG_ENDIAN
+#endif
+
#if defined _MSC_VER
diff --git a/debian/patches/path-for-game-data.diff b/debian/patches/path-for-game-data.diff
index 00c0155..0f3bc9b 100644
--- a/debian/patches/path-for-game-data.diff
+++ b/debian/patches/path-for-game-data.diff
@@ -4,18 +4,15 @@ look in /usr/share/games/simutrans for game data
--- simutrans.orig/simmain.cc
+++ simutrans/simmain.cc
-@@ -389,12 +389,8 @@
- #endif
+@@ -441,8 +441,9 @@
+ strcat( umgebung_t::program_dir, path_sep );
}
else {
- strcpy( umgebung_t::program_dir, argv[0] );
--#ifdef _WIN32
-- *(strrchr( umgebung_t::program_dir, '\\' )+1) = 0;
--#else
-- *(strrchr( umgebung_t::program_dir, '/' )+1) = 0;
--#endif
-+ // data files are in /usr/share/games/simutrans
-+ strcpy( umgebung_t::program_dir, "/usr/share/games/simutrans/" );
+- *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
++ // strcpy( umgebung_t::program_dir, argv[0] );
++ // *(strrchr( umgebung_t::program_dir, path_sep[0] )+1) = 0;
++ strcpy(umgebung_t::program_dir, "/usr/share/games/simutrans/");
+
chdir( umgebung_t::program_dir );
}
-
diff --git a/debian/patches/revert-svn-1937.diff b/debian/patches/revert-svn-1937.diff
index 5aeaedb..75b629c 100644
--- a/debian/patches/revert-svn-1937.diff
+++ b/debian/patches/revert-svn-1937.diff
@@ -5,32 +5,14 @@ Subject: Use ~/.simutrans for savegames
This patch reverts SVN commit 1937 to make simutrans use ~/.simutrans for
savegames instead of ~/simutrans.
---- simutrans.orig/simsys_d.cc
-+++ simutrans/simsys_d.cc
-@@ -308,11 +308,7 @@
- }
- return NULL;
- #else
--#ifndef __MACOS__
- sprintf( buffer, "%s/simutrans", getenv("HOME") );
--#else
-- sprintf( buffer, "%s/Documents/simutrans", getenv("HOME") );
--#endif
- int err = mkdir( buffer, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH );
- if(err && err!=EEXIST) {
- // could not create directory
--- simutrans.orig/simsys_s.cc
+++ simutrans/simsys_s.cc
-@@ -287,11 +287,7 @@
- }
+@@ -317,7 +317,7 @@
return NULL;
#else
--#ifndef __MACOS__
+ #ifndef __APPLE__
- sprintf( buffer, "%s/simutrans", getenv("HOME") );
--#else
-- sprintf( buffer, "%s/Documents/simutrans", getenv("HOME") );
--#endif
+ sprintf( buffer, "%s/.simutrans", getenv("HOME") );
- int err = mkdir( buffer, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH );
- if(err && err!=EEXIST) {
- // could not create directory
+ #else
+ sprintf( buffer, "%s/Library/Simutrans", getenv("HOME") );
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index f97f2d1..cbce4aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
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
deleted file mode 100644
index 30a5d82..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.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
More information about the Pkg-games-commits
mailing list