r4000 - in packages/trunk/rrootage/debian: . patches
Miriam Ruiz
baby-guest at alioth.debian.org
Wed Aug 29 21:04:21 UTC 2007
Author: baby-guest
Date: 2007-08-29 21:04:21 +0000 (Wed, 29 Aug 2007)
New Revision: 4000
Added:
packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch
packages/trunk/rrootage/debian/patches/08_windowed_mode.patch
packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch
Removed:
packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch
packages/trunk/rrootage/debian/patches/08_use_system_bulletml.patch
packages/trunk/rrootage/debian/patches/09_windowed_mode.patch
Modified:
packages/trunk/rrootage/debian/patches/series
packages/trunk/rrootage/debian/rrootage.6
packages/trunk/rrootage/debian/rules
Log:
It works now!
Deleted: packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -1,13 +0,0 @@
-Index: rrootage-0.23a/src/screen.c
-===================================================================
---- rrootage-0.23a.orig/src/screen.c 2007-08-29 19:50:14.000000000 +0000
-+++ rrootage-0.23a/src/screen.c 2007-08-29 19:50:14.000000000 +0000
-@@ -128,7 +128,7 @@
- static GLuint titleTexture;
- #define TITLE_BMP "title.bmp"
-
--int resolution = MEDIUM_RESOLUTION;
-+int resolution = HIGH_RESOLUTION;
- int windowMode = 0;
- int brightness = DEFAULT_BRIGHTNESS;
- Uint8 *keys;
Copied: packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch (from rev 3996, packages/trunk/rrootage/debian/patches/08_use_system_bulletml.patch)
===================================================================
--- packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch (rev 0)
+++ packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -0,0 +1,99 @@
+# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: rrootage-0.23a/src/makefile.lin
+===================================================================
+--- rrootage-0.23a.orig/src/makefile.lin 2007-08-29 20:13:42.000000000 +0000
++++ rrootage-0.23a/src/makefile.lin 2007-08-29 20:16:12.000000000 +0000
+@@ -11,12 +11,12 @@
+
+ DEFAULT_CFLAGS = `sdl-config --cflags`
+ #LDFLAGS = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
+-LDFLAGS = `sdl-config --libs` -L. -lglut bulletml/libbulletml.a -lSDL_mixer -lstdc++
++LDFLAGS = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -lstdc++
+ #-lglu32 -lopengl32 -lmingw32 -lmingwex
+-MORE_CFLAGS = -DLINUX -O3 -Wall
++MORE_CFLAGS = -O2 -Wall
+
+-CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
+-CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/
++CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
++CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
+
+ OBJS = $(NAME).$(O) \
+ foe.$(O) foecommand.$(O) barragemanager.$(O) boss.$(O) ship.$(O) laser.$(O) \
+@@ -31,5 +31,6 @@
+
+ #$(NAME)_res.o: $(NAME).rc
+ # windres -i $(NAME).rc -o $(NAME)_res.o
++
+ clean:
+ $(RM) $(PROG) *.$(O)
+Index: rrootage-0.23a/src/barragemanager.h
+===================================================================
+--- rrootage-0.23a.orig/src/barragemanager.h 2007-08-29 20:14:22.000000000 +0000
++++ rrootage-0.23a/src/barragemanager.h 2007-08-29 20:15:35.000000000 +0000
+@@ -12,9 +12,9 @@
+ #ifndef BARRAGEMANAGER_H_
+ #define BARRAGEMANAGER_H_
+
+-#include "bulletml/bulletmlparser.h"
+-#include "bulletml/bulletmlparser-tinyxml.h"
+-#include "bulletml/bulletmlrunner.h"
++#include <bulletml/bulletmlparser.h>
++#include <bulletml/bulletmlparser-tinyxml.h>
++#include <bulletml/bulletmlrunner.h>
+
+ typedef struct {
+ BulletMLParser *bulletml;
+Index: rrootage-0.23a/src/foe.h
+===================================================================
+--- rrootage-0.23a.orig/src/foe.h 2007-08-29 20:14:53.000000000 +0000
++++ rrootage-0.23a/src/foe.h 2007-08-29 20:16:05.000000000 +0000
+@@ -17,9 +17,9 @@
+ #include "foe_mtd.h"
+ }
+
+-#include "bulletml/bulletmlparser.h"
+-#include "bulletml/bulletmlparser-tinyxml.h"
+-#include "bulletml/bulletmlrunner.h"
++#include <bulletml/bulletmlparser.h>
++#include <bulletml/bulletmlparser-tinyxml.h>
++#include <bulletml/bulletmlrunner.h>
+ #include "foecommand.h"
+ #include "barragemanager.h"
+ #include "boss.h"
+Index: rrootage-0.23a/src/foecommand.cc
+===================================================================
+--- rrootage-0.23a.orig/src/foecommand.cc 2007-08-29 20:14:28.000000000 +0000
++++ rrootage-0.23a/src/foecommand.cc 2007-08-29 20:15:44.000000000 +0000
+@@ -9,9 +9,9 @@
+ *
+ * @version $Revision: 1.2 $
+ */
+-#include "bulletml/bulletmlparser.h"
+-#include "bulletml/bulletmlparser-tinyxml.h"
+-#include "bulletml/bulletmlrunner.h"
++#include <bulletml/bulletmlparser.h>
++#include <bulletml/bulletmlparser-tinyxml.h>
++#include <bulletml/bulletmlrunner.h>
+ #include "foe.h"
+
+ extern "C" {
+Index: rrootage-0.23a/src/foecommand.h
+===================================================================
+--- rrootage-0.23a.orig/src/foecommand.h 2007-08-29 20:14:34.000000000 +0000
++++ rrootage-0.23a/src/foecommand.h 2007-08-29 20:15:54.000000000 +0000
+@@ -12,9 +12,9 @@
+ #ifndef FOECOMMAND_H_
+ #define FOECOMMAND_H_
+
+-#include "bulletml/bulletmlparser.h"
+-#include "bulletml/bulletmlparser-tinyxml.h"
+-#include "bulletml/bulletmlrunner.h"
++#include <bulletml/bulletmlparser.h>
++#include <bulletml/bulletmlparser-tinyxml.h>
++#include <bulletml/bulletmlrunner.h>
+ #include "foe.h"
+
+ #define COMMAND_SCREEN_SPD_RATE 512
Deleted: packages/trunk/rrootage/debian/patches/08_use_system_bulletml.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/08_use_system_bulletml.patch 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/patches/08_use_system_bulletml.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -1,99 +0,0 @@
-# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
-# Distributed under the same license as the game. See debian/copyright.
-
-Index: rrootage-0.23a/src/makefile.lin
-===================================================================
---- rrootage-0.23a.orig/src/makefile.lin 2007-08-29 20:13:42.000000000 +0000
-+++ rrootage-0.23a/src/makefile.lin 2007-08-29 20:16:12.000000000 +0000
-@@ -11,12 +11,12 @@
-
- DEFAULT_CFLAGS = `sdl-config --cflags`
- #LDFLAGS = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
--LDFLAGS = `sdl-config --libs` -L. -lglut bulletml/libbulletml.a -lSDL_mixer -lstdc++
-+LDFLAGS = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -lstdc++
- #-lglu32 -lopengl32 -lmingw32 -lmingwex
--MORE_CFLAGS = -DLINUX -O3 -Wall
-+MORE_CFLAGS = -O2 -Wall
-
--CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
--CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/
-+CFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
-+CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
-
- OBJS = $(NAME).$(O) \
- foe.$(O) foecommand.$(O) barragemanager.$(O) boss.$(O) ship.$(O) laser.$(O) \
-@@ -31,5 +31,6 @@
-
- #$(NAME)_res.o: $(NAME).rc
- # windres -i $(NAME).rc -o $(NAME)_res.o
-+
- clean:
- $(RM) $(PROG) *.$(O)
-Index: rrootage-0.23a/src/barragemanager.h
-===================================================================
---- rrootage-0.23a.orig/src/barragemanager.h 2007-08-29 20:14:22.000000000 +0000
-+++ rrootage-0.23a/src/barragemanager.h 2007-08-29 20:15:35.000000000 +0000
-@@ -12,9 +12,9 @@
- #ifndef BARRAGEMANAGER_H_
- #define BARRAGEMANAGER_H_
-
--#include "bulletml/bulletmlparser.h"
--#include "bulletml/bulletmlparser-tinyxml.h"
--#include "bulletml/bulletmlrunner.h"
-+#include <bulletml/bulletmlparser.h>
-+#include <bulletml/bulletmlparser-tinyxml.h>
-+#include <bulletml/bulletmlrunner.h>
-
- typedef struct {
- BulletMLParser *bulletml;
-Index: rrootage-0.23a/src/foe.h
-===================================================================
---- rrootage-0.23a.orig/src/foe.h 2007-08-29 20:14:53.000000000 +0000
-+++ rrootage-0.23a/src/foe.h 2007-08-29 20:16:05.000000000 +0000
-@@ -17,9 +17,9 @@
- #include "foe_mtd.h"
- }
-
--#include "bulletml/bulletmlparser.h"
--#include "bulletml/bulletmlparser-tinyxml.h"
--#include "bulletml/bulletmlrunner.h"
-+#include <bulletml/bulletmlparser.h>
-+#include <bulletml/bulletmlparser-tinyxml.h>
-+#include <bulletml/bulletmlrunner.h>
- #include "foecommand.h"
- #include "barragemanager.h"
- #include "boss.h"
-Index: rrootage-0.23a/src/foecommand.cc
-===================================================================
---- rrootage-0.23a.orig/src/foecommand.cc 2007-08-29 20:14:28.000000000 +0000
-+++ rrootage-0.23a/src/foecommand.cc 2007-08-29 20:15:44.000000000 +0000
-@@ -9,9 +9,9 @@
- *
- * @version $Revision: 1.2 $
- */
--#include "bulletml/bulletmlparser.h"
--#include "bulletml/bulletmlparser-tinyxml.h"
--#include "bulletml/bulletmlrunner.h"
-+#include <bulletml/bulletmlparser.h>
-+#include <bulletml/bulletmlparser-tinyxml.h>
-+#include <bulletml/bulletmlrunner.h>
- #include "foe.h"
-
- extern "C" {
-Index: rrootage-0.23a/src/foecommand.h
-===================================================================
---- rrootage-0.23a.orig/src/foecommand.h 2007-08-29 20:14:34.000000000 +0000
-+++ rrootage-0.23a/src/foecommand.h 2007-08-29 20:15:54.000000000 +0000
-@@ -12,9 +12,9 @@
- #ifndef FOECOMMAND_H_
- #define FOECOMMAND_H_
-
--#include "bulletml/bulletmlparser.h"
--#include "bulletml/bulletmlparser-tinyxml.h"
--#include "bulletml/bulletmlrunner.h"
-+#include <bulletml/bulletmlparser.h>
-+#include <bulletml/bulletmlparser-tinyxml.h>
-+#include <bulletml/bulletmlrunner.h>
- #include "foe.h"
-
- #define COMMAND_SCREEN_SPD_RATE 512
Copied: packages/trunk/rrootage/debian/patches/08_windowed_mode.patch (from rev 3996, packages/trunk/rrootage/debian/patches/09_windowed_mode.patch)
===================================================================
--- packages/trunk/rrootage/debian/patches/08_windowed_mode.patch (rev 0)
+++ packages/trunk/rrootage/debian/patches/08_windowed_mode.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -0,0 +1,35 @@
+Index: rrootage-0.23a/src/rr.c
+===================================================================
+--- rrootage-0.23a.orig/src/rr.c 2007-08-29 21:01:36.000000000 +0000
++++ rrootage-0.23a/src/rr.c 2007-08-29 21:02:30.000000000 +0000
+@@ -195,7 +195,7 @@
+ static int accframe = 0;
+
+ static void usage(char *argv0) {
+- fprintf(stderr, "Usage: %s [-lowres|-mediumres|-highres] [-nosound] [-window] [-reverse] [-nowait] [-accframe]\n", argv0);
++ fprintf(stderr, "Usage: %s [-lowres|-mediumres|-highres] [-nosound] [-window] [-fullscreen] [-reverse] [-nowait] [-accframe]\n", argv0);
+ }
+
+ static void parseArgs(int argc, char *argv[]) {
+@@ -211,6 +211,8 @@
+ noSound = 1;
+ } else if ( strcmp(argv[i], "-window") == 0 ) {
+ windowMode = 1;
++ } else if ( strcmp(argv[i], "-fullscreen") == 0 ) {
++ windowMode = 0;
+ } else if ( strcmp(argv[i], "-reverse") == 0 ) {
+ buttonReversed = 1;
+ }
+Index: rrootage-0.23a/src/screen.c
+===================================================================
+--- rrootage-0.23a.orig/src/screen.c 2007-08-29 21:01:43.000000000 +0000
++++ rrootage-0.23a/src/screen.c 2007-08-29 21:02:41.000000000 +0000
+@@ -129,7 +129,7 @@
+ #define TITLE_BMP "title.bmp"
+
+ int resolution = MEDIUM_RESOLUTION;
+-int windowMode = 0;
++int windowMode = 1;
+ int brightness = DEFAULT_BRIGHTNESS;
+ Uint8 *keys;
+ SDL_Joystick *stick = NULL;
Copied: packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch (from rev 3999, packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch)
===================================================================
--- packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch (rev 0)
+++ packages/trunk/rrootage/debian/patches/09_rrootage_make_highres_default.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -0,0 +1,13 @@
+Index: rrootage-0.23a/src/screen.c
+===================================================================
+--- rrootage-0.23a.orig/src/screen.c 2007-08-29 19:50:14.000000000 +0000
++++ rrootage-0.23a/src/screen.c 2007-08-29 19:50:14.000000000 +0000
+@@ -128,7 +128,7 @@
+ static GLuint titleTexture;
+ #define TITLE_BMP "title.bmp"
+
+-int resolution = MEDIUM_RESOLUTION;
++int resolution = HIGH_RESOLUTION;
+ int windowMode = 0;
+ int brightness = DEFAULT_BRIGHTNESS;
+ Uint8 *keys;
Deleted: packages/trunk/rrootage/debian/patches/09_windowed_mode.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/09_windowed_mode.patch 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/patches/09_windowed_mode.patch 2007-08-29 21:04:21 UTC (rev 4000)
@@ -1,35 +0,0 @@
-Index: rrootage-0.23a/src/rr.c
-===================================================================
---- rrootage-0.23a.orig/src/rr.c 2007-08-29 20:34:12.000000000 +0000
-+++ rrootage-0.23a/src/rr.c 2007-08-29 20:34:44.000000000 +0000
-@@ -195,7 +195,7 @@
- static int accframe = 0;
-
- static void usage(char *argv0) {
-- fprintf(stderr, "Usage: %s [-lowres|-mediumres|-highres] [-nosound] [-window] [-reverse] [-nowait] [-accframe]\n", argv0);
-+ fprintf(stderr, "Usage: %s [-lowres|-mediumres|-highres] [-nosound] [-window] [-fullscreen] [-reverse] [-nowait] [-accframe]\n", argv0);
- }
-
- static void parseArgs(int argc, char *argv[]) {
-@@ -211,6 +211,8 @@
- noSound = 1;
- } else if ( strcmp(argv[i], "-window") == 0 ) {
- windowMode = 1;
-+ } else if ( strcmp(argv[i], "-fullscreen") == 0 ) {
-+ windowMode = 0;
- } else if ( strcmp(argv[i], "-reverse") == 0 ) {
- buttonReversed = 1;
- }
-Index: rrootage-0.23a/src/screen.c
-===================================================================
---- rrootage-0.23a.orig/src/screen.c 2007-08-29 20:33:26.000000000 +0000
-+++ rrootage-0.23a/src/screen.c 2007-08-29 20:33:52.000000000 +0000
-@@ -129,7 +129,7 @@
- #define TITLE_BMP "title.bmp"
-
- int resolution = HIGH_RESOLUTION;
--int windowMode = 0;
-+int windowMode = 1;
- int brightness = DEFAULT_BRIGHTNESS;
- Uint8 *keys;
- SDL_Joystick *stick = NULL;
Modified: packages/trunk/rrootage/debian/patches/series
===================================================================
--- packages/trunk/rrootage/debian/patches/series 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/patches/series 2007-08-29 21:04:21 UTC (rev 4000)
@@ -4,6 +4,6 @@
04_home.patch
05_gcc.patch
06_rrootage_highres.patch
-07_rrootage_make_highres_default.patch
-08_use_system_bulletml.patch
-09_windowed_mode.patch
+07_use_system_bulletml.patch
+08_windowed_mode.patch
+#09_rrootage_make_highres_default.patch
Modified: packages/trunk/rrootage/debian/rrootage.6
===================================================================
--- packages/trunk/rrootage/debian/rrootage.6 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/rrootage.6 2007-08-29 21:04:21 UTC (rev 4000)
@@ -79,7 +79,7 @@
Medium resolution mode.
.TP
.B \-highres
-High resolution mode (default).
+High resolution mode.
.TP
.B \-nosound
Disable sound.
Modified: packages/trunk/rrootage/debian/rules
===================================================================
--- packages/trunk/rrootage/debian/rules 2007-08-29 20:43:08 UTC (rev 3999)
+++ packages/trunk/rrootage/debian/rules 2007-08-29 21:04:21 UTC (rev 4000)
@@ -17,7 +17,7 @@
$(MAKE) -f /usr/share/quilt/quilt.make patch
- #$(MAKE) -C src/bulletml MORE_CFLAGS="$(CFLAGS)"
+ #test -e src/bulletml && $(MAKE) -C src/bulletml MORE_CFLAGS="$(CFLAGS)"
$(MAKE) -C src -f makefile.lin MORE_CFLAGS="$(CFLAGS)"
touch build-stamp
@@ -27,8 +27,8 @@
dh_testroot
rm -f *-stamp
- #$(MAKE) -C src/bulletml clean
- #$(MAKE) -C src/bulletml/tinyxml clean
+ #test -e src/bulletml && $(MAKE) -C src/bulletml clean
+ #test -e src/bulletml/tinyxml && $(MAKE) -C src/bulletml/tinyxml clean
$(MAKE) -C src -f makefile.lin clean
$(MAKE) -f /usr/share/quilt/quilt.make unpatch
More information about the Pkg-games-commits
mailing list