Author: baby-guest
Date: 2007-08-31 11:06:31 +0000 (Fri, 31 Aug 2007)
New Revision: 4014
Added:
packages/trunk/sdmkun/debian/patches/libbulletml.patch
Modified:
packages/trunk/sdmkun/debian/patches/build.patch
packages/trunk/sdmkun/debian/patches/configuration.patch
packages/trunk/sdmkun/debian/patches/directories.patch
packages/trunk/sdmkun/debian/patches/series
packages/trunk/sdmkun/debian/rules
Log:
Use system's libbulletml
Modified: packages/trunk/sdmkun/debian/patches/build.patch
===================================================================
--- packages/trunk/sdmkun/debian/patches/build.patch 2007-08-31 10:44:02 UTC
(rev 4013)
+++ packages/trunk/sdmkun/debian/patches/build.patch 2007-08-31 11:06:31 UTC
(rev 4014)
@@ -3,14 +3,14 @@
Index: sdmkun-1.5.8.dfsg1/src/Makefile
===================================================================
---- sdmkun-1.5.8.dfsg1.orig/src/Makefile 2007-08-30 18:10:39.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/Makefile 2007-08-30 18:10:57.000000000 +0000
+--- sdmkun-1.5.8.dfsg1.orig/src/Makefile 2006-04-08 01:19:12.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/Makefile 2007-08-31 11:00:53.000000000 +0000
@@ -1,45 +1,41 @@
-INCLUDES += `sdl-config --cflags` -Iutil -Icpu -I. -Ilua-5.0/include
-LIBS += `sdl-config --libs` SDL_kanji_f1b/SDL_kanji.o cpu/libcpu.a
bulletml/libbulletml.a util/libutil.a lua-5.0/lib/*.a
-#LIBS += -llua -llualib
+INCLUDES += `sdl-config --cflags` -Iutil -Icpu -I. -I/usr/include/lua50
-+LIBS += SDL_kanji_f1b/SDL_kanji.o cpu/libcpu.a util/libutil.a
bulletml/libbulletml.a
++LIBS += SDL_kanji_f1b/SDL_kanji.o cpu/libcpu.a util/libutil.a
+LIBS += `sdl-config --libs`
+LIBS += -lbulletml
+LIBS += -llua50 -llualib50
@@ -45,7 +45,8 @@
- $(MAKE) -C lua-5.0
+subdir:
$(MAKE) -C util $(MAKE_WITH)
- $(MAKE) -C bulletml $(MAKE_WITH)
+- $(MAKE) -C bulletml $(MAKE_WITH)
++ #$(MAKE) -C bulletml $(MAKE_WITH)
$(MAKE) -C cpu $(MAKE_WITH)
$(MAKE) -C SDL_kanji_f1b $(MAKE_WITH)
@@ -59,14 +60,14 @@
$(MAKE) clean -C util
- $(MAKE) clean -C bulletml
$(MAKE) clean -C cpu
-+ $(MAKE) clean -C bulletml
++ #$(MAKE) clean -C bulletml
$(MAKE) clean -C SDL_kanji_f1b
rm -f $(OBJS) sdmkun
Index: sdmkun-1.5.8.dfsg1/src/select.cc
===================================================================
---- sdmkun-1.5.8.dfsg1.orig/src/select.cc 2007-08-30 18:10:39.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/select.cc 2007-08-30 18:11:54.000000000 +0000
+--- sdmkun-1.5.8.dfsg1.orig/src/select.cc 2003-10-22 03:28:07.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/select.cc 2007-08-31 11:02:32.000000000 +0000
@@ -9,6 +9,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/functional.hpp>
@@ -88,8 +89,8 @@
std::vector<std::string> strs;
Index: sdmkun-1.5.8.dfsg1/src/cpu/Makefile
===================================================================
---- sdmkun-1.5.8.dfsg1.orig/src/cpu/Makefile 2007-08-30 18:10:39.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/cpu/Makefile 2007-08-30 18:10:57.000000000
+0000
+--- sdmkun-1.5.8.dfsg1.orig/src/cpu/Makefile 2004-03-25 19:22:00.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/cpu/Makefile 2007-08-31 08:22:39.000000000
+0000
@@ -5,6 +5,7 @@
SOURCES=$(wildcard *.cc)
OBJS=$(SOURCES:.cc=.o)
Modified: packages/trunk/sdmkun/debian/patches/configuration.patch
===================================================================
--- packages/trunk/sdmkun/debian/patches/configuration.patch 2007-08-31
10:44:02 UTC (rev 4013)
+++ packages/trunk/sdmkun/debian/patches/configuration.patch 2007-08-31
11:06:31 UTC (rev 4014)
@@ -3,8 +3,8 @@
Index: sdmkun-1.5.8.dfsg1/save/conf
===================================================================
---- sdmkun-1.5.8.dfsg1.orig/save/conf 2007-08-31 07:37:48.000000000 +0000
-+++ sdmkun-1.5.8.dfsg1/save/conf 2007-08-31 07:38:14.000000000 +0000
+--- sdmkun-1.5.8.dfsg1.orig/save/conf 2007-08-31 08:22:32.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/save/conf 2007-08-31 08:22:39.000000000 +0000
@@ -1,6 +1,7 @@
bullet = 0
bullet_density = 100
Modified: packages/trunk/sdmkun/debian/patches/directories.patch
===================================================================
--- packages/trunk/sdmkun/debian/patches/directories.patch 2007-08-31
10:44:02 UTC (rev 4013)
+++ packages/trunk/sdmkun/debian/patches/directories.patch 2007-08-31
11:06:31 UTC (rev 4014)
@@ -4,7 +4,7 @@
Index: sdmkun-1.5.8.dfsg1/src/bulletinfo.cc
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/bulletinfo.cc 2006-04-08 01:30:06.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/bulletinfo.cc 2007-08-31 07:37:06.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/bulletinfo.cc 2007-08-31 08:22:39.000000000
+0000
@@ -18,6 +18,11 @@
# include <dirent.h>
#endif
@@ -145,7 +145,7 @@
Index: sdmkun-1.5.8.dfsg1/src/conf.cc
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/conf.cc 2006-04-01 12:49:06.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/conf.cc 2007-08-31 07:37:06.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/src/conf.cc 2007-08-31 08:22:39.000000000 +0000
@@ -27,6 +27,11 @@
#include <getopt.h>
#endif
@@ -179,7 +179,7 @@
Index: sdmkun-1.5.8.dfsg1/src/conf.h
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/conf.h 2003-10-21 07:47:58.000000000 +0000
-+++ sdmkun-1.5.8.dfsg1/src/conf.h 2007-08-31 07:37:06.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/src/conf.h 2007-08-31 08:22:39.000000000 +0000
@@ -65,7 +65,7 @@
bool isReplay() const { return replay_; }
const std::string& title() const { return title_; }
@@ -192,7 +192,7 @@
Index: sdmkun-1.5.8.dfsg1/src/enemy.cc
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/enemy.cc 2004-04-10 23:50:35.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/enemy.cc 2007-08-31 07:37:06.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/src/enemy.cc 2007-08-31 11:02:28.000000000 +0000
@@ -111,8 +111,8 @@
parseActionFile(is);
}
@@ -207,7 +207,7 @@
Index: sdmkun-1.5.8.dfsg1/src/game.cc
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/game.cc 2004-07-22 10:40:23.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/game.cc 2007-08-31 07:37:06.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/src/game.cc 2007-08-31 08:22:39.000000000 +0000
@@ -27,6 +27,11 @@
#include <SDL.h>
@@ -255,8 +255,8 @@
initBMP();
Index: sdmkun-1.5.8.dfsg1/src/select.cc
===================================================================
---- sdmkun-1.5.8.dfsg1.orig/src/select.cc 2007-08-31 07:37:06.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/select.cc 2007-08-31 07:37:06.000000000 +0000
+--- sdmkun-1.5.8.dfsg1.orig/src/select.cc 2007-08-31 08:22:39.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/select.cc 2007-08-31 08:22:39.000000000 +0000
@@ -21,13 +21,32 @@
// #include ���Ȃ������Ȃ����Ǝv���B
#include <ctype.h>
@@ -427,7 +427,7 @@
Index: sdmkun-1.5.8.dfsg1/src/dmkun.cc
===================================================================
--- sdmkun-1.5.8.dfsg1.orig/src/dmkun.cc 2004-03-25 19:26:48.000000000
+0000
-+++ sdmkun-1.5.8.dfsg1/src/dmkun.cc 2007-08-31 07:37:06.000000000 +0000
++++ sdmkun-1.5.8.dfsg1/src/dmkun.cc 2007-08-31 08:22:39.000000000 +0000
@@ -13,6 +13,12 @@
#include <dir.h>
#endif
Added: packages/trunk/sdmkun/debian/patches/libbulletml.patch
===================================================================
--- packages/trunk/sdmkun/debian/patches/libbulletml.patch
(rev 0)
+++ packages/trunk/sdmkun/debian/patches/libbulletml.patch 2007-08-31
11:06:31 UTC (rev 4014)
@@ -0,0 +1,40 @@
+# Copyright (C) 2007 Miriam Ruiz <[EMAIL PROTECTED]>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: sdmkun-1.5.8.dfsg1/src/enemy.cc
+===================================================================
+--- sdmkun-1.5.8.dfsg1.orig/src/enemy.cc 2007-08-31 09:40:11.000000000
+0000
++++ sdmkun-1.5.8.dfsg1/src/enemy.cc 2007-08-31 10:59:53.000000000 +0000
+@@ -65,7 +65,7 @@
+ TiXmlElement* elem =
node2->ToElement();
+ if (elem != 0) {
+ if (elem->Value() ==
"bulletml") {
+- bs = new
BulletMLParserTinyXML(node2,filename);
++ bs = new
BulletMLParserTinyXML(filename.c_str());
+ bs->build();
+ break;
+ }
+@@ -92,12 +92,12 @@
+ throw UserError("too
short bml file");
+ }
+ }
+- bs = new BulletMLParserTinyXML(fp,
filename);
++ bs = new
BulletMLParserTinyXML(filename.c_str());
+ bs->build();
+ }
+ }
+ else {
+- bs = new BulletMLParserTinyXML(filename);
++ bs = new
BulletMLParserTinyXML(filename.c_str());
+ bs->build();
+ }
+ commands_.push_back(bs);
+@@ -145,7 +145,7 @@
+ else check(0, "Unknown \"Commands\" argument" + args);
+ }
+ else {
+- BulletMLParser* bs = new BulletMLParserTinyXML(command);
++ BulletMLParser* bs = new
BulletMLParserTinyXML(command.c_str());
+ bs->build();
+ commands_.push_back(bs);
+
Modified: packages/trunk/sdmkun/debian/patches/series
===================================================================
--- packages/trunk/sdmkun/debian/patches/series 2007-08-31 10:44:02 UTC (rev
4013)
+++ packages/trunk/sdmkun/debian/patches/series 2007-08-31 11:06:31 UTC (rev
4014)
@@ -1,3 +1,4 @@
build.patch
directories.patch
configuration.patch
+libbulletml.patch
Modified: packages/trunk/sdmkun/debian/rules
===================================================================
--- packages/trunk/sdmkun/debian/rules 2007-08-31 10:44:02 UTC (rev 4013)
+++ packages/trunk/sdmkun/debian/rules 2007-08-31 11:06:31 UTC (rev 4014)
@@ -3,10 +3,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g -rdynamic
+CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ CFLAGS += -O0 -rdynamic
else
CFLAGS += -O2 -DNDEBUG
endif
@@ -19,7 +19,7 @@
rm -r src/boost
mkdir src/boost
mv _compose.hpp src/boost/compose.hpp
- #rm -r src/bulletml
+ rm -r src/bulletml
rm -r src/lua-5.0
rm -r src/regmod
$(MAKE) -f /usr/share/quilt/quilt.make patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
