The following commit has been merged in the master branch:
commit 6a8ba0febf2de26125bf14b0b575ae2a9b754e41
Author: Ansgar Burchardt <[email protected]>
Date: Fri Mar 12 09:15:41 2010 +0900
Refresh patches.
Refresh patches to apply cleanly against the new upstream release.
Signed-off-by: Ansgar Burchardt <[email protected]>
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index 12e44d1..c22776e 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -102,7 +102,7 @@ Build configuration for Debian
+
--- simutrans.orig/Makefile
+++ simutrans/Makefile
-@@ -64,27 +64,27 @@
+@@ -68,27 +68,27 @@
SDL_CONFIG ?= sdl-config
@@ -148,7 +148,7 @@ Build configuration for Debian
endif
ifeq ($(shell expr $(DEBUG) \>= 2), 1)
CFLAGS += -fno-inline
-@@ -429,5 +429,5 @@
+@@ -433,5 +433,5 @@
makeobj_prog:
diff --git a/debian/patches/revert-svn-1937.diff
b/debian/patches/revert-svn-1937.diff
index 9756789..5aeaedb 100644
--- a/debian/patches/revert-svn-1937.diff
+++ b/debian/patches/revert-svn-1937.diff
@@ -21,7 +21,7 @@ savegames instead of ~/simutrans.
// could not create directory
--- simutrans.orig/simsys_s.cc
+++ simutrans/simsys_s.cc
-@@ -277,11 +277,7 @@
+@@ -287,11 +287,7 @@
}
return NULL;
#else
--
transportation simulator
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
