r4462 - in packages/trunk/excellent-bifurcation: . debian debian/patches
Miriam Ruiz
baby-guest at alioth.debian.org
Thu Oct 25 08:28:04 UTC 2007
Author: baby-guest
Date: 2007-10-25 08:28:03 +0000 (Thu, 25 Oct 2007)
New Revision: 4462
Added:
packages/trunk/excellent-bifurcation/debian/
packages/trunk/excellent-bifurcation/debian/README.Debian
packages/trunk/excellent-bifurcation/debian/changelog
packages/trunk/excellent-bifurcation/debian/compat
packages/trunk/excellent-bifurcation/debian/control
packages/trunk/excellent-bifurcation/debian/copyright
packages/trunk/excellent-bifurcation/debian/dirs
packages/trunk/excellent-bifurcation/debian/docs
packages/trunk/excellent-bifurcation/debian/install
packages/trunk/excellent-bifurcation/debian/menu.ex
packages/trunk/excellent-bifurcation/debian/patches/
packages/trunk/excellent-bifurcation/debian/patches/directories.patch
packages/trunk/excellent-bifurcation/debian/patches/series
packages/trunk/excellent-bifurcation/debian/patches/windowed.patch
packages/trunk/excellent-bifurcation/debian/rules
packages/trunk/excellent-bifurcation/debian/watch.ex
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: packages/trunk/excellent-bifurcation/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: packages/trunk/excellent-bifurcation/debian/README.Debian
===================================================================
--- packages/trunk/excellent-bifurcation/debian/README.Debian (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/README.Debian 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,6 @@
+excellent-bifurcation for Debian
+--------------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Tue, 23 Oct 2007 08:52:00 +0000
Added: packages/trunk/excellent-bifurcation/debian/changelog
===================================================================
--- packages/trunk/excellent-bifurcation/debian/changelog (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/changelog 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,6 @@
+excellent-bifurcation (0.0.20071015-1) unstable; urgency=low
+
+ * Initial release (Closes: #nnnn)
+
+ -- Miriam Ruiz <little_miry at yahoo.es> Tue, 23 Oct 2007 08:52:00 +0000
+
Added: packages/trunk/excellent-bifurcation/debian/compat
===================================================================
--- packages/trunk/excellent-bifurcation/debian/compat (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/compat 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1 @@
+5
Added: packages/trunk/excellent-bifurcation/debian/control
===================================================================
--- packages/trunk/excellent-bifurcation/debian/control (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/control 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,12 @@
+Source: excellent-bifurcation
+Section: games
+Priority: extra
+Maintainer: Miriam Ruiz <little_miry at yahoo.es>
+Build-Depends: debhelper (>= 5), quilt, liballegro4.2-dev
+Standards-Version: 3.7.2
+
+Package: excellent-bifurcation
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
Added: packages/trunk/excellent-bifurcation/debian/copyright
===================================================================
--- packages/trunk/excellent-bifurcation/debian/copyright (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/copyright 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,179 @@
+This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
+Tue, 23 Oct 2007 08:52:00 +0000.
+
+Upstream Author:
+
+ Linley Henzell <l_henzell at yahoo.com.au>
+
+Copyright:
+
+ Copyright (C) 2006-2007 Linley Henzell
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; 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 General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2007, Miriam Ruiz <little_miry at yahoo.es> and
+is licensed under the GPL, see above.
+
+
+
+Mail exchange with the author of the program regarding the license:
+
+
+from: Miriam Ruiz <little.miry at gmail.com>
+to: l_henzell at yahoo.com.au
+date: 10-oct-2007 16:12
+topic: Question about the license of your games
+
+Hi! :)
+
+I'm interested in packaging your games "Garden of Coloured Lights" and
+"Excellent Bifurcation" for Debian and Ubuntu, two of the major Linux
+distributions. For ""Excellent Bifurcation" I don't have the source
+code, but I've read that you want to release it. For "Garden of
+Coloured Lights", even though I have the source code, the license
+itself is quite fuzzy. Would it be possible that you released a
+version under the GPL or some other free software license?
+
+Thanks in advance,
+Miry
+
+
+from: Linley Henzell <l_henzell at yahoo.com.au>
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 14-oct-2007 8:08
+topic: Re: Question about the license of your games
+
+Hi there!
+
+Thanks for offering to package my games! I appreciate
+it.
+
+I'd be more than happy to release EB under the GPL. I
+don't have a home internet connection at the moment,
+but the next time I'm at the Internet cafe I'll email
+you a copy of the source. The only change I'll need to
+make is removing the sponsors' banners at the start,
+because of course I can't use them in a GPL program.
+
+Since the competition I entered GoCL in is still
+going, I'd prefer to wait a bit before releasing a
+version without the sponsors' banners (doing so isn't
+against the rules but it would be nice not to). I'd be
+happy for the game to be packaged under its current
+fuzzy licence, but if that's not good enough (and I
+know that Linux people are very careful about getting
+licences right, so I imagine it probably isn't) I'll
+email you GPL source when the competition is over if
+that's okay.
+
+Thanks!
+Linley
+
+
+from: Miriam Ruiz <little.miry at gmail.com>
+to: Linley Henzell <l_henzell at yahoo.com.au>
+date: 15-oct-2007 0:48
+topic: Re: Question about the license of your games
+
+Thanks a lot for your answer, of course I can wait until you consider
+it's the best moment to release it. It would certainly be the best to
+have it under the GPL or any other free license, otherwise it'll have
+to go to non-free and, well, in general it would be much worse.
+
+Good luck in the competition, I'm really looking forward to packaging
+it after it's finished. Thanks a lot!!
+
+Greetings,
+Miry
+
+
+from: Linley Henzell <l_henzell at yahoo.com.au>
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 16-oct-2007 9:55
+topic: Re: Question about the license of your games
+
+Cool. I'll send the Garden source through in a few
+weeks.
+
+Here's the source to Excellent Bifurcation. I've
+modified it so it no longer needs the banners (which
+are in splash.bmp in the gfx directory - splash.bmp
+can be deleted). It's just source, so you'll need all
+of the other files from the windows binary zip. I
+haven't put a licence.txt file in there but I'm sure
+you have a copy of the GPL laying around :) GPL
+version 2 with the 'or later version' wording would be
+best, I think.
+
+The source is not exactly a model of elegance, but
+hopefully it won't need any changes to be able to
+compile on Linux.
+
+Let me know if you have any problems. And thanks again
+for doing this - it's good to see my games on as many
+platforms as possible!
+
+Bye,
+Linley
+
+
+from: Miriam Ruiz <little.miry at gmail.com>
+to: Linley Henzell <l_henzell at yahoo.com.au>
+date: 22-oct-2007 19:57
+topic: Re: Question about the license of your games
+
+Hi! :)
+
+I've made a temporary initial release of the tarball I plan to use for
+building the package (
+http://users.alioth.debian.org/~baby-guest/tmp/excellent-bifurcation-0.0.20071015.tgz
+) . Please have a look at it and tell me if it's correct.
+
+I assume from your previous mail that both the source code and the
+game data (graphics and sound) have been made by you and released
+under the GPL 2 or later license. Please correct me if it's not like
+that or if someone else has the copyright over the sounds or graphics.
+
+Greetings and lots of thanks!!
+Miry
+
+
+from: Linley Henzell <l_henzell at yahoo.com.au>
+to: Miriam Ruiz <little.miry at gmail.com>
+date: 23-oct-2007 10:13
+topic: Re: Question about the license of your games
+
+Hi there,
+
+Thanks for the archive. I'm at the library at the
+moment and I probably won't have a chance to look at
+it and get back to you for a few days. You're entirely
+welcome to release it as it is, though :)
+
+Yes, I have the copyright to all of the code, sounds
+and graphics (and everything else relevant) and I'm
+happy for it to be released under the GPL v2 or later.
+
+The competition is supposed to finish judging by the
+end of the week, so I'll have the GPL version of
+Garden of Coloured Lights to you soon.
+
+Bye!
+Linley
Added: packages/trunk/excellent-bifurcation/debian/dirs
===================================================================
--- packages/trunk/excellent-bifurcation/debian/dirs (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/dirs 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
Added: packages/trunk/excellent-bifurcation/debian/docs
===================================================================
--- packages/trunk/excellent-bifurcation/debian/docs (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/docs 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,4 @@
+gpl-2.0.txt
+init.txt
+Readme.txt
+Readme.txt
Added: packages/trunk/excellent-bifurcation/debian/install
===================================================================
--- packages/trunk/excellent-bifurcation/debian/install (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/install 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,3 @@
+src/excellent-bifurcation usr/games
+gfx usr/share/games/excellent-bifurcation
+wavs usr/share/games/excellent-bifurcation
Added: packages/trunk/excellent-bifurcation/debian/menu.ex
===================================================================
--- packages/trunk/excellent-bifurcation/debian/menu.ex (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/menu.ex 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,2 @@
+?package(excellent-bifurcation):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+ title="excellent-bifurcation" command="/usr/bin/excellent-bifurcation"
Added: packages/trunk/excellent-bifurcation/debian/patches/directories.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/directories.patch (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/directories.patch 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,159 @@
+# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: excellent-bifurcation-0.0.20071015/src/display_init.c
+===================================================================
+--- excellent-bifurcation-0.0.20071015.orig/src/display_init.c 2007-10-23 09:51:20.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/display_init.c 2007-10-23 09:55:31.000000000 +0000
+@@ -169,7 +169,7 @@
+ set_clip_rect(display[1], 0, 0, 320, 480);
+
+
+- DATAFILE *datf = load_datafile("gfx//ebdata.dat");
++ DATAFILE *datf = load_datafile(DATA_DIR "//gfx//ebdata.dat");
+ if (datf == NULL)
+ {
+ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
+@@ -1095,7 +1095,7 @@
+ destroy_bitmap(check_pattern);
+ destroy_bitmap(check_pattern2);
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//explodes.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//explodes.bmp");
+
+ fix_trans(file_bitmap);
+
+@@ -1517,7 +1517,7 @@
+ {
+
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//player.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//player.bmp");
+
+ BITMAP *temp_bitmap1 = new_bitmap(37, 30, "Prepare player_rles temp_bitmap1");
+ // BITMAP *temp_bitmap2 = new_bitmap(14, 14, "Prepare player_res temp_bitmap2");
+@@ -1757,7 +1757,7 @@
+ {
+
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//platform.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//platform.bmp");
+
+ fix_outline(file_bitmap);
+
+@@ -1810,7 +1810,7 @@
+ {
+
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//s_enemy.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//s_enemy.bmp");
+
+ fix_outline(file_bitmap);
+
+@@ -1884,7 +1884,7 @@
+ {
+
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//l_enemy.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//l_enemy.bmp");
+
+ fix_outline(file_bitmap);
+
+@@ -1998,7 +1998,7 @@
+ void prepare_little_rles(void)
+ {
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//little.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//little.bmp");
+
+ fix_trans(file_bitmap);
+
+@@ -2233,7 +2233,7 @@
+ {
+
+
+- BITMAP *file_bitmap = load_up_bitmap("gfx//elarge.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//elarge.bmp");
+
+
+ BITMAP *temp_bitmap1 = new_bitmap(100, 100, "Prepare enemy_rles temp_bitmap1");
+@@ -2388,7 +2388,7 @@
+
+ clear_to_color(underlay, COL_LOWER_BG1);
+
+- BITMAP *temp_bitmap = load_up_bitmap("gfx//underlay.bmp");
++ BITMAP *temp_bitmap = load_up_bitmap(DATA_DIR "//gfx//underlay.bmp");
+
+ blit(temp_bitmap, underlay, 0, 0, 0, 0, 320, 480);
+ blit(temp_bitmap, underlay, 0, 0, 0, 480, 320, 480);
+@@ -2401,7 +2401,7 @@
+
+ clear_to_color(underlay2, COL_LOWER_BG1);
+
+- temp_bitmap = load_up_bitmap("gfx//underlay2.bmp");
++ temp_bitmap = load_up_bitmap(DATA_DIR "//gfx//underlay2.bmp");
+
+ blit(temp_bitmap, underlay2, 0, 0, 0, 0, 320, 480);
+ blit(temp_bitmap, underlay2, 0, 0, 0, 480, 320, 480);
+@@ -2484,7 +2484,7 @@
+
+ /* palet [7].r = 1;
+ set_palette(palet);*/
+- BITMAP *file_bitmap = load_up_bitmap("gfx//small.bmp");
++ BITMAP *file_bitmap = load_up_bitmap(DATA_DIR "//gfx//small.bmp");
+ /* palet [7].r = 0x8d;
+ set_palette(palet);*/
+
+Index: excellent-bifurcation-0.0.20071015/src/menu.c
+===================================================================
+--- excellent-bifurcation-0.0.20071015.orig/src/menu.c 2007-10-23 09:51:20.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/menu.c 2007-10-23 09:54:12.000000000 +0000
+@@ -371,7 +371,7 @@
+ void loading_screen(void)
+ {
+
+-/* splash_bitmap = load_bitmap("gfx//splash.bmp", splash_palette);
++/* splash_bitmap = load_bitmap(DATA_DIR "//gfx//splash.bmp", splash_palette);
+
+ if (splash_bitmap == NULL)
+ {
+@@ -384,7 +384,7 @@
+ vsync();
+ clear_bitmap(screen);
+
+- BITMAP *wait_bitmap = load_bitmap("gfx//wait.bmp", splash_palette);
++ BITMAP *wait_bitmap = load_bitmap(DATA_DIR "//gfx//wait.bmp", splash_palette);
+
+ if (wait_bitmap == NULL)
+ {
+@@ -417,7 +417,7 @@
+ void loading_screen_wait(void)
+ {
+ /*
+- BITMAP *press_bitmap = load_bitmap("gfx//press.bmp", splash_palette);
++ BITMAP *press_bitmap = load_bitmap(DATA_DIR "//gfx//press.bmp", splash_palette);
+
+ if (press_bitmap == NULL)
+ {
+Index: excellent-bifurcation-0.0.20071015/src/sound.c
+===================================================================
+--- excellent-bifurcation-0.0.20071015.orig/src/sound.c 2007-10-23 09:51:20.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/sound.c 2007-10-23 09:52:37.000000000 +0000
+@@ -1072,7 +1072,7 @@
+
+ char sfile_name [50];
+
+- strcpy(sfile_name, ".//wavs//");
++ strcpy(sfile_name, DATA_DIR "//wavs//");
+ strcat(sfile_name, sfile);
+ strcat(sfile_name, ".wav");
+
+@@ -1091,7 +1091,7 @@
+
+ char sfile_name [50];
+
+- strcpy(sfile_name, ".//wavs//ambi//");
++ strcpy(sfile_name, DATA_DIR "//wavs//ambi//");
+ strcat(sfile_name, sfile);
+ strcat(sfile_name, ".wav");
+
Added: packages/trunk/excellent-bifurcation/debian/patches/series
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/series (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/series 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,2 @@
+directories.patch
+windowed.patch
Added: packages/trunk/excellent-bifurcation/debian/patches/windowed.patch
===================================================================
--- packages/trunk/excellent-bifurcation/debian/patches/windowed.patch (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/patches/windowed.patch 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,16 @@
+# Copyright (C) 2007 Miriam Ruiz <little_miry at yahoo.es>
+# Distributed under the same license as the game. See debian/copyright.
+
+Index: excellent-bifurcation-0.0.20071015/src/main.c
+===================================================================
+--- excellent-bifurcation-0.0.20071015.orig/src/main.c 2007-10-23 09:10:30.000000000 +0000
++++ excellent-bifurcation-0.0.20071015/src/main.c 2007-10-23 09:10:38.000000000 +0000
+@@ -175,7 +175,7 @@
+ srand(randseed);
+
+ // int windowed = GFX_AUTODETECT_FULLSCREEN;
+-int windowed2 = get_config_int("Misc", "Windowed", 0);
++int windowed2 = get_config_int("Misc", "Windowed", 1);
+ // windowed2 = 0;//GFX_AUTODETECT_FULLSCREEN;
+
+ //set_config_int("Misc", "Windowed", 0);
Added: packages/trunk/excellent-bifurcation/debian/rules
===================================================================
--- packages/trunk/excellent-bifurcation/debian/rules (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/rules 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,64 @@
+#!/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
+else
+ CFLAGS += -O2
+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) -C src CFLAGS="$(CFLAGS) -DDATA_DIR=\\\"/usr/share/games/excellent-bifurcation\\\""
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+ $(MAKE) -C src clean
+ $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+ #$(MAKE) DESTDIR=$(CURDIR)/debian/excellent-bifurcation install
+
+# 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
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: packages/trunk/excellent-bifurcation/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/trunk/excellent-bifurcation/debian/watch.ex
===================================================================
--- packages/trunk/excellent-bifurcation/debian/watch.ex (rev 0)
+++ packages/trunk/excellent-bifurcation/debian/watch.ex 2007-10-25 08:28:03 UTC (rev 4462)
@@ -0,0 +1,22 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php excellent-bifurcation-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/excellent-bifurcation-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/excellent-bifurcation-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for debscripts >= 2.9
+# http://sf.net/excellent-bifurcation/excellent-bifurcation-(.*)\.tar\.gz
+
+
More information about the Pkg-games-commits
mailing list