[simutrans] 01/02: Refresh patches; rewrite d/watch
Jörg Frings-Fürst
jff-guest at moszumanska.debian.org
Sun Jun 25 11:37:26 UTC 2017
This is an automated email from the git hooks/post-receive script.
jff-guest pushed a commit to branch master
in repository simutrans.
commit c3c2df8a903d51d4192ee74477d46e135e5cfc26
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date: Sun Jun 25 12:59:47 2017 +0200
Refresh patches; rewrite d/watch
---
debian/changelog | 13 +++++++
debian/clean | 2 +-
debian/patches/0005-typo.patch | 58 +++-------------------------
debian/patches/0100-path_for_game-data.patch | 2 +-
debian/patches/0105-revert-svn-1937.diff | 2 +-
debian/patches/0500-config.diff | 44 +++++++++++++++++----
debian/patches/reproducible-build.patch | 2 +-
debian/patches/series | 2 +-
debian/watch | 2 +-
9 files changed, 60 insertions(+), 67 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c7335ec..9e5cece 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+simutrans (120.2.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - Refresh patches:
+ + 0005-typo.patch
+ + 0100-path_for_game-data.patch
+ + 0105-revert-svn-1937.diff
+ + 0500-config.diff
+ + reproducible-build.patch
+ + Remove useless patch sha1.patch.
+
+ -- Jörg Frings-Fürst <debian at jff-webhosting.net> Sun, 25 Jun 2017 10:46:43 +0200
+
simutrans (120.1.3+repack-3) unstable; urgency=medium
[ Jörg Frings-Fürst ]
diff --git a/debian/clean b/debian/clean
index 25a56bb..7136325 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,5 @@
debian/simutrans.xpm
makeobj/makeobj
-config.default
+#config.default
config.log
config.status
diff --git a/debian/patches/0005-typo.patch b/debian/patches/0005-typo.patch
index c719adc..35d8939 100644
--- a/debian/patches/0005-typo.patch
+++ b/debian/patches/0005-typo.patch
@@ -7,16 +7,16 @@ 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
+@@ -366,7 +366,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) {
+ else if(old_level > 0 || hausbauer_t::get_headquarters(0,welt->get_timeline_year_month())!=NULL) {
-@@ -524,7 +524,7 @@ void money_frame_t::draw(scr_coord pos,
+@@ -522,7 +522,7 @@ void money_frame_t::draw(scr_coord pos,
headquarter.disable();
if( player->get_ai_id()!=player_t::HUMAN ) {
@@ -25,46 +25,11 @@ Index: trunk/gui/money_frame.cc
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
+@@ -89,7 +89,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQIn
else {
n++;
if( nparam > sq_gettop(v) )
@@ -73,24 +38,11 @@ Index: trunk/squirrel/sqstdlib/sqstdstring.cc
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:
+@@ -126,7 +126,7 @@ public:
* @author Hj. Malthaner
*/
static const char *tool_set_slope_work( player_t *player, koord3d pos, int slope );
diff --git a/debian/patches/0100-path_for_game-data.patch b/debian/patches/0100-path_for_game-data.patch
index 8d6e5c7..ab64cf3 100644
--- a/debian/patches/0100-path_for_game-data.patch
+++ b/debian/patches/0100-path_for_game-data.patch
@@ -8,7 +8,7 @@ Index: trunk/simmain.cc
===================================================================
--- trunk.orig/simmain.cc
+++ trunk/simmain.cc
-@@ -486,8 +486,9 @@ int simu_main(int argc, char** argv)
+@@ -483,8 +483,9 @@ int simu_main(int argc, char** argv)
strcat( env_t::program_dir, path_sep );
}
else {
diff --git a/debian/patches/0105-revert-svn-1937.diff b/debian/patches/0105-revert-svn-1937.diff
index 25ede54..f68a97b 100644
--- a/debian/patches/0105-revert-svn-1937.diff
+++ b/debian/patches/0105-revert-svn-1937.diff
@@ -9,7 +9,7 @@ Index: trunk/simsys.cc
===================================================================
--- trunk.orig/simsys.cc
+++ trunk/simsys.cc
-@@ -168,7 +168,7 @@ char const* dr_query_homedir()
+@@ -191,7 +191,7 @@ char const* dr_query_homedir()
find_directory(B_USER_DIRECTORY, &userDir);
sprintf(buffer, "%s/simutrans", userDir.Path());
#else
diff --git a/debian/patches/0500-config.diff b/debian/patches/0500-config.diff
index 0125a4e..6b9ef74 100644
--- a/debian/patches/0500-config.diff
+++ b/debian/patches/0500-config.diff
@@ -6,7 +6,7 @@ Index: trunk/config.default
===================================================================
--- /dev/null
+++ trunk/config.default
-@@ -0,0 +1,77 @@
+@@ -0,0 +1,105 @@
+#
+# to compile:
+# copy this file to config.default and adjust the settings
@@ -14,13 +14,13 @@ Index: trunk/config.default
+
+#BACKEND = allegro
+#BACKEND = gdi
++#BACKEND = opengl
+#BACKEND = sdl
++#BACKEND = sdl2
+BACKEND = mixer_sdl
-+#BACKEND = x11
+#BACKEND = posix
+
+#COLOUR_DEPTH = 0
-+#COLOUR_DEPTH = 8
+COLOUR_DEPTH = 16
+
+#OSTYPE = amiga
@@ -32,9 +32,6 @@ Index: trunk/config.default
+#OSTYPE = mingw
+#OSTYPE = mac
+
-+#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)))
+ OPTIMISE=
+else
@@ -44,30 +41,46 @@ Index: trunk/config.default
+ DEBUG=1
+endif
+
++#MSG_LEVEL = 1 # Level 1-4, more runtime debug messages (without only warnings and errors)
++#PROFILE = 1 # Enable profiling
++#PROFILE = 2 # Enable profiling with optimisation flags, can be used with `OPTIMISE = 1'
++
++#STATIC = 1 # Enable static linkage, currently mingw only
++
+#WITH_REVISION = 1 # adds the revision from svn; required for networkgames
+# if you do not use SVN, add -DREVISION="1234" to the FLAGS below
+
++#WIN32_CONSOLE = 1 # adds a console for windows debugging
++
++#MULTI_THREAD = 1 # Enable multithreading
++
+# 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
++#SDL_CONFIG = sdl-config
++SDL2_CONFIG = sdl2-config
+
+VERBOSE = 1
+
++# Use static libraries instead
++# STATIC = 1
++
+# 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)
++# NO_INTPTR_T: must be set if intptr_t is not available
+#
+# Changing appearance:
+# USE_SOFTPOINTER: emulate mouse pointer (set automatically in Makefile)
-+# HALF_HEIGHT: Enables half height tiles (8 pixel instead 16)
+#
+# 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
++# USE_VALGRIND_MEMCHECK: make valgrind-memcheck aware of the memory allocation stuff in dataobj/freelist
++# SYSLOG: send debug output to syslog
+#
+# Following flags alter game engine (and are off for standard builds)
+# OTTD_LIKE: Enables half height tiles and crossconnects all industries
@@ -84,3 +97,18 @@ Index: trunk/config.default
+ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+ FLAGS += -DUSE_C
+endif
++
++
++# Output directories:
++#
++# use this put objects file in same directory, where the sources are (not recommended):
++# ... otherwise defaults to 'build/default')
++#
++BUILDDIR = $(shell pwd)
++#
++# use this to specify the target directory for the executable:
++# .. otherwise defaults to BUILDDIR
++#
++MAKEOBJ_PROGDIR = $(shell pwd)
++NETTOOL_PROGDIR = $(shell pwd)
++PROGDIR = $(shell pwd)
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 98fc13f..3a5bfd6 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -12,7 +12,7 @@ Index: trunk/simversion.h
===================================================================
--- trunk.orig/simversion.h
+++ trunk/simversion.h
-@@ -45,7 +45,7 @@
+@@ -47,7 +47,7 @@
#define VERSION_NUMBER QUOTEME(SIM_VERSION_MAJOR) "." QUOTEME(SIM_VERSION_MINOR) SIM_VERSION_PATCH_STRING SIM_VERSION_BUILD_STRING
diff --git a/debian/patches/series b/debian/patches/series
index 6929bcb..8a53a75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
0505-link-less-libraries.diff
#0510-missing_uncommon_mk.patch
reproducible-build.patch
-sha1.patch
+#sha1.patch
diff --git a/debian/watch b/debian/watch
index b372640..fc0c564 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=4
-opts=uversionmangle=s/-/./g,repacksuffix=+repack,\
+opts=uversionmangle=s/-/./g,compression=xz,repack,\
dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
http://sf.net/simutrans/simutrans-src-([\d\-]+)\.zip
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git
More information about the Pkg-games-commits
mailing list