[simutrans] 01/01: refresh patches
Jörg Frings-Fürst
jff-guest at moszumanska.debian.org
Sun Feb 7 08:48:41 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 ee8705bb7f80953e9e67b4b34ed501409be9659c
Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Date: Sun Feb 7 09:48:20 2016 +0100
refresh patches
---
debian/changelog | 9 +++
debian/patches/0005-typo.patch | 13 ----
debian/patches/0100-path_for_game-data.patch | 20 +++---
debian/patches/0105-revert-svn-1937.diff | 16 ++---
debian/patches/0110-sha1-replacement.diff | 14 ----
debian/patches/0500-config.diff | 95 ----------------------------
debian/patches/0505-link-less-libraries.diff | 24 +++----
debian/patches/reproducible-build.patch | 22 +++----
debian/patches/series | 4 +-
9 files changed, 53 insertions(+), 164 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e3fcacc..9392f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+simutrans (120.1.3+repack-1) UNRELEASED; urgency=low
+
+ [ Jörg Frings-Fürst ]
+ * New upstream release.
+ * Remove upstream applied 0510-missing_uncommon_mk.patch.
+ * Refresh patches.
+
+ -- Jörg Frings-Fürst <debian at jff-webhosting.net> Sat, 06 Feb 2016 05:34:17 +0100
+
simutrans (120.1.1+repack-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/0005-typo.patch b/debian/patches/0005-typo.patch
index 7d75bbc..46161a3 100644
--- a/debian/patches/0005-typo.patch
+++ b/debian/patches/0005-typo.patch
@@ -3,16 +3,3 @@ Author: Jörg Frings-Fürst <debian at jff-webhosting.net>
Last-Update: 2015-05-16
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-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
- 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/debian/patches/0100-path_for_game-data.patch b/debian/patches/0100-path_for_game-data.patch
index e8efff7..8d6e5c7 100644
--- a/debian/patches/0100-path_for_game-data.patch
+++ b/debian/patches/0100-path_for_game-data.patch
@@ -9,14 +9,14 @@ Index: trunk/simmain.cc
--- trunk.orig/simmain.cc
+++ trunk/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;
+ 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
+
+ #ifdef __APPLE__
+ // change working directory from binary dir to bundle dir
diff --git a/debian/patches/0105-revert-svn-1937.diff b/debian/patches/0105-revert-svn-1937.diff
index 495b3ef..25ede54 100644
--- a/debian/patches/0105-revert-svn-1937.diff
+++ b/debian/patches/0105-revert-svn-1937.diff
@@ -10,11 +10,11 @@ Index: trunk/simsys.cc
--- trunk.orig/simsys.cc
+++ trunk/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);
+ 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/debian/patches/0110-sha1-replacement.diff b/debian/patches/0110-sha1-replacement.diff
index 18ff6f0..1bf4ffd 100644
--- a/debian/patches/0110-sha1-replacement.diff
+++ b/debian/patches/0110-sha1-replacement.diff
@@ -1,20 +1,6 @@
From: Ansgar Burchardt <ansgar at debian.org>
Date: Wed, 16 Feb 2011 21:28:04 +0100
Subject: Provide replacement for non-free SHA-1 implementation
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -18,6 +18,9 @@ ifeq ($(findstring $(OSTYPE), $(OSTYPES)
- $(error Unkown OSTYPE "$(OSTYPE)", must be one of "$(OSTYPES)")
- endif
-
-+# for utils/sha1.*
-+LIBS += -lcrypto
-+
- ifeq ($(OSTYPE),amiga)
- STD_LIBS ?= -lunix -lSDL_mixer -lsmpeg -lvorbisfile -lvorbis -logg
- CFLAGS += -mcrt=newlib -DUSE_C -DSIM_BIG_ENDIAN -gstabs+
Index: trunk/utils/sha1.cc
===================================================================
--- /dev/null
diff --git a/debian/patches/0500-config.diff b/debian/patches/0500-config.diff
index 1baaf51..0125a4e 100644
--- a/debian/patches/0500-config.diff
+++ b/debian/patches/0500-config.diff
@@ -2,56 +2,6 @@ Build configuration for Debian
@DPATCH@
-Index: trunk/makeobj/Makefile
-===================================================================
---- trunk.orig/makeobj/Makefile
-+++ trunk/makeobj/Makefile
-@@ -42,16 +42,16 @@ ifeq ($(OSTYPE),mac)
- CXXFLAGS += -DUSE_HW -DUSE_C
- 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
-+#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
-
- ifdef DEBUG
- ifeq ($(shell expr $(DEBUG) \>= 1), 1)
-@@ -77,8 +77,8 @@ ifneq ($(PROFILE),)
- LDFLAGS += -pg
- endif
-
--CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -Wstrict-prototypes $(OS_INC) $(OS_OPT) $(FLAGS)
--CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align $(OS_INC) $(OS_OPT) $(FLAGS)
-+CFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -Wstrict-prototypes -D_FORTIFY_SOURCE=2 $(OS_INC) $(OS_OPT) $(FLAGS)
-+CXXFLAGS += -Wall -W -Wcast-qual -Wpointer-arith -Wcast-align -D_FORTIFY_SOURCE=2 $(OS_INC) $(OS_OPT) $(FLAGS)
-
- # SOLO_SOURCES contains files which are unique to makeobj;
- # SHARED_SOURCES contains those with the exact same object code in makeobj and simutrans;
-@@ -126,6 +126,7 @@ VARIANT_SOURCES += ../utils/log.cc
- SOURCES ?= $(SOLO_SOURCES) $(SHARED_SOURCES) $(VARIANT_SOURCES)
-
- BUILDDIR ?= build/$(CFG)
-+
- TOOL = makeobj
- PROG ?= makeobj
-
Index: trunk/config.default
===================================================================
--- /dev/null
@@ -134,48 +84,3 @@ Index: trunk/config.default
+ifneq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+ FLAGS += -DUSE_C
+endif
-Index: trunk/simtypes.h
-===================================================================
---- trunk.orig/simtypes.h
-+++ trunk/simtypes.h
-@@ -8,6 +8,13 @@
-
- #include "utils/for.h"
-
-+#include <endian.h>
-+#undef LITTLE_ENDIAN //endian.h gives these definitions we don't want
-+#undef BIG_ENDIAN
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+ #define SIM_BIG_ENDIAN
-+#endif
-+
- #if defined _MSC_VER
- # if _MSC_VER <= 1200
- # error "Simutrans cannot be compiled with Visual C++ 6.0 or earlier."
-Index: trunk/Makefile
-===================================================================
---- trunk.orig/Makefile
-+++ trunk/Makefile
-@@ -71,14 +71,14 @@ ALLEGRO_CONFIG ?= allegro-config
- SDL_CONFIG ?= sdl-config
- SDL2_CONFIG ?= sdl2-config
-
--ifneq ($(OPTIMISE),)
-- CFLAGS += -O3
-- ifeq ($(findstring $(OSTYPE), amiga),)
-- CFLAGS += -minline-all-stringops
-- endif
--else
-- CFLAGS += -O
--endif
-+#ifneq ($(OPTIMISE),)
-+# CFLAGS += -O3
-+# ifeq ($(findstring $(OSTYPE), amiga),)
-+# CFLAGS += -minline-all-stringops
-+# endif
-+#else
-+# CFLAGS += -O
-+#endif
-
- ifdef DEBUG
- ifeq ($(shell expr $(DEBUG) \>= 1), 1)
diff --git a/debian/patches/0505-link-less-libraries.diff b/debian/patches/0505-link-less-libraries.diff
index 4e1abb1..8535b8f 100644
--- a/debian/patches/0505-link-less-libraries.diff
+++ b/debian/patches/0505-link-less-libraries.diff
@@ -6,14 +6,16 @@ This fixes the following warnings from dpkg-shlibdeps:
dpkg-shlibdeps: warning: dependency on libz.so.1 could be avoided if "debian/simutrans-makeobj/usr/games/makeobj" were not uselessly linked against it (they use none of its symbols).
dpkg-shlibdeps: warning: dependency on libbz2.so.1.0 could be avoided if "debian/simutrans-makeobj/usr/games/makeobj" were not uselessly linked against it (they use none of its symbols).
---- simutrans.orig/makeobj/Makefile
-+++ simutrans/makeobj/Makefile
-@@ -21,7 +21,7 @@
- CFLAGS += -DMAKEOBJ
- CXXFLAGS += -DMAKEOBJ
-
--STD_LIBS += -lz -lbz2 -lpng
-+STD_LIBS += -lpng
-
- ifeq ($(OSTYPE),cygwin)
- OS_INC ?= -I/usr/include/mingw
+Index: trunk/makeobj/Makefile
+===================================================================
+--- trunk.orig/makeobj/Makefile
++++ trunk/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/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
index 95877b6..98fc13f 100644
--- a/debian/patches/reproducible-build.patch
+++ b/debian/patches/reproducible-build.patch
@@ -8,16 +8,16 @@ See also https://wiki.debian.org/ReproducibleBuilds
simversion.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/simversion.h b/simversion.h
-index 0ead8ad..78034b3 100644
---- a/simversion.h
-+++ b/simversion.h
+Index: trunk/simversion.h
+===================================================================
+--- trunk.orig/simversion.h
++++ trunk/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_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\"?>"
+
+ #define SAVEGAME_PREFIX "Simutrans "
+ #define XML_SAVEGAME_PREFIX "<?xml version=\"1.0\"?>"
diff --git a/debian/patches/series b/debian/patches/series
index dae1c24..41aeeec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
-0005-typo.patch
+#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
-0510-missing_uncommon_mk.patch
+#0510-missing_uncommon_mk.patch
reproducible-build.patch
--
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