Author: baby-guest
Date: 2007-08-29 12:57:25 +0000 (Wed, 29 Aug 2007)
New Revision: 3939
Added:
packages/trunk/bulletss/debian/
packages/trunk/bulletss/debian/changelog
packages/trunk/bulletss/debian/compat
packages/trunk/bulletss/debian/control
packages/trunk/bulletss/debian/copyright
packages/trunk/bulletss/debian/docs
packages/trunk/bulletss/debian/install
packages/trunk/bulletss/debian/menu
packages/trunk/bulletss/debian/patches/
packages/trunk/bulletss/debian/patches/bulletss-buildfix
packages/trunk/bulletss/debian/patches/directories
packages/trunk/bulletss/debian/patches/libcpu-buildfix
packages/trunk/bulletss/debian/patches/sdl-buildfix
packages/trunk/bulletss/debian/patches/series
packages/trunk/bulletss/debian/rules
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/trunk/bulletss/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/bulletss/debian/changelog
===================================================================
--- packages/trunk/bulletss/debian/changelog (rev 0)
+++ packages/trunk/bulletss/debian/changelog 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1,5 @@
+bulletss (0.0.1.20030920.dfsg1-1) unstable; urgency=low
+
+ * Initial release
+
+ -- Miriam Ruiz <[EMAIL PROTECTED]> Sat, 25 Aug 2007 19:58:40 +0000
Added: packages/trunk/bulletss/debian/compat
===================================================================
--- packages/trunk/bulletss/debian/compat (rev 0)
+++ packages/trunk/bulletss/debian/compat 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1 @@
+5
Added: packages/trunk/bulletss/debian/control
===================================================================
--- packages/trunk/bulletss/debian/control (rev 0)
+++ packages/trunk/bulletss/debian/control 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1,17 @@
+Source: bulletss
+Section: games
+Priority: extra
+Maintainer: Debian Games Team <[EMAIL PROTECTED]>
+Uploaders: Miriam Ruiz <[EMAIL PROTECTED]>, Peter De Wachter <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 5), quilt, gdc, libbulletml-dev,
+ libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
+ libsdl1.2-dev, libsdl-mixer1.2-dev
+Standards-Version: 3.7.2
+
+Package: bulletss
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: it's not game, but viewer
+ Demo program to test BulletML library.
+ .
+ Homepage: http://shinh.skr.jp/bulletss/
Added: packages/trunk/bulletss/debian/copyright
===================================================================
--- packages/trunk/bulletss/debian/copyright (rev 0)
+++ packages/trunk/bulletss/debian/copyright 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1,62 @@
+This package was debianized by Miriam Ruiz <[EMAIL PROTECTED]> on
+Sat, 25 Aug 2007 19:58:40 +0000.
+
+It was downloaded from http://shinh.skr.jp/bulletss/
+
+Upstream Author:
+
+ Kenta Cho <[EMAIL PROTECTED]>
+
+Copyright:
+
+ Copyright 2003 Kenta Cho
+
+ import/SDL* : Copyright (C) 1997, 1998, 1999, 2000, 2001 Sam Lantinga
+
+License:
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
notice,
+ this list of conditions and the following disclaimer in the
documentation
+ and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS;
+ OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+import/SDL*:
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
+
+
+The Debian packaging is (C) 2007, Miriam Ruiz <[EMAIL PROTECTED]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
Added: packages/trunk/bulletss/debian/docs
===================================================================
--- packages/trunk/bulletss/debian/docs (rev 0)
+++ packages/trunk/bulletss/debian/docs 2007-08-29 12:57:25 UTC (rev 3939)
@@ -0,0 +1,3 @@
+README.en.txt
+README.txt
+
Added: packages/trunk/bulletss/debian/install
===================================================================
--- packages/trunk/bulletss/debian/install (rev 0)
+++ packages/trunk/bulletss/debian/install 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1,4 @@
+bulletss usr/games/
+bosses.d/* usr/share/games/bulletss/
+#debian/*.xpm usr/share/pixmaps/
+#debian/*.desktop usr/share/applications/
Added: packages/trunk/bulletss/debian/menu
===================================================================
--- packages/trunk/bulletss/debian/menu (rev 0)
+++ packages/trunk/bulletss/debian/menu 2007-08-29 12:57:25 UTC (rev 3939)
@@ -0,0 +1,2 @@
+?package(bulletss):needs="X11" section="Games/Toys"\
+ title="Bulletss: Barrage 360 degrees" command="/usr/games/bulletss"
Added: packages/trunk/bulletss/debian/patches/bulletss-buildfix
===================================================================
--- packages/trunk/bulletss/debian/patches/bulletss-buildfix
(rev 0)
+++ packages/trunk/bulletss/debian/patches/bulletss-buildfix 2007-08-29
12:57:25 UTC (rev 3939)
@@ -0,0 +1,284 @@
+Index: bulletss-0.0.1.20030920.dfsg1/Makefile
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/Makefile 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/Makefile 2007-08-29 12:53:17.000000000
+0000
+@@ -1,23 +1,25 @@
+-LN = gcc
++LN = gdc
+ INCLUDES = -I. -ISDL -Iopengl
+ LIBS = -lSDL -lGL -lGLU
+ #DFLAGS = -g -debug
+ DFLAGS = -O -release
+-DOBJS = bulletss.o charactor.o mymath.o axis.o cpuinput.o padinput.o camera.o
dirent.o mesaglu.o
++DOBJS = bulletss.o charactor.o mymath.o axis.o cpuinput.o padinput.o camera.o
dirent.o mesaglu.o SDL/SDL.o
+ COBJS = dirent_d.o
+
+ all: bulletss
+- $(LN) -o bulletss $(DOBJS) $(COBJS) bulletml/libbulletml_d.a
cpu/libcpu.a -lphobos -lpthread -lm -lstdc++ $(LIBS)
+
+-bulletss: bulletml.d $(DOBJS) $(COBJS)
+- $(MAKE) -C bulletml
+- $(MAKE) -C cpu
++bulletss: cpu.d bulletml.d $(DOBJS) $(COBJS)
++ $(LN) -o $@ $(DOBJS) $(COBJS) cpu/libcpu.a -lbulletml -lpthread -lm
-lstdc++ $(LIBS)
++
++cpu.d:
++ $(MAKE) -C cpu CXXFLAGS="$(CXXFLAGS)"
+
+ clean:
+- rm -f *.o bulletss
++ $(MAKE) -C cpu clean
++ rm -f *.o bulletss cpu.d
+
+ $(DOBJS): %.o: %.d
+- dmd -c $(INCLUDES) $(DFLAGS) $<
++ gdmd -op -c $(INCLUDES) $(DFLAGS) $<
+
+ $(COBJS): %.o: %.c
+ $(CC) -c $<
+Index: bulletss-0.0.1.20030920.dfsg1/bulletss.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/bulletss.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/bulletss.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,14 +1,13 @@
+-import stream;
+-import math;
+-import string;
+-import random;
+-import date;
+-import path;
+-
+-import c.stdio;
++import std.cstream;
++import math = std.math;
++import string = std.string;
++import random = std.random;
++import std.date;
++import path = std.path;
+
+ import SDL;
+ import opengl;
++import mesaglu;
+
+ import bulletml;
+
+@@ -20,9 +19,7 @@
+ import dirent;
+
+ char[] ftoa(double f) {
+- char[] buf = new char[256];
+- int len = sprintf(buf, "%f", f);
+- return buf[0 .. len];
++ return string.format("%f", f);
+ }
+
+ extern(C) void srand(uint seed);
+@@ -196,7 +193,7 @@
+ char[] name = string.toString(f_name);
+ if (path.getExt(name) == "xml") {
+ debug {
+- stream.stdout.writeLine(name);
++ dout.writeLine(name);
+ }
+ xmls_ ~= runFile ~ "/" ~ name;
+ }
+@@ -236,7 +233,7 @@
+ while (!end_) {
+ char[] xml = xmls_[rnd(xmls_.length)];
+ version(linux) {
+- stream.stdout.writeLine(xml);
++ dout.writeLine(xml);
+ }
+ BulletMLParserTinyXML* parser =
+
BulletMLParserTinyXML_new(string.toStringz(xml));
+@@ -346,10 +343,10 @@
+ void getBullets(out int len, out float* x, out float* y,
+ out float* sx, out float* sy) {
+ len = shotNum_;
+- x = shotX_;
+- y = shotY_;
+- sx = shotSX_;
+- sy = shotSY_;
++ x = shotX_.ptr;
++ y = shotY_.ptr;
++ sx = shotSX_.ptr;
++ sy = shotSY_.ptr;
+ }
+
+ private:
+Index: bulletss-0.0.1.20030920.dfsg1/camera.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/camera.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/camera.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,5 +1,5 @@
+-import random;
+-import math;
++import math = std.math;
++import mymath;
+
+ import opengl;
+ import mesaglu;
+Index: bulletss-0.0.1.20030920.dfsg1/charactor.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/charactor.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/charactor.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,5 +1,5 @@
+-import math;
+-import stream;
++import math = std.math;
++import std.string;
+
+ import opengl;
+
+@@ -7,7 +7,7 @@
+
+ import mymath;
+ import padinput;
+-import math;
++import axis;
+
+ class Charactor {
+ public:
+@@ -41,7 +41,7 @@
+ void draw() {
+ switch (type_) {
+ case Type.BOSS: {
+- static int size = 5;
++ static int boss_size = 5;
+
+ glPushMatrix();
+ glTranslatef(x_+170, y_+40, 0);
+@@ -50,24 +50,24 @@
+
+ glBegin(GL_LINE_LOOP);
+ glColor3f(1, 1, 1);
+- glVertex3f(-size, -size, 0);
+- glVertex3f(size, -size, 0);
+- glVertex3f(size, size, 0);
+- glVertex3f(-size, size, 0);
++ glVertex3f(-boss_size, -boss_size, 0);
++ glVertex3f(boss_size, -boss_size, 0);
++ glVertex3f(boss_size, boss_size, 0);
++ glVertex3f(-boss_size, boss_size, 0);
+ glEnd();
+ glBegin(GL_LINE_LOOP);
+ glColor3f(1, 1, 1);
+- glVertex3f(-size, 0, -size);
+- glVertex3f(size, 0, -size);
+- glVertex3f(size, 0, size);
+- glVertex3f(-size, 0, size);
++ glVertex3f(-boss_size, 0, -boss_size);
++ glVertex3f(boss_size, 0, -boss_size);
++ glVertex3f(boss_size, 0, boss_size);
++ glVertex3f(-boss_size, 0, boss_size);
+ glEnd();
+ glBegin(GL_LINE_LOOP);
+ glColor3f(1, 1, 1);
+- glVertex3f(0, -size, -size);
+- glVertex3f(0, size, -size);
+- glVertex3f(0, size, size);
+- glVertex3f(0, -size, size);
++ glVertex3f(0, -boss_size, -boss_size);
++ glVertex3f(0, boss_size, -boss_size);
++ glVertex3f(0, boss_size, boss_size);
++ glVertex3f(0, -boss_size, boss_size);
+ glEnd();
+
+ glPopMatrix();
+@@ -282,23 +282,23 @@
+ float base = 2;
+ float cross = 2 / math.sqrt(2.0);
+
+- if (axis == Axis.UP) y_ -= base;
+- else if (axis == Axis.RIGHT) x_ += base;
+- else if (axis == Axis.DOWN) y_ += base;
+- else if (axis == Axis.LEFT) x_ -= base;
+- else if (axis == Axis.UPRIGHT) {
++ if (axis.getAxisCode() == Axis.UP) y_ -= base;
++ else if (axis.getAxisCode() == Axis.RIGHT) x_ += base;
++ else if (axis.getAxisCode() == Axis.DOWN) y_ += base;
++ else if (axis.getAxisCode() == Axis.LEFT) x_ -= base;
++ else if (axis.getAxisCode() == Axis.UPRIGHT) {
+ x_ += cross;
+ y_ -= cross;
+ }
+- else if (axis == Axis.DOWNRIGHT) {
++ else if (axis.getAxisCode() == Axis.DOWNRIGHT) {
+ x_ += cross;
+ y_ += cross;
+ }
+- else if (axis == Axis.DOWNLEFT) {
++ else if (axis.getAxisCode() == Axis.DOWNLEFT) {
+ x_ -= cross;
+ y_ += cross;
+ }
+- else if (axis == Axis.UPLEFT) {
++ else if (axis.getAxisCode() == Axis.UPLEFT) {
+ x_ -= cross;
+ y_ -= cross;
+ }
+@@ -310,8 +310,6 @@
+ }
+
+ char[] ftoa(double f) {
+- char[] buf = new char[256];
+- int len = sprintf(buf, "%f", f);
+- return buf[0 .. len];
++ return format("%f", f);
+ }
+
+Index: bulletss-0.0.1.20030920.dfsg1/dirent.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/dirent.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/dirent.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,5 +1,3 @@
+-import string;
+-
+ extern (C) {
+ alias void DIR;
+ alias void dirent;
+Index: bulletss-0.0.1.20030920.dfsg1/mesaglu.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/mesaglu.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/mesaglu.d 2007-08-29 12:52:58.000000000
+0000
+@@ -21,7 +21,8 @@
+ */
+
+ private import opengl;
+-private import math;
++private import math = std.math;
++private import std.math: sqrt;
+
+ void gluPerspective(GLdouble fovy, GLdouble aspect,
+ GLdouble zNear, GLdouble zFar)
+@@ -109,7 +110,7 @@
+ m[2*4+3] = 0.0;
+ m[3*4+3] = 1.0;
+
+- glMultMatrixd(m);
++ glMultMatrixd(m.ptr);
+
+ /* Translate Eye to Origin */
+ glTranslated(-eyex, -eyey, -eyez);
+Index: bulletss-0.0.1.20030920.dfsg1/mymath.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/mymath.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/mymath.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,5 +1,5 @@
+-import math;
+-import random;
++import math = std.math;
++import random = std.random;
+
+ int rnd(int v) {
+ return random.rand() % v;
+Index: bulletss-0.0.1.20030920.dfsg1/cpuinput.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/cpuinput.d 2007-08-29
12:52:22.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/cpuinput.d 2007-08-29 12:52:58.000000000
+0000
+@@ -1,4 +1,4 @@
+-import string;
++import std.cstream;
+
+ import cpu;
+ import axis;
Added: packages/trunk/bulletss/debian/patches/directories
===================================================================
--- packages/trunk/bulletss/debian/patches/directories
(rev 0)
+++ packages/trunk/bulletss/debian/patches/directories 2007-08-29 12:57:25 UTC
(rev 3939)
@@ -0,0 +1,13 @@
+Index: bulletss-0.0.1.20030920.dfsg1/bulletss.d
+===================================================================
+--- bulletss-0.0.1.20030920.dfsg1.orig/bulletss.d 2007-08-29
12:47:03.000000000 +0000
++++ bulletss-0.0.1.20030920.dfsg1/bulletss.d 2007-08-29 12:47:28.000000000
+0000
+@@ -214,7 +214,7 @@
+ shotSX_ = new float[CHAR_NUM];
+ shotSY_ = new float[CHAR_NUM];
+
+- char[] runFile = "bosses.d/";
++ char[] runFile = "/usr/share/games/bulletss//";
+ if (args.length > 1) {
+ runFile = args[1];
+ }
Added: packages/trunk/bulletss/debian/patches/libcpu-buildfix
===================================================================
--- packages/trunk/bulletss/debian/patches/libcpu-buildfix
(rev 0)
+++ packages/trunk/bulletss/debian/patches/libcpu-buildfix 2007-08-29
12:57:25 UTC (rev 3939)
@@ -0,0 +1,37 @@
+Index: bulletss-0.0.20030920.dfsg1/cpu/util.h
+===================================================================
+--- bulletss-0.0.20030920.dfsg1.orig/cpu/util.h 2003-09-20
12:04:41.000000000 +0000
++++ bulletss-0.0.20030920.dfsg1/cpu/util.h 2007-08-29 11:26:56.000000000
+0000
+@@ -147,8 +147,8 @@
+ if (index == std::string::npos) index = rhs.find(' ');
+ assert(index != std::string::npos);
+
+- x = atoi(rhs.substr(0, index));
+- y = atoi(rhs.substr(index+1));
++ x = atoi(rhs.substr(0, index).c_str());
++ y = atoi(rhs.substr(index+1).c_str());
+ }
+
+ template <typename T_, class GetDoublePolicy_>
+Index: bulletss-0.0.20030920.dfsg1/cpu/create_d_import.pl
+===================================================================
+--- bulletss-0.0.20030920.dfsg1.orig/cpu/create_d_import.pl 2007-08-29
11:47:49.000000000 +0000
++++ bulletss-0.0.20030920.dfsg1/cpu/create_d_import.pl 2003-09-22
18:19:17.000000000 +0000
+@@ -14,7 +14,6 @@
+ open $out, "> $ARGV[1]";
+ }
+
+-print "alias bit bool;\n";
+ print $out "extern (C) {\n";
+ while (<$in>) {
+ s/const //g;
+Index: bulletss-0.0.20030920.dfsg1/cpu/d_cpp_interface.h
+===================================================================
+--- bulletss-0.0.20030920.dfsg1.orig/cpu/d_cpp_interface.h 2007-08-29
11:47:39.000000000 +0000
++++ bulletss-0.0.20030920.dfsg1/cpu/d_cpp_interface.h 2007-08-28
22:42:45.000000000 +0000
+@@ -1,4 +1,4 @@
+-#define D_CPP_CLASS(CLASS, CLASS_NAME) ;
++#define D_CPP_CLASS(CLASS, CLASS_NAME)
+
+ #define D_CPP_NEW_0(CLASS, NEW_NAME) \
+ CLASS* NEW_NAME() { \
Added: packages/trunk/bulletss/debian/patches/sdl-buildfix
===================================================================
--- packages/trunk/bulletss/debian/patches/sdl-buildfix
(rev 0)
+++ packages/trunk/bulletss/debian/patches/sdl-buildfix 2007-08-29 12:57:25 UTC
(rev 3939)
@@ -0,0 +1,308 @@
+Index: bulletss/SDL/SDL_active.d
+===================================================================
+--- bulletss.orig/SDL/SDL_active.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_active.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* Include file for SDL application focus event handling */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_audio.d
+===================================================================
+--- bulletss.orig/SDL/SDL_audio.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_audio.d 2007-08-27 22:08:54.000000000 +0200
+@@ -20,10 +20,10 @@
+ [EMAIL PROTECTED]
+ */
+
+-import SDL_types;
+-import SDL_error;
+-import SDL_rwops;
+-import SDL_byteorder;
++public import SDL_types;
++public import SDL_error;
++public import SDL_rwops;
++public import SDL_byteorder;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_cdrom.d
+===================================================================
+--- bulletss.orig/SDL/SDL_cdrom.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_cdrom.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* This is the CD-audio control API for Simple DirectMedia Layer */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_endian.d
+===================================================================
+--- bulletss.orig/SDL/SDL_endian.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_endian.d 2007-08-27 22:08:54.000000000 +0200
+@@ -34,9 +34,9 @@
+ and other data sources.
+ */
+
+-import SDL_types;
+-import SDL_rwops;
+-import SDL_byteorder;
++public import SDL_types;
++public import SDL_rwops;
++public import SDL_byteorder;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_events.d
+===================================================================
+--- bulletss.orig/SDL/SDL_events.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_events.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,12 +22,12 @@
+
+ /* Include file for SDL event handling */
+
+-import SDL_types;
+-import SDL_active;
+-import SDL_keyboard;
+-import SDL_mouse;
+-import SDL_joystick;
+-import SDL_syswm;
++public import SDL_types;
++public import SDL_active;
++public import SDL_keyboard;
++public import SDL_mouse;
++public import SDL_joystick;
++public import SDL_syswm;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_joystick.d
+===================================================================
+--- bulletss.orig/SDL/SDL_joystick.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_joystick.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* Include file for SDL joystick event handling */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_keyboard.d
+===================================================================
+--- bulletss.orig/SDL/SDL_keyboard.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_keyboard.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,11 +22,11 @@
+
+ /* Include file for SDL keyboard event handling */
+
+-import SDL_types;
++public import SDL_types;
+ // !!! A hack! struct SDL_keysym is defined in this module,
+ // !!! so we need to resolve the nameclash...
+ // !!! Definitely won't work on *NIX but for now will do.
+-import SDL_keysym;
++public import SDL_keysym;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_keysym.d
+===================================================================
+--- bulletss.orig/SDL/SDL_keysym.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_keysym.d 2007-08-27 22:08:54.000000000 +0200
+@@ -26,7 +26,7 @@
+ The names of the keys
+ */
+
+-import SDL_types;
++public import SDL_types;
+
+ alias int SDLKey;
+ enum {
+Index: bulletss/SDL/SDL_mouse.d
+===================================================================
+--- bulletss.orig/SDL/SDL_mouse.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_mouse.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,8 +22,8 @@
+
+ /* Include file for SDL mouse event handling */
+
+-import SDL_types;
+-import SDL_video;
++public import SDL_types;
++public import SDL_video;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_mutex.d
+===================================================================
+--- bulletss.orig/SDL/SDL_mutex.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_mutex.d 2007-08-27 22:08:54.000000000 +0200
+@@ -25,7 +25,7 @@
+ These are independent of the other SDL routines.
+ */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_quit.d
+===================================================================
+--- bulletss.orig/SDL/SDL_quit.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_quit.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* Include file for SDL quit event handling */
+
+-import SDL_events;
++public import SDL_events;
+
+ /*
+ An SDL_QUITEVENT is generated when the user tries to close the application
+Index: bulletss/SDL/SDL_rwops.d
+===================================================================
+--- bulletss.orig/SDL/SDL_rwops.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_rwops.d 2007-08-27 22:08:54.000000000 +0200
+@@ -24,7 +24,7 @@
+ data sources. It can easily be extended to files, memory, etc.
+ */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_syswm.d
+===================================================================
+--- bulletss.orig/SDL/SDL_syswm.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_syswm.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* Include file for SDL custom system window manager hooks */
+
+-import SDL_version;
++public import SDL_version;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_thread.d
+===================================================================
+--- bulletss.orig/SDL/SDL_thread.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_thread.d 2007-08-27 22:08:54.000000000 +0200
+@@ -25,8 +25,8 @@
+ These are independent of the other SDL routines.
+ */
+
+-import SDL_types;
+-import SDL_mutex;
++public import SDL_types;
++public import SDL_mutex;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_timer.d
+===================================================================
+--- bulletss.orig/SDL/SDL_timer.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_timer.d 2007-08-27 22:08:54.000000000 +0200
+@@ -20,7 +20,7 @@
+ [EMAIL PROTECTED]
+ */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_version.d
+===================================================================
+--- bulletss.orig/SDL/SDL_version.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_version.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,7 +22,7 @@
+
+ /* This header defines the current SDL version */
+
+-import SDL_types;
++public import SDL_types;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL_video.d
+===================================================================
+--- bulletss.orig/SDL/SDL_video.d 2007-08-27 21:43:46.000000000 +0200
++++ bulletss/SDL/SDL_video.d 2007-08-27 22:08:54.000000000 +0200
+@@ -22,9 +22,9 @@
+
+ /* Header file for access to the SDL raw framebuffer window */
+
+-import SDL_types;
+-import SDL_mutex;
+-import SDL_rwops;
++public import SDL_types;
++public import SDL_mutex;
++public import SDL_rwops;
+
+ extern(C):
+
+Index: bulletss/SDL/SDL.d
+===================================================================
+--- bulletss.orig/SDL/SDL.d 2007-08-27 22:08:51.000000000 +0200
++++ bulletss/SDL/SDL.d 2007-08-27 22:12:17.000000000 +0200
+@@ -20,18 +20,18 @@
+ [EMAIL PROTECTED]
+ */
+
+-import SDL_types;
+-import SDL_getenv;
+-import SDL_error;
+-import SDL_rwops;
+-import SDL_timer;
+-import SDL_audio;
+-import SDL_cdrom;
+-import SDL_joystick;
+-import SDL_events;
+-import SDL_video;
+-import SDL_byteorder;
+-import SDL_version;
++public import SDL_types;
++public import SDL_getenv;
++public import SDL_error;
++public import SDL_rwops;
++public import SDL_timer;
++public import SDL_audio;
++public import SDL_cdrom;
++public import SDL_joystick;
++public import SDL_events;
++public import SDL_video;
++public import SDL_byteorder;
++public import SDL_version;
+
+ extern(C):
+
+@@ -73,6 +73,9 @@
+ */
+ void SDL_Quit();
+
++version(Win32)
++{
++
+ void SDL_SetModuleHandle(void *hInst);
+ extern(Windows) void* GetModuleHandle(char*);
+
+@@ -87,4 +90,6 @@
+ static ~this()
+ {
+ SDL_Quit();
+-}
+\ No newline at end of file
++}
++
++}
Added: packages/trunk/bulletss/debian/patches/series
===================================================================
--- packages/trunk/bulletss/debian/patches/series
(rev 0)
+++ packages/trunk/bulletss/debian/patches/series 2007-08-29 12:57:25 UTC
(rev 3939)
@@ -0,0 +1,4 @@
+libcpu-buildfix
+sdl-buildfix
+bulletss-buildfix
+directories
Added: packages/trunk/bulletss/debian/rules
===================================================================
--- packages/trunk/bulletss/debian/rules (rev 0)
+++ packages/trunk/bulletss/debian/rules 2007-08-29 12:57:25 UTC (rev
3939)
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+ DFLAGS = -debug
+else
+ CFLAGS += -O2
+ DFLAGS = -O -release
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ $(MAKE) -f /usr/share/quilt/quilt.make patch
+ touch $@
+
+build: build-stamp
+build-stamp: configure-stamp
+ dh_testdir
+ $(MAKE) DFLAGS="$(DFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)"
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) clean
+ rm -f bulletss cpu.d
+ rm -f `find . -name "*.o"`
+ rm -f `find . -name "*.so*"`
+ rm -f `find . -name "*.a"`
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+# Build architecture-independent files here.
+binary-indep: build install
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_install
+ dh_installmenu
+ #dh_installman debian/*.6
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+get-orig-source:
+ dh_testdir
+ dh_testroot
+ wget http://shinh.skr.jp/bulletss/bulletss.zip
+ unzip bulletss.zip
+ rm bulletss/*.dll
+ rm bulletss/*.exe
+ rm -r bulletss/bulletml
+ tar cvfz ../bulletss_0.0.1.20030920.dfsg1.orig.tar.gz bulletss
+ rm -rf bulletss.zip bulletss
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
get-orig-source
Property changes on: packages/trunk/bulletss/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
