r3993 - in packages/trunk/rrootage/debian: . patches
Miriam Ruiz
baby-guest at alioth.debian.org
Wed Aug 29 20:20:27 UTC 2007
Author: baby-guest
Date: 2007-08-29 20:20:27 +0000 (Wed, 29 Aug 2007)
New Revision: 3993
Added:
packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch
Removed:
packages/trunk/rrootage/debian/patches/06_rrootage_make_highres_default.patch
Modified:
packages/trunk/rrootage/debian/changelog
packages/trunk/rrootage/debian/control
packages/trunk/rrootage/debian/patches/01_makefile.patch
packages/trunk/rrootage/debian/patches/02_data_dir.patch
packages/trunk/rrootage/debian/patches/03_texture_filename.patch
packages/trunk/rrootage/debian/patches/04_home.patch
packages/trunk/rrootage/debian/patches/05_gcc.patch
packages/trunk/rrootage/debian/patches/series
packages/trunk/rrootage/debian/rrootage.6
packages/trunk/rrootage/debian/rules
packages/trunk/rrootage/debian/watch
Log:
Use system libbulletml
Modified: packages/trunk/rrootage/debian/changelog
===================================================================
--- packages/trunk/rrootage/debian/changelog 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/changelog 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,38 +1,22 @@
-rrootage (0.23a-5) UNRELEASED; urgency=low
+rrootage (0.23a-6) unstable; urgency=low
- [ Eddy Petrișor ]
- * Fixed watch file to not be so loose and to track correctly the source
- * Fixed Homepage semifield
+ [Miriam Ruiz]
+ * Handle patches with quilt.
+ * Updated menu.
+ * Added patches for high resolution.
+ * Use external libbulletml library. Added build dependency: libbulletml-dev
- [ Miriam Ruiz ]
- * Modified building system for using quilt.
- * Updated to Standards Version 3.7.2. No changes needed.
- * Upgraded libglut3-dev build-dep to freeglut3-dev (Closes: #394502)
- * Replaced (= ${Source-Version}) by (>= ${source:Version}) to make the
- packages binnmu-friendly.
- * Added patches 06_rrootage_make_highres_default.patch and
- 07_rrootage_highres.patch provided by "Peter De Wachter" <pdewacht at gmail.com>
- to add a high resolution mode and make the game resizable in window mode.
+ -- Miriam Ruiz <little_miry at yahoo.es> Wed, 29 Aug 2007 21:37:59 +0200
- [ Eddy Petrișor ]
- * added missing build-depends on dpkg-dev (>= 1.13.19) since we use
- source:Version (Closes: #396012)
+rrootage (0.23a-5) unstable; urgency=low
- [ Gonéri Le Bouder ]
- * remove Applications from Categorie in the desktop file since it's not
- an official categorie
- * call dh_desktop to run update-desktop-database
- * fix the wathfile
+ * Build-depend on freglut3-dev rather than libglut2-dev. Closes: #394502.
+ * Bump standards version.
+ * Use ${source:Version} rather than ${Source-Version} in dependency on -data
+ package for binNMUability.
- [ Jon Dowland ]
- * update menu section to "Games/Action" for menu policy transition.
- Thanks Linas Žvirblis.
+ -- Dafydd Harries <daf at debian.org> Sat, 28 Oct 2006 16:26:08 +0100
- [ Cyril Brulebois ]
- * Added XS-Vcs-Svn and XS-Vcs-Browser fields in the control file.
-
- -- Jon Dowland <jon at alcopop.org> Thu, 12 Jul 2007 12:05:41 +0100
-
rrootage (0.23a-4) unstable; urgency=low
* Add patch from Martin Michlmayr to allow compilatoin with G++ 4.1.
Modified: packages/trunk/rrootage/debian/control
===================================================================
--- packages/trunk/rrootage/debian/control 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/control 2007-08-29 20:20:27 UTC (rev 3993)
@@ -4,14 +4,12 @@
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Dafydd Harries <daf at debian.org>
Build-Depends: debhelper (>= 4.0.0), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev,
- freeglut3-dev, dpkg-dev (>= 1.13.19)
+ freeglut3-dev, libbulletml-dev
Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/rrootage/
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/rrootage/?op=log
Package: rrootage
Architecture: any
-Depends: ${shlibs:Depends}, rrootage-data (>= ${source:Version})
+Depends: ${shlibs:Depends}, rrootage-data (= ${source:Version})
Description: arcade-style space shooting game
rRootage is an arcade-style vertical shooting game, with music to match.
Avoid the barrage of bullets and destroy the enemy's battle ship with your
@@ -19,8 +17,8 @@
.
rRootage was created by Kenta Cho.
.
- Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html
- Port homepage: http://rrootage.sourceforge.net/
+ Homepage: http://www.asahi-net.or.jp/~cs8k-cyu/windows/rr_e.html
+ Port homepage: http://rrootage.sourceforge.net/
Package: rrootage-data
Architecture: all
Modified: packages/trunk/rrootage/debian/patches/01_makefile.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/01_makefile.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/01_makefile.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,6 +1,11 @@
-diff -ruN rrootage-0.23a.orig/src/makefile.lin rrootage-0.23a.new/src/makefile.lin
---- rrootage-0.23a.orig/src/makefile.lin 2004-06-19 19:09:44.000000000 +0200
-+++ rrootage-0.23a.new/src/makefile.lin 2006-09-22 20:59:31.000000000 +0200
+# Copyright (C) 2005 Miriam Ruiz <little_miry at yahoo.es>
+# Copyright (C) 2005 Dafydd Harries <daf at debian.org>
+# 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 19:48:32.000000000 +0000
++++ rrootage-0.23a/src/makefile.lin 2007-08-29 19:55:02.000000000 +0000
@@ -7,10 +7,11 @@
CC = gcc
CXX = g++
Modified: packages/trunk/rrootage/debian/patches/02_data_dir.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/02_data_dir.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/02_data_dir.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,6 +1,11 @@
-diff -ruN rrootage-0.23a.orig/src/barragemanager.cc rrootage-0.23a.new/src/barragemanager.cc
---- rrootage-0.23a.orig/src/barragemanager.cc 2004-06-19 09:24:22.000000000 +0200
-+++ rrootage-0.23a.new/src/barragemanager.cc 2006-09-22 20:59:31.000000000 +0200
+# Copyright (C) 2005 Miriam Ruiz <little_miry at yahoo.es>
+# Copyright (C) 2005 Dafydd Harries <daf at debian.org>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: rrootage-0.23a/src/barragemanager.cc
+===================================================================
+--- rrootage-0.23a.orig/src/barragemanager.cc 2007-08-29 19:48:32.000000000 +0000
++++ rrootage-0.23a/src/barragemanager.cc 2007-08-29 19:50:13.000000000 +0000
@@ -22,7 +22,7 @@
Barrage barragePattern[BARRAGE_TYPE_NUM][BARRAGE_PATTERN_MAX];
int barragePatternNum[BARRAGE_TYPE_NUM];
@@ -10,9 +15,10 @@
//static const char *BARRAGE_DIR_NAME[BARRAGE_TYPE_NUM] = {
// "normal", "/usr/share/rRootage/reversible", "/usr/share/rRootage/morph", //"/usr/share/rRootage/simple", "/usr/share/rRootage/morph_heavy", //"/usr/share/rRootage/psy",
//};
-diff -ruN rrootage-0.23a.orig/src/screen.c rrootage-0.23a.new/src/screen.c
---- rrootage-0.23a.orig/src/screen.c 2004-07-03 01:21:45.000000000 +0200
-+++ rrootage-0.23a.new/src/screen.c 2006-09-22 20:59:31.000000000 +0200
+Index: rrootage-0.23a/src/screen.c
+===================================================================
+--- rrootage-0.23a.orig/src/screen.c 2007-08-29 19:48:32.000000000 +0000
++++ rrootage-0.23a/src/screen.c 2007-08-29 19:55:11.000000000 +0000
@@ -31,7 +31,7 @@
#define SCREEN_HEIGHT 480
#define LOWRES_SCREEN_WIDTH 320
@@ -22,9 +28,10 @@
static int screenWidth, screenHeight;
-diff -ruN rrootage-0.23a.orig/src/soundmanager.c rrootage-0.23a.new/src/soundmanager.c
---- rrootage-0.23a.orig/src/soundmanager.c 2004-06-19 09:26:44.000000000 +0200
-+++ rrootage-0.23a.new/src/soundmanager.c 2006-09-22 20:59:31.000000000 +0200
+Index: rrootage-0.23a/src/soundmanager.c
+===================================================================
+--- rrootage-0.23a.orig/src/soundmanager.c 2007-08-29 19:48:32.000000000 +0000
++++ rrootage-0.23a/src/soundmanager.c 2007-08-29 19:50:13.000000000 +0000
@@ -21,7 +21,7 @@
static int useAudio = 0;
Modified: packages/trunk/rrootage/debian/patches/03_texture_filename.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/03_texture_filename.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/03_texture_filename.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,6 +1,11 @@
-diff -ruN rrootage-0.23a.orig/src/screen.c rrootage-0.23a.new/src/screen.c
---- rrootage-0.23a.orig/src/screen.c 2004-07-03 01:21:45.000000000 +0200
-+++ rrootage-0.23a.new/src/screen.c 2006-09-22 20:59:31.000000000 +0200
+# Copyright (C) 2005 Miriam Ruiz <little_miry at yahoo.es>
+# Copyright (C) 2005 Dafydd Harries <daf at debian.org>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: rrootage-0.23a/src/screen.c
+===================================================================
+--- rrootage-0.23a.orig/src/screen.c 2007-08-29 19:50:13.000000000 +0000
++++ rrootage-0.23a/src/screen.c 2007-08-29 19:55:06.000000000 +0000
@@ -73,10 +73,14 @@
void loadGLTexture(char *fileName, GLuint *texture) {
SDL_Surface *surface;
Modified: packages/trunk/rrootage/debian/patches/04_home.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/04_home.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/04_home.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,6 +1,11 @@
-diff -ruN rrootage-0.23a.orig/src/attractmanager.c rrootage-0.23a.new/src/attractmanager.c
---- rrootage-0.23a.orig/src/attractmanager.c 2004-07-03 01:12:14.000000000 +0200
-+++ rrootage-0.23a.new/src/attractmanager.c 2006-09-22 20:59:31.000000000 +0200
+# Copyright (C) 2005 Miriam Ruiz <little_miry at yahoo.es>
+# Copyright (C) 2005 Dafydd Harries <daf at debian.org>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: rrootage-0.23a/src/attractmanager.c
+===================================================================
+--- rrootage-0.23a.orig/src/attractmanager.c 2007-08-29 19:48:31.000000000 +0000
++++ rrootage-0.23a/src/attractmanager.c 2007-08-29 19:50:13.000000000 +0000
@@ -64,9 +64,14 @@
int i, j;
int version;
Modified: packages/trunk/rrootage/debian/patches/05_gcc.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/05_gcc.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/05_gcc.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,6 +1,10 @@
-diff -ruN rrootage-0.23a.orig/src/foecommand.h rrootage-0.23a.new/src/foecommand.h
---- rrootage-0.23a.orig/src/foecommand.h 2003-03-17 01:03:50.000000000 +0100
-+++ rrootage-0.23a.new/src/foecommand.h 2006-09-22 20:59:31.000000000 +0200
+# Patch to make the program properly compile against gcc 4.1
+# See http://bugs.debian.org/357404
+
+Index: rrootage-0.23a/src/foecommand.h
+===================================================================
+--- rrootage-0.23a.orig/src/foecommand.h 2007-08-29 19:48:31.000000000 +0000
++++ rrootage-0.23a/src/foecommand.h 2007-08-29 19:50:14.000000000 +0000
@@ -39,10 +39,10 @@
virtual void doChangeDirection(double d);
Deleted: packages/trunk/rrootage/debian/patches/06_rrootage_make_highres_default.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/06_rrootage_make_highres_default.patch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/06_rrootage_make_highres_default.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,30 +0,0 @@
-diff --git a/debian/rrootage.6 b/debian/rrootage.6
-index f6dd7b2..3b5b16c 100644
---- a/debian/rrootage.6
-+++ b/debian/rrootage.6
-@@ -76,10 +76,10 @@ These command line options are available:
- Low resolution mode.
- .TP
- .B \-mediumres
--Medium resolution mode (default).
-+Medium resolution mode.
- .TP
- .B \-highres
--High resolution mode.
-+High resolution mode (default).
- .TP
- .B \-nosound
- Disable sound.
-diff --git a/src/screen.c b/src/screen.c
-index c67fde7..4e31ab5 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -128,7 +128,7 @@ static GLuint smokeTexture;
- 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_rrootage_make_highres_default.patch (from rev 3987, packages/trunk/rrootage/debian/patches/06_rrootage_make_highres_default.patch)
===================================================================
--- packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch (rev 0)
+++ packages/trunk/rrootage/debian/patches/07_rrootage_make_highres_default.patch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -0,0 +1,30 @@
+Index: rrootage-0.23a/debian/rrootage.6
+===================================================================
+--- rrootage-0.23a.orig/debian/rrootage.6 2007-08-29 19:50:14.000000000 +0000
++++ rrootage-0.23a/debian/rrootage.6 2007-08-29 19:50:14.000000000 +0000
+@@ -76,10 +76,10 @@
+ Low resolution mode.
+ .TP
+ .B \-mediumres
+-Medium resolution mode (default).
++Medium resolution mode.
+ .TP
+ .B \-highres
+-High resolution mode.
++High resolution mode (default).
+ .TP
+ .B \-nosound
+ Disable sound.
+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;
Modified: packages/trunk/rrootage/debian/patches/series
===================================================================
--- packages/trunk/rrootage/debian/patches/series 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/patches/series 2007-08-29 20:20:27 UTC (rev 3993)
@@ -1,5 +1,8 @@
-01_makefile.patch -p1
-02_data_dir.patch -p1
-03_texture_filename.patch -p1
-04_home.patch -p1
-05_gcc.patch -p1
+01_makefile.patch
+02_data_dir.patch
+03_texture_filename.patch
+04_home.patch
+05_gcc.patch
+06_rrootage_highres.patch
+07_rrootage_make_highres_default.patch
+08_use_system_bulletml.patch
Modified: packages/trunk/rrootage/debian/rrootage.6
===================================================================
--- packages/trunk/rrootage/debian/rrootage.6 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/rrootage.6 2007-08-29 20:20:27 UTC (rev 3993)
@@ -15,7 +15,7 @@
.SH SYNOPSIS
.
.B rrootage
-[\-lowres]
+[\-lowres|\-mediumres|\-highres]
[\-nosound]
[\-window]
[\-reverse]
@@ -75,6 +75,12 @@
.B \-lowres
Low resolution mode.
.TP
+.B \-mediumres
+Medium resolution mode.
+.TP
+.B \-highres
+High resolution mode (default).
+.TP
.B \-nosound
Disable sound.
.TP
Modified: packages/trunk/rrootage/debian/rules
===================================================================
--- packages/trunk/rrootage/debian/rules 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/rules 2007-08-29 20:20:27 UTC (rev 3993)
@@ -17,7 +17,7 @@
$(MAKE) -f /usr/share/quilt/quilt.make patch
- $(MAKE) -C src/bulletml MORE_CFLAGS="$(CFLAGS)"
+ #$(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
+ #$(MAKE) -C src/bulletml clean
+ #$(MAKE) -C src/bulletml/tinyxml clean
$(MAKE) -C src -f makefile.lin clean
$(MAKE) -f /usr/share/quilt/quilt.make unpatch
Modified: packages/trunk/rrootage/debian/watch
===================================================================
--- packages/trunk/rrootage/debian/watch 2007-08-29 20:19:45 UTC (rev 3992)
+++ packages/trunk/rrootage/debian/watch 2007-08-29 20:20:27 UTC (rev 3993)
@@ -4,4 +4,4 @@
# Compulsory line, this is a version 3 file
version=3
-http://sf.net/rrootage/ .*rRootage-(\d.*)\.tar\.gz
+http://sf.net/rrootage/rRootage-(.*)\.tar\.gz
More information about the Pkg-games-commits
mailing list