[simutrans] 01/03: d/changelog: change date/time
Jörg Frings-Fürst
jff-guest at moszumanska.debian.org
Sun Feb 7 23:13:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
jff-guest pushed a commit to branch master
in repository simutrans.
commit d58626b7257166eeed166b72294cdac3b42e2eed
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date: Mon Feb 8 00:10:43 2016 +0100
d/changelog: change date/time
---
.pc/.quilt_patches | 1 +
.pc/.quilt_series | 1 +
.pc/.version | 1 +
.pc/0005-typo.patch/.timestamp | 0
{gui => .pc/0005-typo.patch/gui}/money_frame.cc | 0
.../network}/network_file_transfer.cc | 0
{script => .pc/0005-typo.patch/script}/script.cc | 0
simfab.cc => .pc/0005-typo.patch/simfab.cc | 0
simtool.h => .pc/0005-typo.patch/simtool.h | 0
.../squirrel}/sqstdlib/sqstdstring.cc | 0
.pc/0100-path_for_game-data.patch/.timestamp | 0
.../0100-path_for_game-data.patch/simmain.cc | 0
.pc/0105-revert-svn-1937.diff/.timestamp | 0
.../0105-revert-svn-1937.diff/simsys.cc | 0
.pc/0110-sha1-replacement.diff/.timestamp | 0
.pc/0110-sha1-replacement.diff/utils/sha1.cc | 0
.pc/0110-sha1-replacement.diff/utils/sha1.h | 0
.pc/0500-config.diff/.timestamp | 0
.pc/0500-config.diff/config.default | 0
.pc/0505-link-less-libraries.diff/.timestamp | 0
.../makeobj}/Makefile | 0
.pc/applied-patches | 7 ++
.pc/reproducible-build.patch/.timestamp | 0
.../reproducible-build.patch/simversion.h | 0
config.default | 77 ++++++++++++++++++++++
debian/changelog | 2 +-
gui/money_frame.cc | 4 +-
makeobj/Makefile | 2 +-
network/network_file_transfer.cc | 4 +-
script/script.cc | 2 +-
simfab.cc | 2 +-
simmain.cc | 5 +-
simsys.cc | 2 +-
simtool.h | 2 +-
simversion.h | 2 +-
squirrel/sqstdlib/sqstdstring.cc | 2 +-
utils/sha1.cc | 54 +++++++++++++++
utils/sha1.h | 28 ++++++++
38 files changed, 184 insertions(+), 14 deletions(-)
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/.pc/0005-typo.patch/.timestamp b/.pc/0005-typo.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/gui/money_frame.cc b/.pc/0005-typo.patch/gui/money_frame.cc
similarity index 100%
copy from gui/money_frame.cc
copy to .pc/0005-typo.patch/gui/money_frame.cc
diff --git a/network/network_file_transfer.cc b/.pc/0005-typo.patch/network/network_file_transfer.cc
similarity index 100%
copy from network/network_file_transfer.cc
copy to .pc/0005-typo.patch/network/network_file_transfer.cc
diff --git a/script/script.cc b/.pc/0005-typo.patch/script/script.cc
similarity index 100%
copy from script/script.cc
copy to .pc/0005-typo.patch/script/script.cc
diff --git a/simfab.cc b/.pc/0005-typo.patch/simfab.cc
similarity index 100%
copy from simfab.cc
copy to .pc/0005-typo.patch/simfab.cc
diff --git a/simtool.h b/.pc/0005-typo.patch/simtool.h
similarity index 100%
copy from simtool.h
copy to .pc/0005-typo.patch/simtool.h
diff --git a/squirrel/sqstdlib/sqstdstring.cc b/.pc/0005-typo.patch/squirrel/sqstdlib/sqstdstring.cc
similarity index 100%
copy from squirrel/sqstdlib/sqstdstring.cc
copy to .pc/0005-typo.patch/squirrel/sqstdlib/sqstdstring.cc
diff --git a/.pc/0100-path_for_game-data.patch/.timestamp b/.pc/0100-path_for_game-data.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/simmain.cc b/.pc/0100-path_for_game-data.patch/simmain.cc
similarity index 100%
copy from simmain.cc
copy to .pc/0100-path_for_game-data.patch/simmain.cc
diff --git a/.pc/0105-revert-svn-1937.diff/.timestamp b/.pc/0105-revert-svn-1937.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/simsys.cc b/.pc/0105-revert-svn-1937.diff/simsys.cc
similarity index 100%
copy from simsys.cc
copy to .pc/0105-revert-svn-1937.diff/simsys.cc
diff --git a/.pc/0110-sha1-replacement.diff/.timestamp b/.pc/0110-sha1-replacement.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/0110-sha1-replacement.diff/utils/sha1.cc b/.pc/0110-sha1-replacement.diff/utils/sha1.cc
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/0110-sha1-replacement.diff/utils/sha1.h b/.pc/0110-sha1-replacement.diff/utils/sha1.h
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/0500-config.diff/.timestamp b/.pc/0500-config.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/0500-config.diff/config.default b/.pc/0500-config.diff/config.default
new file mode 100644
index 0000000..e69de29
diff --git a/.pc/0505-link-less-libraries.diff/.timestamp b/.pc/0505-link-less-libraries.diff/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/makeobj/Makefile b/.pc/0505-link-less-libraries.diff/makeobj/Makefile
similarity index 100%
copy from makeobj/Makefile
copy to .pc/0505-link-less-libraries.diff/makeobj/Makefile
diff --git a/.pc/applied-patches b/.pc/applied-patches
new file mode 100644
index 0000000..c0d06eb
--- /dev/null
+++ b/.pc/applied-patches
@@ -0,0 +1,7 @@
+0005-typo.patch
+0105-revert-svn-1937.diff
+0100-path_for_game-data.patch
+0500-config.diff
+0505-link-less-libraries.diff
+0110-sha1-replacement.diff
+reproducible-build.patch
diff --git a/.pc/reproducible-build.patch/.timestamp b/.pc/reproducible-build.patch/.timestamp
new file mode 100644
index 0000000..e69de29
diff --git a/simversion.h b/.pc/reproducible-build.patch/simversion.h
similarity index 100%
copy from simversion.h
copy to .pc/reproducible-build.patch/simversion.h
diff --git a/config.default b/config.default
new file mode 100644
index 0000000..45de295
--- /dev/null
+++ b/config.default
@@ -0,0 +1,77 @@
+#
+# to compile:
+# copy this file to config.default and adjust the settings
+#
+
+#BACKEND = allegro
+#BACKEND = gdi
+#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 = 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
+ OPTIMISE=1
+endif
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+ DEBUG=1
+endif
+
+#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
+
+# 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)
+#
+# 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)
+#
+# 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
diff --git a/debian/changelog b/debian/changelog
index b7fec33..025da70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ simutrans (120.1.3+repack-1) unstable; urgency=low
* debian/watch: Bump version to 4 (no changes required).
* debian/copyright: Add year 2016.
- -- Jörg Frings-Fürst <debian at jff-webhosting.net> Sun, 07 Feb 2016 11:06:23 +0100
+ -- Jörg Frings-Fürst <debian at jff-webhosting.net> Mon, 08 Feb 2016 00:10:30 +0100
simutrans (120.1.1+repack-3) unstable; urgency=medium
diff --git a/gui/money_frame.cc b/gui/money_frame.cc
index bb3ff2e..941dc27 100644
--- a/gui/money_frame.cc
+++ b/gui/money_frame.cc
@@ -368,7 +368,7 @@ money_frame_t::money_frame_t(player_t *player)
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, scr_size size)
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();
}
diff --git a/makeobj/Makefile b/makeobj/Makefile
index c749281..c691a55 100644
--- a/makeobj/Makefile
+++ b/makeobj/Makefile
@@ -21,7 +21,7 @@ LDFLAGS += $(PNG_LDFLAGS)
CFLAGS += -DMAKEOBJ
CXXFLAGS += -DMAKEOBJ
-STD_LIBS += -lz -lbz2 -lpng
+STD_LIBS += -lpng
ifeq ($(OSTYPE),cygwin)
OS_INC ?= -I/usr/include/mingw
diff --git a/network/network_file_transfer.cc b/network/network_file_transfer.cc
index eb7d607..b9cce54 100644
--- a/network/network_file_transfer.cc
+++ b/network/network_file_transfer.cc
@@ -115,7 +115,7 @@ const char *network_gameinfo(const char *cp, gameinfo_t *gi)
}
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 client_id, const char *filename )
fclose(fp);
return NULL;
error:
- // an error occured: close file
+ // an error occurred: close file
fclose(fp);
return "Client closed connection during transfer";
}
diff --git a/script/script.cc b/script/script.cc
index 53a5b19..a21a26d 100644
--- a/script/script.cc
+++ b/script/script.cc
@@ -52,7 +52,7 @@ void script_vm_t::errorfunc(HSQUIRRELVM vm, const SQChar *s_, ...)
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++) {
diff --git a/simfab.cc b/simfab.cc
index e542775..bb759b8 100644
--- a/simfab.cc
+++ b/simfab.cc
@@ -2299,7 +2299,7 @@ void fabrik_t::verteile_waren(const uint32 produkt)
// 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;
diff --git a/simmain.cc b/simmain.cc
index 2c21a04..e880288 100644
--- a/simmain.cc
+++ b/simmain.cc
@@ -486,8 +486,9 @@ int simu_main(int argc, char** argv)
strcat( env_t::program_dir, path_sep );
}
else {
- strcpy( env_t::program_dir, argv[0] );
- *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
+// strcpy( env_t::program_dir, argv[0] );
+// *(strrchr( env_t::program_dir, path_sep[0] )+1) = 0;
+ strcpy(env_t::program_dir, "/usr/share/games/simutrans/");
#ifdef __APPLE__
// change working directory from binary dir to bundle dir
diff --git a/simsys.cc b/simsys.cc
index 7c9975c..e81f56b 100644
--- a/simsys.cc
+++ b/simsys.cc
@@ -168,7 +168,7 @@ char const* dr_query_homedir()
find_directory(B_USER_DIRECTORY, &userDir);
sprintf(buffer, "%s/simutrans", userDir.Path());
#else
- sprintf(buffer, "%s/simutrans", getenv("HOME"));
+ sprintf(buffer, "%s/.simutrans", getenv("HOME"));
#endif
dr_mkdir(buffer);
diff --git a/simtool.h b/simtool.h
index 6873497..414fa1a 100644
--- a/simtool.h
+++ b/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/simversion.h b/simversion.h
index 10d1026..cf9de57 100644
--- a/simversion.h
+++ b/simversion.h
@@ -45,7 +45,7 @@
#define VERSION_NUMBER QUOTEME(SIM_VERSION_MAJOR) "." QUOTEME(SIM_VERSION_MINOR) SIM_VERSION_PATCH_STRING SIM_VERSION_BUILD_STRING
-#define VERSION_DATE __DATE__
+#define VERSION_DATE ""
#define SAVEGAME_PREFIX "Simutrans "
#define XML_SAVEGAME_PREFIX "<?xml version=\"1.0\"?>"
diff --git a/squirrel/sqstdlib/sqstdstring.cc b/squirrel/sqstdlib/sqstdstring.cc
index 21900bf..640a7e7 100644
--- a/squirrel/sqstdlib/sqstdstring.cc
+++ b/squirrel/sqstdlib/sqstdstring.cc
@@ -87,7 +87,7 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
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;
diff --git a/utils/sha1.cc b/utils/sha1.cc
new file mode 100644
index 0000000..aaf9c06
--- /dev/null
+++ b/utils/sha1.cc
@@ -0,0 +1,54 @@
+/*
+ * sha1.cc
+ *
+ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
+ *
+ * This file may be used under the Artistic license.
+ */
+
+#include "sha1.h"
+#include "../simtypes.h"
+#include <stdexcept>
+
+SHA1::SHA1()
+{
+ EVP_MD_CTX_init(&m_md_ctx);
+ Reset();
+}
+
+SHA1::~SHA1()
+{
+ EVP_MD_CTX_cleanup(&m_md_ctx);
+}
+
+void SHA1::Reset()
+{
+ if (!EVP_DigestInit_ex(&m_md_ctx, EVP_sha1(), 0))
+ throw std::runtime_error("EVP_DigestInit_ex failed.");
+}
+
+bool SHA1::Result(unsigned char *md_value)
+{
+ bool ret = EVP_DigestFinal_ex(&m_md_ctx, md_value, 0);
+
+#ifndef SIM_BIG_ENDIAN
+ uint32 *hash = reinterpret_cast<uint32*>(md_value);
+ for (size_t o = 0; o < 5; ++o) {
+ hash[o] = hash[o] << 16 | hash[o] >> 16;
+ hash[o] = (hash[o] << 8 & 0xff00ff00) | (hash[o] >> 8 & 0x00ff00ff);
+ }
+#endif
+
+ return ret;
+}
+
+void SHA1::Input(const char *mess, unsigned int length)
+{
+ if (!EVP_DigestUpdate(&m_md_ctx, mess, length))
+ throw std::runtime_error("EVP_DigestUpdate failed.");
+}
+
+void SHA1::Input(char mess)
+{
+ Input(&mess, 1);
+}
diff --git a/utils/sha1.h b/utils/sha1.h
new file mode 100644
index 0000000..6ea1f7d
--- /dev/null
+++ b/utils/sha1.h
@@ -0,0 +1,28 @@
+/*
+ * sha1.h
+ *
+ * (C) 2011, Ansgar Burchardt <ansgar at debian.org>
+ *
+ * This file may be used under the Artistic license.
+ */
+
+#ifndef _SHA1_H_
+#define _SHA1_H_
+
+#include "../simtypes.h"
+#include <openssl/evp.h>
+
+class SHA1
+{
+ public:
+ SHA1();
+ ~SHA1();
+ void Reset();
+ bool Result(unsigned char *md_value);
+ void Input(const char *mess, unsigned int length);
+ void Input(char mess);
+ private:
+ EVP_MD_CTX m_md_ctx;
+};
+
+#endif
--
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