[SCM] ballz (platform/puzzle game) branch, master, updated. upstream/1.0-22-gec07942
Sylvain Beucler
beuc at beuc.net
Thu Oct 16 16:58:40 UTC 2008
The following commit has been merged in the master branch:
commit ec079427e3cb5a53262053c76af366a6c541b7c2
Author: Sylvain Beucler <beuc at beuc.net>
Date: Thu Oct 16 18:58:33 2008 +0200
Update for new upstream - lots of simplifications
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 3d03e2d..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,55 +0,0 @@
-While original source link is currently 404, the tarball can be
-grabbed from the Fedora package, e.g.:
-
-http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/source/SRPMS/ballz-1.0-3.fc9.src.rpm
-
-To extract it, install 'rpm'::
-
- apt-get install rpm
-
-then install the source RPM::
-
- rpm -i ballz-1.0-3.fc9.src.rpm
-
-which will install the tarball and the patches in
-'/usr/src/rpm/SOURCES'.
-
-Alternatively you can use 'rpm2cpio' also from the 'rpm' package to
-extract all files in the current directory::
-
- rpm2cpio ballz-1.0-3.fc9.src.rpm | cpio -i
-
-
-In addition the Fedora patches are kept at:
- http://cvs.fedoraproject.org/viewvc/rpms/ballz/
-and package information at:
- https://admin.fedoraproject.org/pkgdb/packages/name/ballz
-
-
-The first release was posted to the TINS '07 contest:
- http://amarillion.bafsoft.net/tins07/
-more exactly here:
- http://amarillion.bafsoft.net/tins07/upload/3-db-tins07.zip
-
-The official location should be
- http://darkbits.org/ballz-1.0.tar.gz
-but is currently dead link.
-
-The game was also announced (with its original URLs) at:
- http://www.allegro.cc/forums/thread/590831
-and mentions an updated tarball with a few bugfixes.
-
-The game is referenced at
- http://www.happypenguin.org/show?B.A.L.L.Z
-with a link to
- http://www.cyd.liu.se/~olona869/ballz-1.0.tar.gz
-which is the same as Fedora's.
-
-
-The authors published the code at:
- http://code.google.com/p/db-tins07/
-though the tarballs don't have the same MD5. Some files (such as
-guichan.hpp) are missing from it.
-
-They do not express interest in maintaining the game, though they are
-open to contribution in that regard.
diff --git a/debian/TODO b/debian/TODO
deleted file mode 100644
index 73d7579..0000000
--- a/debian/TODO
+++ /dev/null
@@ -1,12 +0,0 @@
-Bug in level selection
-======================
-
-The original version bundles an unreleased 'guichan' library (as
-ballz's authors are also guichan's, and because the game was made for
-a 72h sprint competition and required a few quick hacks in guichan).
-The closest guichan release is 0.6.1.
-
-'ballz-1.0-syslibs.patch' applies a couple fixes to make it work with
-later released versions (such as 0.8.x) but introduces a bug in the
-level menu selection where often the scrolling doesn't match the
-currently selected level.
diff --git a/debian/ballz-data.install b/debian/ballz-data.install
index b599c8d..6314d0d 100644
--- a/debian/ballz-data.install
+++ b/debian/ballz-data.install
@@ -1 +1 @@
-usr/share/games/ballz
+usr/share/games/ballz/
diff --git a/debian/ballz.6 b/debian/ballz.6
deleted file mode 100644
index 7b56770..0000000
--- a/debian/ballz.6
+++ /dev/null
@@ -1,42 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH BALLZ 6 "September 28, 2008"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ballz \- platform/puzzle game where you control a rolling ball
-.SH SYNOPSIS
-.B ballz
-.SH DESCRIPTION
-The game is a platformer with some puzzle elements. You take control
-of a ball which is genetically modifed by the British secret
-service. Your mission is to rescue captured British soldiers from a
-prison in Iran.
-.PP
-You can play the game with the keyboard.
-.IP "Up" 13
-Jump
-.IP "Control"
-Special
-.IP "Shift"
-Special
-.
-.SH OPTIONS
-No options.
-.SH AUTHOR
-ballz was written by Olof Naessen and Per Larsson.
-.PP
-This manual page was written by Sylvain Beucler <beuc at beuc.net>,
-for the Debian project (but may be used by others).
diff --git a/debian/ballz.desktop b/debian/ballz.desktop
deleted file mode 100644
index 5727547..0000000
--- a/debian/ballz.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=B.A.L.L.Z.
-Comment=Platform game with some puzzle elements
-Exec=ballz
-Icon=ballz.png
-Terminal=false
-Type=Application
-Categories=Game;ActionGame;
diff --git a/debian/ballz.install b/debian/ballz.install
index 03db3fe..eb011c1 100644
--- a/debian/ballz.install
+++ b/debian/ballz.install
@@ -1,4 +1,3 @@
usr/games/ballz
-../../debian/ballz.desktop usr/share/applications
-../../debian/ballz.png usr/share/pixmaps
-../../debian/ballz.xpm usr/share/pixmaps
+usr/share/applications/
+usr/share/pixmaps/
diff --git a/debian/ballz.manpages b/debian/ballz.manpages
index 741d57f..408c39a 100644
--- a/debian/ballz.manpages
+++ b/debian/ballz.manpages
@@ -1 +1 @@
-debian/ballz.6
+src/ballz.6
diff --git a/debian/changelog b/debian/changelog
index 1c679c0..5ddcd18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-ballz (1.0-1) unstable; urgency=low
+ballz (1.0.1-1) unstable; urgency=low
* Initial release (Closes: #500467)
- -- Sylvain Beucler <beuc at beuc.net> Sun, 28 Sep 2008 12:53:28 +0200
-
+ -- Sylvain Beucler <beuc at beuc.net> Wed, 15 Oct 2008 20:40:45 +0200
diff --git a/debian/control b/debian/control
index fb85661..89fbf20 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Sylvain Beucler <beuc at beuc.net>
-Build-Depends: quilt, debhelper (>= 7), autoconf, automake1.10, imagemagick, libguichan-dev, libdumb1-dev, libaldmb1-dev
-Build-Conflicts: autoconf2.13, automake1.4
+Build-Depends: debhelper (>= 7), autotools-dev, imagemagick, libguichan-dev, libdumb1-dev, libaldmb1-dev
Standards-Version: 3.8.0
Homepage: http://www.allegro.cc/forums/thread/590831
@@ -16,6 +15,10 @@ Description: B.A.L.L.Z. - platform/puzzle game where you control a rolling ball
of a ball which is genetically modifed by the British secret
service. Your mission is to rescue captured British soldiers from a
prison in Iran.
+ .
+ The game was written in 72 hours for the TINS competition, a
+ competition similar to Speedhack. The name TINS is an recursive
+ acronym for 'TINS is not Speedhack'.
Package: ballz-data
Recommends: ballz
diff --git a/debian/copyright b/debian/copyright
index 8f427a0..0ff6d61 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package was debianized by Sylvain Beucler <beuc at beuc.net> on
Sun, 28 Sep 2008 12:53:28 +0200.
It was downloaded from
-<http://download.fedora.redhat.com/pub/fedora/linux/releases/9/Everything/source/SRPMS/ballz-1.0-3.fc9.src.rpm>
+<http://db-tins07.googlecode.com/files/ballz-1.0.1.tar.gz>
Upstream Authors:
@@ -11,7 +11,9 @@ Upstream Authors:
Copyright:
- Copyright (c) 2007, Olof Naessen and Per Larsson
+ Copyright (C) 2007 Olof Naessen and Per Larsson
+ Copyright (C) 2007, 2008 Hans de Goede
+ Copyright (C) 2008 Sylvain Beucler
License:
@@ -39,95 +41,3 @@ Packaging
The Debian packaging is (C) 2008, Sylvain Beucler <beuc at beuc.net> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-It's based on the Fedora packaging which is
-(C) 2007, 2008 Hans de Goede
-http://cvs.fedoraproject.org/viewvc/rpms/ballz/devel/
-
-
-
-The source tarball includes a copy of the DUMB and Guichan which are
-replaced by Debian dependencies:
-
-Guichan
-=======
-
-Upstream Author: Olof Naessén
-
-Copyright: 2004, 2005, 2006, 2007 by Olof Naessén and Per Larsson
-
-License:
-
- Copyright (c) The Regents of the University of California.
- All rights reserved.
-
- 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.
- 3. Neither the name of the University nor the names of its contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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.
-
-
-DUMB
-====
-
-Upstream Authors: Ben Davis <entheh at users.sf.net>
- Robert J Ohannessian
- Julien Cugniere
-
-Copyright (C) 2001-2003 Ben Davis, Robert J Ohannessian and Julien Cugniere
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event shall the authors be held liable for any damages arising from the
-use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
- that you wrote the original software. If you use this software in a
- product, you are requested to acknowledge its use in the product
- documentation, along with details on where to get an unmodified version of
- this software, but this is not a strict requirement.
-
- [Note that the above point asks for a link to DUMB, not just a mention.
- Googling for DUMB doesn't help much! The URL is "http://dumb.sf.net/".]
-
- [The only reason why the link is not strictly required is that such a
- requirement prevents DUMB from being used in projects with certain other
- licences, notably the GPL. See http://www.gnu.org/philosophy/bsd.html .]
-
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-
-3. This notice may not be removed from or altered in any source distribution.
-
-4. If you are using the Program in someone else's bedroom at any Monday
- 3:05 PM, you are not allowed to modify the Program for ten minutes. [This
- clause provided by Inphernic; every licence should contain at least one
- clause, the reasoning behind which is far from obvious.]
-
-[Note: clause 4 was resigned after a quick IRC talk with the author]
-
-[Note 2: if I did not mention /usr/share/common-licenses here, lintian
- would complain because he found the words "GPL" above, but this
- software is not GPL. It is GPL-compatible, though.]
diff --git a/debian/patches/ballz-1.0-guichan081.patch b/debian/patches/ballz-1.0-guichan081.patch
deleted file mode 100644
index 6598ccc..0000000
--- a/debian/patches/ballz-1.0-guichan081.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: ballz-debian/src/game.cpp
-===================================================================
---- ballz-debian.orig/src/game.cpp 2008-10-11 14:57:22.000000000 +0200
-+++ ballz-debian/src/game.cpp 2008-10-11 14:57:22.000000000 +0200
-@@ -144,7 +144,7 @@
- "up with the whole idea of making this game in Per's and\n"
- "Johanna's apartment.");
- mCreditsText->setOpaque(false);
-- mCreditsText->setBorderSize(0);
-+ mCreditsText->setFrameSize(0);
- mCreditsContainer->add(mCreditsText, 40, 180);
-
- mLevelsContainer = new gcn::Container();
-@@ -173,7 +173,7 @@
- mInfoTextFont->setGlyphSpacing(-1);
- mInfoText->setFont(mInfoTextFont);
- mInfoText->setOpaque(false);
-- mInfoText->setBorderSize(0);
-+ mInfoText->setFrameSize(0);
- mMainMenuContainer->add(mInfoText, 110, 200);
- }
-
-Index: ballz-debian/src/gui/ballzscrollarea.cpp
-===================================================================
---- ballz-debian.orig/src/gui/ballzscrollarea.cpp 2008-10-11 14:57:17.000000000 +0200
-+++ ballz-debian/src/gui/ballzscrollarea.cpp 2008-10-11 14:57:22.000000000 +0200
-@@ -37,7 +37,7 @@
- setScrollPolicy(SHOW_NEVER, SHOW_ALWAYS);
- addKeyListener(this);
- setFocusable(false);
-- setBorderSize(0);
-+ setFrameSize(0);
- }
-
- void BallzScrollArea::draw(gcn::Graphics *graphics)
-@@ -58,15 +58,3 @@
- graphics->fillRectangle(gcn::Rectangle(getWidth()-10, y+1, 6, 30));
- }
- }
--
--void BallzScrollArea::keyPressed(gcn::KeyEvent &keyEvent)
--{
-- if (keyEvent.getKey().getValue() == gcn::Key::DOWN)
-- {
-- setVerticalScrollAmount(getVerticalScrollAmount() + 16);
-- }
-- else if (keyEvent.getKey().getValue() == gcn::Key::UP)
-- {
-- setVerticalScrollAmount(getVerticalScrollAmount() - 16);
-- }
--}
-Index: ballz-debian/src/gui/ballzlistbox.cpp
-===================================================================
---- ballz-debian.orig/src/gui/ballzlistbox.cpp 2008-10-11 14:57:22.000000000 +0200
-+++ ballz-debian/src/gui/ballzlistbox.cpp 2008-10-11 14:57:22.000000000 +0200
-@@ -36,7 +36,7 @@
-
- BallzListBox::BallzListBox()
- {
-- setBorderSize(0);
-+ setFrameSize(0);
- mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
- }
-
-Index: ballz-debian/src/gui/levelselector.cpp
-===================================================================
---- ballz-debian.orig/src/gui/levelselector.cpp 2008-10-11 14:57:22.000000000 +0200
-+++ ballz-debian/src/gui/levelselector.cpp 2008-10-11 14:57:22.000000000 +0200
-@@ -40,7 +40,7 @@
-
- LevelSelector::LevelSelector()
- {
-- setBorderSize(0);
-+ setFrameSize(0);
- mSelectedImage = ResourceHandler::getInstance()->getBitmap("hand.bmp");
- mSelected = -1;
- setWidth(300);
-@@ -170,7 +170,7 @@
-
- if (key.getValue() == gcn::Key::ENTER || key.getValue() == gcn::Key::SPACE)
- {
-- generateAction();
-+ distributeActionEvent();
- keyEvent.consume();
- }
- else if (key.getValue() == gcn::Key::UP)
-Index: ballz-debian/src/gui/ballzscrollarea.hpp
-===================================================================
---- ballz-debian.orig/src/gui/ballzscrollarea.hpp 2008-10-11 14:57:30.000000000 +0200
-+++ ballz-debian/src/gui/ballzscrollarea.hpp 2008-10-11 14:57:38.000000000 +0200
-@@ -38,7 +38,6 @@
- public:
- BallzScrollArea();
- void draw(gcn::Graphics *graphics);
-- void keyPressed(gcn::KeyEvent &keyEvent);
- };
-
- #endif
diff --git a/debian/patches/ballz-1.0-syslibs.patch b/debian/patches/ballz-1.0-syslibs.patch
deleted file mode 100644
index c956cda..0000000
--- a/debian/patches/ballz-1.0-syslibs.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-diff -ur ballz-1.0/src/Makefile.am ballz-1.0.new/src/Makefile.am
---- ballz-1.0/src/Makefile.am 2007-04-05 22:21:32.000000000 +0200
-+++ ballz-1.0.new/src/Makefile.am 2007-04-17 14:18:19.000000000 +0200
-@@ -70,151 +70,6 @@
- gui/ballzlistbox.cpp\
- gui/ballzlistbox.hpp\
- gui/ballzscrollarea.cpp\
--gui/ballzscrollarea.hpp\
--guichan/actionevent.cpp\
--guichan/actionevent.hpp\
--guichan/actionlistener.hpp\
--guichan/allegro.hpp\
--guichan/basiccontainer.cpp\
--guichan/basiccontainer.hpp\
--guichan/cliprectangle.cpp\
--guichan/cliprectangle.hpp\
--guichan/color.cpp\
--guichan/color.hpp\
--guichan/deathlistener.hpp\
--guichan/defaultfont.cpp\
--guichan/defaultfont.hpp\
--guichan/event.cpp\
--guichan/event.hpp\
--guichan/exception.cpp\
--guichan/exception.hpp\
--guichan/focushandler.cpp\
--guichan/focushandler.hpp\
--guichan/focuslistener.hpp\
--guichan/font.cpp\
--guichan/font.hpp\
--guichan/graphics.cpp\
--guichan/graphics.hpp\
--guichan/gui.cpp\
--guichan/gui.hpp\
--guichan/image.cpp\
--guichan/image.hpp\
--guichan/imagefont.cpp\
--guichan/imagefont.hpp\
--guichan/imageloader.hpp\
--guichan/input.hpp\
--guichan/inputevent.cpp\
--guichan/inputevent.hpp\
--guichan/key.cpp\
--guichan/key.hpp\
--guichan/keyevent.cpp\
--guichan/keyevent.hpp\
--guichan/keyinput.cpp\
--guichan/keyinput.hpp\
--guichan/keylistener.hpp\
--guichan/listmodel.hpp\
--guichan/mouseevent.cpp\
--guichan/mouseevent.hpp\
--guichan/mouseinput.cpp\
--guichan/mouseinput.hpp\
--guichan/mouselistener.hpp\
--guichan/platform.hpp\
--guichan/rectangle.cpp\
--guichan/rectangle.hpp\
--guichan/widget.cpp\
--guichan/widget.hpp\
--guichan/allegro/allegrofont.hpp\
--guichan/allegro/allegrographics.cpp\
--guichan/allegro/allegrographics.hpp\
--guichan/allegro/allegroimage.cpp\
--guichan/allegro/allegroimage.hpp\
--guichan/allegro/allegroimageloader.cpp\
--guichan/allegro/allegroimageloader.hpp\
--guichan/allegro/allegroinput.cpp\
--guichan/allegro/allegroinput.hpp\
--guichan/widgets/button.cpp\
--guichan/widgets/button.hpp\
--guichan/widgets/container.cpp\
--guichan/widgets/container.hpp\
--guichan/widgets/checkbox.cpp\
--guichan/widgets/checkbox.hpp\
--guichan/widgets/dropdown.hpp\
--guichan/widgets/dropdown.cpp\
--guichan/widgets/icon.cpp\
--guichan/widgets/icon.hpp\
--guichan/widgets/label.cpp\
--guichan/widgets/label.hpp\
--guichan/widgets/listbox.cpp\
--guichan/widgets/listbox.hpp\
--guichan/widgets/radiobutton.cpp\
--guichan/widgets/radiobutton.hpp\
--guichan/widgets/scrollarea.cpp\
--guichan/widgets/scrollarea.hpp\
--guichan/widgets/slider.cpp\
--guichan/widgets/slider.hpp\
--guichan/widgets/textbox.cpp\
--guichan/widgets/textbox.hpp\
--guichan/widgets/textfield.cpp\
--guichan/widgets/textfield.hpp\
--guichan/widgets/window.cpp\
--guichan/widgets/window.hpp\
--dumb/aldumb.h\
--dumb/dumb.h\
--dumb/allegro/alplay.c\
--dumb/allegro/datduh.c\
--dumb/allegro/datit.c\
--dumb/allegro/datitq.c\
--dumb/allegro/datmod.c\
--dumb/allegro/dats3m.c\
--dumb/allegro/dats3mq.c\
--dumb/allegro/datunld.c\
--dumb/allegro/datxm.c\
--dumb/allegro/datxmq.c\
--dumb/allegro/packfile.c\
--dumb/core/atexit.c\
--dumb/core/duhlen.c\
--dumb/core/duhtag.c\
--dumb/core/dumbfile.c\
--dumb/core/loadduh.c\
--dumb/core/makeduh.c\
--dumb/core/rawsig.c\
--dumb/core/readduh.c\
--dumb/core/register.c\
--dumb/core/rendduh.c\
--dumb/core/rendsig.c\
--dumb/core/unload.c\
--dumb/it/itload.c\
--dumb/it/itload2.c\
--dumb/it/itmisc.c\
--dumb/it/itorder.c\
--dumb/it/itread.c\
--dumb/it/itread2.c\
--dumb/it/itrender.c\
--dumb/it/itunload.c\
--dumb/it/loadmod.c\
--dumb/it/loadmod2.c\
--dumb/it/loads3m.c\
--dumb/it/loads3m2.c\
--dumb/it/loadxm.c\
--dumb/it/loadxm2.c\
--dumb/it/readmod.c\
--dumb/it/readmod2.c\
--dumb/it/reads3m.c\
--dumb/it/reads3m2.c\
--dumb/it/readxm.c\
--dumb/it/readxm2.c\
--dumb/it/xmeffect.c\
--dumb/helpers/clickrem.c\
--dumb/helpers/memfile.c\
--dumb/helpers/resamp2.inc\
--dumb/helpers/resamp3.inc\
--dumb/helpers/resample.inc\
--dumb/helpers/resample.c\
--dumb/helpers/sampbuf.c\
--dumb/helpers/silence.c\
--dumb/helpers/stdfile.c\
--dumb/internal/aldumb.h\
--dumb/internal/dumb.h\
--dumb/internal/it.h
--
-+gui/ballzscrollarea.hpp
-
-+ballz_LDFLAGS = -ldumb -laldmb -lguichan -lguichan_allegro
-diff -ur ballz-1.0/src/gui/ballzlistbox.cpp ballz-1.0.new/src/gui/ballzlistbox.cpp
---- ballz-1.0/src/gui/ballzlistbox.cpp 2007-04-04 20:00:50.000000000 +0200
-+++ ballz-1.0.new/src/gui/ballzlistbox.cpp 2007-04-17 14:53:12.000000000 +0200
-@@ -70,7 +70,9 @@
- {
- if (isFocused())
- {
-- allegroGraphics->drawBitmap(mSelectedImage, 0, y + 1);
-+ gcn::AllegroImage image(mSelectedImage, 0);
-+ allegroGraphics->drawImage(&image, 0, 0, 0,
-+ y + 1, image.getWidth(), image.getHeight());
- }
- }
-
-diff -ur ballz-1.0/src/gui/datawriter.cpp ballz-1.0.new/src/gui/datawriter.cpp
---- ballz-1.0/src/gui/datawriter.cpp 2007-04-04 20:01:03.000000000 +0200
-+++ ballz-1.0.new/src/gui/datawriter.cpp 2007-04-17 14:48:01.000000000 +0200
-@@ -105,15 +105,21 @@
-
- if (mImage == BALLZ)
- {
-- allegroGraphics->drawBitmap(mBallzImage, 8, 8);
-+ gcn::AllegroImage image(mBallzImage, 0);
-+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
-+ image.getHeight());
- }
- else if (mImage == THEPROFESSOR)
- {
-- allegroGraphics->drawBitmap(mTheProfessorImage, 8, 8);
-- }
-- else if (mImage == THECOLONEL)
-- {
-- allegroGraphics->drawBitmap(mTheColonelImage, 8, 8);
-+ gcn::AllegroImage image(mTheProfessorImage, 0);
-+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
-+ image.getHeight());
-+ }
-+ else if (mImage == THECOLONEL)
-+ {
-+ gcn::AllegroImage image(mTheColonelImage, 0);
-+ allegroGraphics->drawImage(&image, 0, 0, 8, 8, image.getWidth(),
-+ image.getHeight());
- }
-
- unsigned int i;
-diff -ur ballz-1.0/src/gui/levelselector.cpp ballz-1.0.new/src/gui/levelselector.cpp
---- ballz-1.0/src/gui/levelselector.cpp 2007-04-04 20:01:09.000000000 +0200
-+++ ballz-1.0.new/src/gui/levelselector.cpp 2007-04-17 14:50:38.000000000 +0200
-@@ -148,7 +148,9 @@
- {
- if (isFocused())
- {
-- allegroGraphics->drawBitmap(mSelectedImage, 0, y);
-+ gcn::AllegroImage image(mSelectedImage, 0);
-+ allegroGraphics->drawImage(&image, 0, 0, 0, y,
-+ image.getWidth(), image.getHeight());
- }
- }
-
diff --git a/debian/patches/ballz-1.0-toggle-fullscreen.patch b/debian/patches/ballz-1.0-toggle-fullscreen.patch
deleted file mode 100644
index d14987f..0000000
--- a/debian/patches/ballz-1.0-toggle-fullscreen.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff --git a/src/game.cpp b/src/game.cpp
-index 92c3085..8f11e34 100644
---- a/src/game.cpp
-+++ b/src/game.cpp
-@@ -41,7 +41,7 @@
- #include "fading.hpp"
- #include <cmath>
-
--Game::Game()
-+Game::Game() : fullscreen(false)
- {
- allegro_init();
- install_keyboard();
-@@ -311,6 +311,14 @@ void Game::action(const gcn::ActionEvent& actionEvent)
- mMainMenuContainer->setVisible(false);
- mCreditsContainer->setVisible(true);
- }
-+ else if (mMainMenuListBox->getSelected() == 2)
-+ {
-+ if (fullscreen)
-+ set_gfx_mode(GFX_AUTODETECT_WINDOWED, 640, 480, 0, 0);
-+ else
-+ set_gfx_mode(GFX_AUTODETECT_FULLSCREEN, 640, 480, 0, 0);
-+ fullscreen = !fullscreen;
-+ }
- }
- else if (actionEvent.getSource() == mLevelSelector)
- {
-diff --git a/src/game.hpp b/src/game.hpp
-index a3b7761..2501a56 100644
---- a/src/game.hpp
-+++ b/src/game.hpp
-@@ -68,7 +68,7 @@ private:
- public:
- int getNumberOfElements()
- {
-- return 2;
-+ return 3;
- }
-
- std::string getElementAt(int i)
-@@ -79,6 +79,8 @@ private:
- return std::string("PLAY");
- case 1:
- return std::string("CREDITS");
-+ case 2:
-+ return std::string("FULLSCREEN");
- default: // Just to keep warnings away
- return std::string("");
- }
-@@ -94,6 +96,7 @@ private:
- EXIT
- };
-
-+ bool fullscreen;
- bool fadeRequested;
- State state;
- gcn::Gui* mGui;
diff --git a/debian/patches/cflags.patch b/debian/patches/cflags.patch
deleted file mode 100644
index 3ed5174..0000000
--- a/debian/patches/cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ballz-debian/configure.ac
-===================================================================
---- ballz-debian.orig/configure.ac 2008-10-11 15:10:03.000000000 +0200
-+++ ballz-debian/configure.ac 2008-10-11 15:10:05.000000000 +0200
-@@ -14,8 +14,8 @@
-
- AM_PATH_ALLEGRO(4.2.0, , AC_MSG_ERROR([Allegro library not found! You can get a copy at http://www.talula.demon.co.uk/allegro/]))
-
--CFLAGS="$CFLAGS `allegro-config --cflags` -Wno-missing-declarations -O2 -ffast-math -fomit-frame-pointer"
--CPPFLAGS="$CPPFLAGS `allegro-config --cppflags`-O2 -ffast-math -fomit-frame-pointer"
-+CFLAGS="$CFLAGS `allegro-config --cflags` -Wno-missing-declarations -ffast-math"
-+CPPFLAGS="$CPPFLAGS `allegro-config --cppflags` -ffast-math"
- LDFLAGS="$LDFLAGS `allegro-config --libs`"
-
- CXXFLAGS="$CXXFLAGS -DALLEGRO_USE_CONSOLE -DBALLZ_DATA_PREFIX='\"$datadir/ballz\"'"
diff --git a/debian/patches/changelog.patch b/debian/patches/changelog.patch
deleted file mode 100644
index 2117e43..0000000
--- a/debian/patches/changelog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ballz-debian/ChangeLog
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ ballz-debian/ChangeLog 2008-10-11 15:21:22.000000000 +0200
-@@ -0,0 +1,7 @@
-+2007-04-05 Team Darkbits
-+
-+ * v1.0: proper packaging and small fixes
-+
-+2007-04-02 Team Darkbits
-+
-+ * TINS '07 72-hours competition entry
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 36532ed..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-cflags.patch
-ballz-1.0-syslibs.patch
-ballz-1.0-toggle-fullscreen.patch
-ballz-1.0-guichan081.patch
-changelog.patch
diff --git a/debian/rules b/debian/rules
index 8791dd6..1a6c92b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,8 @@ endif
config.status: configure
dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
+# $(MAKE) -f /usr/share/quilt/quilt.make patch
- # We use the system version of these libs, move them out to
- # prevent gcc from using them instead of the system versions:
- mkdir moved_out && mv src/guichan* src/dumb moved_out/
- AUTOMAKE=automake-1.10 autoreconf --install --force
./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --bindir=/usr/games --datadir=/usr/share/games CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
@@ -31,8 +27,7 @@ build: build-stamp
build-stamp: config.status
dh_testdir
$(MAKE)
- convert -transparent black data/ballz.bmp debian/ballz.png
- convert -transparent black data/ballz.bmp debian/ballz.xpm
+ convert desktop/ballz.png debian/ballz.xpm
touch $@
clean:
@@ -41,23 +36,15 @@ clean:
rm -f build-stamp
# Remove files changed by 'autoreconf' to prevent them showing in the diff.gz
- [ ! -f Makefile ] || $(MAKE) maintainer-clean
- rm -f INSTALL Makefile.in aclocal.m4 config.guess config.sub configure data/Makefile.in depcomp install-sh missing mkinstalldirs src/Makefile.in
- rm -f debian/ballz.png debian/ballz.xpm
+ [ ! -f Makefile ] || $(MAKE) distclean
+# Install autotools-dev's config.sub and config.guess, if newer:
+ chmod 755 debian/update-autotools-config.sh
+ debian/update-autotools-config.sh .
+ rm -f debian/ballz.xpm
- # Move back files to avoid a big diff.gz and/or break double compilation
- -mv moved_out/* src/
- -rmdir moved_out/
-
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
+# $(MAKE) -f /usr/share/quilt/quilt.make unpatch
dh_clean
- # if this is a git repository, restore removed files that would have
- # been ignored by dpkg-source
- -test -d .git && git-checkout -- $$(git-status | \
- sed -e '/^#[[:space:]]*deleted:[[:space:]]*/s/^#[[:space:]]*deleted:[[:space:]]*//p;d' | \
- grep -v '^debian/')
-
install: build
dh_testdir
dh_testroot
diff --git a/debian/update-autotools-config.sh b/debian/update-autotools-config.sh
new file mode 100755
index 0000000..d30c5c5
--- /dev/null
+++ b/debian/update-autotools-config.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Copyright (C) 2006 Sylvain Beucler
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+# Updates config.guess and config.sub in the target directory only if
+# the autotools-dev version is newer
+
+# http://bugs.debian.org/380481
+
+dest="$1"
+# strip trailing slash for nicer output
+dest=$(echo $dest | sed 's:/$::')
+
+if [ -z $dest ]; then
+ echo "Usage: $0 destination"
+ exit 1;
+fi
+
+for ext in sub guess; do
+ # --version output looks like "GNU config.sub (2006-02-23)"
+ v_autotools=$(/usr/share/misc/config.$ext --version | head -1 | grep -o -E '[0-9]{4}-[0-9]{2}-[0-9]{2}')
+ v_upstream=$($dest/config.$ext --version | head -1 | grep -o -E '[0-9]{4}-[0-9]{2}-[0-9]{2}')
+ if dpkg --compare-versions "$v_autotools" '>>' "$v_upstream"; then
+ echo "Updating $dest/config.$ext"
+ cp -f /usr/share/misc/config.$ext $dest
+ fi
+done
--
ballz (platform/puzzle game)
More information about the Pkg-games-commits
mailing list