Commit 9bc3194c authored by Jörg Frings-Fürst's avatar Jörg Frings-Fürst

Refresh patches; Declare compliance with Debian Policy 4.1.4

parent 88355c6a
simutrans (120.2.2-4) UNRELEASED; urgency=medium
simutrans (120.3-1) unstable; urgency=medium
* New upstream release.
- Refresh patches.
* New debian/patches/0110-path_max.patch:
- Define PATH_MAX if not defined.
* debian/copyright:
......@@ -7,8 +9,9 @@ simutrans (120.2.2-4) UNRELEASED; urgency=medium
* debian/control:
- Remove armhf from architectures.
- Move Vcs-* to salsa.
* Declare compliance with Debian Policy 4.1.4 (No changes needed).
-- Jörg Frings-Fürst <debian@jff.email> Mon, 02 Apr 2018 20:22:29 +0200
-- Jörg Frings-Fürst <debian@jff.email> Sun, 08 Jul 2018 11:52:11 +0200
simutrans (120.2.2-3) unstable; urgency=medium
......
......@@ -13,7 +13,7 @@ Build-Depends:
libsdl-mixer1.2-dev,
quilt,
zlib1g-dev
Standards-Version: 4.1.3
Standards-Version: 4.1.4
Homepage: http://www.simutrans.com/
Vcs-Git: git://salsa.debian.org/games-team/simutrans.git
Vcs-Browser: https://salsa.debian.org/games-team/simutrans
......
......@@ -7,8 +7,8 @@ Index: trunk/gui/money_frame.cc
===================================================================
--- trunk.orig/gui/money_frame.cc
+++ trunk/gui/money_frame.cc
@@ -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));
@@ -376,7 +376,7 @@ money_frame_t::money_frame_t(player_t *p
headquarter.init(button_t::roundbox, "Configure AI", scr_coord(582-12-120, top0), scr_size(120, BUTTONSPACE));
headquarter.add_listener(this);
add_component(&headquarter);
- headquarter.set_tooltip( "Configure AI setttings" );
......@@ -16,7 +16,7 @@ Index: trunk/gui/money_frame.cc
}
else if(old_level > 0 || hausbauer_t::get_headquarters(0,welt->get_timeline_year_month())!=NULL) {
@@ -522,7 +522,7 @@ void money_frame_t::draw(scr_coord pos,
@@ -535,7 +535,7 @@ void money_frame_t::draw(scr_coord pos,
headquarter.disable();
if( player->get_ai_id()!=player_t::HUMAN ) {
......@@ -25,24 +25,11 @@ Index: trunk/gui/money_frame.cc
headquarter.set_text( "Configure AI" );
headquarter.enable();
}
Index: trunk/squirrel/sqstdlib/sqstdstring.cc
===================================================================
--- trunk.orig/squirrel/sqstdlib/sqstdstring.cc
+++ trunk/squirrel/sqstdlib/sqstdstring.cc
@@ -89,7 +89,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/simtool.h
===================================================================
--- trunk.orig/simtool.h
+++ trunk/simtool.h
@@ -126,7 +126,7 @@ public:
@@ -128,7 +128,7 @@ public:
* @author Hj. Malthaner
*/
static const char *tool_set_slope_work( player_t *player, koord3d pos, int slope );
......@@ -55,7 +42,7 @@ 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
@@ -1205,7 +1205,7 @@ void nwc_tool_t::do_command(karte_t *wel
tool->exit(player);
}
else {
......@@ -68,7 +55,7 @@ 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
@@ -42,7 +42,7 @@ SQInteger command_constructor(HSQUIRRELV
SQInteger param<call_tool_init>::push(HSQUIRRELVM vm, call_tool_init v)
{
if (v.error) {
......@@ -77,7 +64,7 @@ Index: trunk/script/api/api_command.cc
}
// 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()
@@ -169,7 +169,7 @@ tool_t * call_tool_base_t::create_tool()
SQInteger param<call_tool_work>::push(HSQUIRRELVM vm, call_tool_work v)
{
if (v.error) {
......@@ -90,7 +77,7 @@ Index: trunk/simtool.cc
===================================================================
--- trunk.orig/simtool.cc
+++ trunk/simtool.cc
@@ -6141,7 +6141,7 @@ bool tool_make_stop_public_t::init( play
@@ -6213,7 +6213,7 @@ bool tool_make_stop_public_t::init( play
const char* tool_make_stop_public_t::get_tooltip(const player_t *) const
{
......@@ -103,7 +90,7 @@ Index: trunk/makeobj/makeobj.cc
===================================================================
--- trunk.orig/makeobj/makeobj.cc
+++ trunk/makeobj/makeobj.cc
@@ -163,7 +163,7 @@ int main(int argc, char* argv[])
@@ -162,7 +162,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"
......
......@@ -8,14 +8,14 @@ Index: trunk/simmain.cc
===================================================================
--- trunk.orig/simmain.cc
+++ trunk/simmain.cc
@@ -483,8 +483,9 @@ int simu_main(int argc, char** argv)
strcat( env_t::program_dir, path_sep );
@@ -476,8 +476,9 @@ int simu_main(int argc, char** argv)
strcat( env_t::program_dir, PATH_SEPARATOR );
}
else {
- strcpy( env_t::program_dir, argv[0] );
- *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
- *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
+// strcpy( env_t::program_dir, argv[0] );
+// *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
+// *(strrchr( env_t::program_dir, PATH_SEPARATOR[0] )+1) = 0;
+ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
#ifdef __APPLE__
......
......@@ -9,7 +9,7 @@ Index: trunk/simsys.cc
===================================================================
--- trunk.orig/simsys.cc
+++ trunk/simsys.cc
@@ -191,7 +191,7 @@ char const* dr_query_homedir()
@@ -357,7 +357,7 @@ char const *dr_query_homedir()
find_directory(B_USER_DIRECTORY, &userDir);
sprintf(buffer, "%s/simutrans", userDir.Path());
#else
......@@ -17,4 +17,4 @@ Index: trunk/simsys.cc
+ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
#endif
dr_mkdir(buffer);
// create directory and subdirectories
......@@ -7,7 +7,7 @@ Index: trunk/simsys.cc
===================================================================
--- trunk.orig/simsys.cc
+++ trunk/simsys.cc
@@ -36,8 +36,13 @@
@@ -39,8 +39,13 @@
# if !defined __AMIGA__ && !defined __BEOS__
# include <unistd.h>
# endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment