[Pkg-allegro-commits] r6 - tarballs unstable unstable/kq
unstable/kq/debian unstable/kq/debian/patches
Sam Hocevar
sho at costa.debian.org
Thu Mar 30 13:10:49 UTC 2006
Author: sho
Date: 2006-03-30 13:09:35 +0000 (Thu, 30 Mar 2006)
New Revision: 6
Added:
tarballs/kq_0.99.cvs20060330.orig.tar.gz
unstable/kq/
unstable/kq/debian/
unstable/kq/debian/README.Debian
unstable/kq/debian/changelog
unstable/kq/debian/compat
unstable/kq/debian/control
unstable/kq/debian/copyright
unstable/kq/debian/menu
unstable/kq/debian/patches/
unstable/kq/debian/patches/010_luac50.diff
unstable/kq/debian/patches/020_misc.diff
unstable/kq/debian/patches/series
unstable/kq/debian/rules
Log:
kq (0.99.cvs20060330-1) unstable; urgency=low
* Maintainer upload.
* Acknowledging previous NMU (Closes: #345246). Thanks to Luk Claes.
* New upstream CVS snapshot (Closes: #322677).
* This version asks for confirmation before quitting (Closes: #282446).
* Moved development to Alioth.
* debian/rules
+ Switched to quilt for patch handling.
* debian/control:
+ Build-depend on quilt.
+ Build-depend on lua50.
Added: tarballs/kq_0.99.cvs20060330.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: tarballs/kq_0.99.cvs20060330.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: unstable/kq/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: unstable/kq/debian/README.Debian
===================================================================
--- unstable/kq/debian/README.Debian 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/README.Debian 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,12 @@
+Notes for the KQ package
+========================
+
+The story is currently unfinished, but you can expect to play between 5
+and 10 hours (depending on your skills) before reaching the end of the
+current quest.
+
+Games can still be saved, so in your quest for the Opal Armor, if you
+ever get a key to the mountain caves, save your game and wait for the
+next release :-)
+
+ -- Sam Hocevar <sam at zoy.org> Sat, 26 Apr 2003 10:31:06 +0200
Added: unstable/kq/debian/changelog
===================================================================
--- unstable/kq/debian/changelog 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/changelog 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,185 @@
+kq (0.99.cvs20060330-1) unstable; urgency=low
+
+ * Maintainer upload.
+ * Acknowledging previous NMU (Closes: #345246). Thanks to Luk Claes.
+ * New upstream CVS snapshot (Closes: #322677).
+ * This version asks for confirmation before quitting (Closes: #282446).
+
+ * Moved development to Alioth.
+ * debian/rules
+ + Switched to quilt for patch handling.
+ * debian/control:
+ + Build-depend on quilt.
+ + Build-depend on lua50.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 30 Mar 2006 13:18:26 +0200
+
+kq (0.98+cvs.20031006-6.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Update dumb and aldmb build-deps to libdumb1-dev and libaldmb1-dev
+ (Closes: #345246).
+ * Make it build
+ + Change liblua41-dev build-deps to liblua40-dev.
+ + Change allegro build-deps to liballegro4.2-dev
+ + Use luac40 instead of luac
+
+ -- Luk Claes <luk at debian.org> Wed, 25 Jan 2006 19:15:29 +0100
+
+kq (0.98+cvs.20031006-6) unstable; urgency=low
+
+ * Rebuilt with a newer version of Allegro. A newer package of KQ will follow
+ but I first want to get rid of the old version of Allegro.
+ * debian/control:
+ + Set policy to 3.6.2.1.
+ * debian/copyright:
+ + Fixed the new FSF address.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 4 Oct 2005 01:37:52 +0200
+
+kq (0.98+cvs.20031006-5) unstable; urgency=low
+
+ * coliseum.lua:
+ + Applied missing part of previous patch.
+ (Closes: #225024).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 5 Aug 2004 23:47:31 +0200
+
+kq (0.98+cvs.20031006-4) unstable; urgency=low
+
+ * coliseum.lua:
+ + Applied patch from Peter Hull to fix a freeze after defeating Trayor
+ (Closes: #225024).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 3 Aug 2004 00:06:03 +0200
+
+kq (0.98+cvs.20031006-3) unstable; urgency=low
+
+ * debian/control:
+ + Set policy to 3.6.1.1.
+ * src/heroc.c:
+ + Display item description in battle item menu (Closes: #224973).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 25 Jul 2004 14:12:12 +0200
+
+kq (0.98+cvs.20031006-2) unstable; urgency=low
+
+ * scripts/tower.lua:
+ + Applied patch from <robert at thatsnice.org> that fixes the puzzle in the
+ tower (Closes: #217562).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 26 Oct 2003 15:03:23 +0100
+
+kq (0.98+cvs.20031006-1) unstable; urgency=low
+
+ * New CVS snapshot. As usual, lots of Debian fixes merged in HEAD.
+ * debian/rules:
+ + Moved platform-specific compiled scripts to /usr/lib/games.
+ + Clean using "make veryclean", not just "make clean".
+ * src/intrface.c:
+ + #include <lua.h>, not "lua.h", to fix "make depends" (Closes: #214283).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 6 Oct 2003 01:35:32 +0200
+
+kq (0.98+cvs.20030615-2) unstable; urgency=low
+
+ * debian/control:
+ + Set policy to 3.6.1.0.
+ + Wrote more meaningful long descriptions (Closes: #209866).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 2 Oct 2003 15:30:10 +0200
+
+kq (0.98+cvs.20030615-1) unstable; urgency=low
+
+ * New CVS snapshot. Upstream merged most Debian fixes in HEAD.
+ * debian/rules:
+ + Build the architecture-independant package in binary-arch instead of
+ doing everything in binary-indep (Closes: #197325).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 15 Jun 2003 02:34:13 +0200
+
+kq (0.98+cvs.20030528-5) unstable; urgency=medium
+
+ * Rebuilt with a version of liballegro that has a decent shlibs file, so
+ that we do not depend on an unavailable version (Closes: #197142).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 12 Jun 2003 15:14:30 +0200
+
+kq (0.98+cvs.20030528-4) unstable; urgency=medium
+
+ * Applied a patch from Steven Barker that hides the Invoke menu when no
+ suitable items are available (Closes: #196696).
+ * Fixed a bug in the SND_BAD sound effect that was blitting screen areas at
+ negative values during combats (Closes: #196700).
+ * Applied a patch from Robert Esplin that resets the gold counter when
+ creating a new game.
+ * Added a back buffer that gets used for special effects, so that we do
+ not clobber the other routines' back buffers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 10 Jun 2003 03:11:37 +0200
+
+kq (0.98+cvs.20030528-3) unstable; urgency=medium
+
+ * Created an architecture-independant kq-data package (2.5MB) to save some
+ archive space.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 1 Jun 2003 15:53:49 +0200
+
+kq (0.98+cvs.20030528-2) unstable; urgency=low
+
+ * Fixed a bug in the stealing routine that prevented the enemy's inventory
+ from being updated.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Fri, 30 May 2003 13:26:24 +0200
+
+kq (0.98+cvs.20030528-1) unstable; urgency=low
+
+ * New CVS snapshot.
+ * Added overriding key bindings. Old bindings still work, and can still be
+ modified by the user, but the overriding ones are always active and are
+ more intuitive (see the manpage) (Closes: #194753, #193289). Also, it
+ avoids screwing the keybindings when loading a new game.
+ * F12 now properly saves screenshots to ~/.kq/ .
+ * Set policy to 3.5.10.
+ * Slightly reworked the icon colours because the 24-colour palette
+ limitation was dropped.
+ * Defaulted strech_view to 1 so that fullscreen works.
+ * Applied a patch from upstream to avoid potential partners becoming
+ unresponsive (Closes: #193896).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 28 May 2003 18:29:20 +0200
+
+kq (0.98+cvs.20030512-2) unstable; urgency=low
+
+ * Activated joystick button controls (Closes: #193363).
+ * Added a link to the KQ home page in the manual page.
+ * Fixed enemy.c so that fights do not become too easy (Closes: #193895).
+
+ -- Samuel Hocevar <sam at zoy.org> Mon, 26 May 2003 11:06:29 +0200
+
+kq (0.98+cvs.20030512-1) unstable; urgency=low
+
+ * New CVS snapshot.
+ * Snapshot includes user-contributed patch for a crash on machines without
+ sound support (Closes: #192211).
+ * Fixed a bad index value in the inventory (Closes: #192946).
+ * Fixed a crash on exit due to combat.c messing around with bitmaps.
+
+ -- Samuel Hocevar <sam at zoy.org> Mon, 12 May 2003 12:52:05 +0200
+
+kq (0.98+cvs.20030503-1) unstable; urgency=low
+
+ * New CVS snapshot.
+ * binary-arch now depends on the install rule (Closes: #191852).
+
+ -- Samuel Hocevar <sam at zoy.org> Sun, 4 May 2003 14:51:02 +0200
+
+kq (0.98+cvs.20030129-1) unstable; urgency=low
+
+ * Initial Debian release (Closes: #190977).
+ * Created skeleton files for res.c generation.
+ * Added startup code to set ~/.kq/ as the working directory.
+ * Drew an icon for the KQ menu entry.
+ * Wrote a manpage for kq(6).
+
+ -- Samuel Hocevar <sam at zoy.org> Sat, 26 Apr 2003 10:31:06 +0200
Added: unstable/kq/debian/compat
===================================================================
--- unstable/kq/debian/compat 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/compat 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1 @@
+4
Added: unstable/kq/debian/control
===================================================================
--- unstable/kq/debian/control 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/control 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,30 @@
+Source: kq
+Section: games
+Priority: optional
+Maintainer: Debian allegro packages maintainers <pkg-allegro-maintainers at lists.alioth.debian.org>
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>= 4.0), quilt, liballegro4.2-dev, libaldmb1-dev, liblua50-dev, lua50
+
+Package: kq
+Architecture: any
+Depends: kq-data, ${shlibs:Depends}
+Description: adventure game in the spirit of Final Fantasy
+ KQ is an adventure game in the spirit of old console games such as Secret of
+ Mana, Final Fantasy or Zelda.
+ .
+ Choose your player amongst the eight different adventurers, visit towns,
+ buy weapons and equipment, learn magic, slash monsters, and maybe you will
+ eventually find the magical Staff of Xenarum!
+
+Package: kq-data
+Architecture: all
+Depends: kq (= ${Source-Version})
+Conflicts: kq (<< 0.98+cvs.20030528-3)
+Replaces: kq (<< 0.98+cvs.20030528-3)
+Description: graphics and audio data for kq
+ KQ is an adventure game in the spirit of old console games such as Secret of
+ Mana, Final Fantasy or Zelda.
+ .
+ This package contains the architecture-independent data for kq. For more
+ information, see the kq package.
Added: unstable/kq/debian/copyright
===================================================================
--- unstable/kq/debian/copyright 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/copyright 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,28 @@
+This is a Debian packaged version of the KQ Lives game.
+
+This package was put together by Sam Hocevar, using sources from the KQ CVS
+tree at SourceForge. The KQ SourceForge webage is at:
+ http://kqlives.sourceforge.net/
+
+Upstream Author: Josh Bolduc <jdb at mb.sympatico.ca>
+
+ -- Sam Hocevar <sam at zoy.org> Fri, 25 Apr 2003 13:35:50 +0200
+
+KQ is Copyright (C) 2002 by Josh Bolduc
+
+ This program 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, or (at your option) any
+ later version.
+
+ This program 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 program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
Added: unstable/kq/debian/menu
===================================================================
--- unstable/kq/debian/menu 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/menu 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,3 @@
+?package(kq):needs="X11" section="Games/Adventure" \
+ title="KQ" command="/usr/games/kq" \
+ icon="/usr/share/games/kq/kq.xpm"
Added: unstable/kq/debian/patches/010_luac50.diff
===================================================================
--- unstable/kq/debian/patches/010_luac50.diff 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/patches/010_luac50.diff 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,91 @@
+Index: kq-0.99.cvs20060330/mkfiles/makefile.cfg
+===================================================================
+--- kq-0.99.cvs20060330.orig/mkfiles/makefile.cfg 2005-11-12 10:32:24.000000000 +0100
++++ kq-0.99.cvs20060330/mkfiles/makefile.cfg 2006-03-30 13:52:13.000000000 +0200
+@@ -74,7 +74,7 @@
+ # DFLAGS are the flags used to build the dependencies. #
+ # #
+ CXXFLAGS := -Wall -Werror -W -I $(INC_DIR) -finline
+-CFLAGS := -Wall -W -I $(INC_DIR)
++CFLAGS := -Wall -W -I $(INC_DIR) -I /usr/include/lua50
+ DEPFLAGS := -MM -MG -I$(INC_DIR)
+ LDFLAGS :=
+ TGZFLAGS := cvzf
+@@ -99,7 +99,7 @@
+ # #
+ # The extra libraries we need to compile the program. Just the base name. #
+ # #
+-LIBRARY := lua
++LIBRARY := lua50
+ ifdef KQ_USE_JGMOD
+ LIBRARY += jgmod
+ else
+Index: kq-0.99.cvs20060330/readme.txt
+===================================================================
+--- kq-0.99.cvs20060330.orig/readme.txt 2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060330/readme.txt 2006-03-30 13:52:13.000000000 +0200
+@@ -132,7 +132,7 @@
+ script into a .lob file, do the following if you have perl:
+
+ perl prep.pl < filename.lua > temp.tmp
+-luac -o filename.lob temp.tmp
++luac50 -o filename.lob temp.tmp
+
+ I tried piping under DOS, but it wasn't working quite right. Just
+ try it yourself if you like.
+@@ -141,7 +141,7 @@
+ 'scripts' directory that contains all of the .lua files, but without
+ macros in them. Then you can compile these by just doing this:
+
+-luac -o filename.lob filename.lua
++luac50 -o filename.lob filename.lua
+
+ If you don't use DOS for doing this, things might be slightly
+ different for you.
+Index: kq-0.99.cvs20060330/scripts/compall.sh
+===================================================================
+--- kq-0.99.cvs20060330.orig/scripts/compall.sh 2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060330/scripts/compall.sh 2006-03-30 13:52:13.000000000 +0200
+@@ -1,5 +1,5 @@
+ for a in `cat allsc.txt`
+ do
+ echo "Processing $a"
+- perl prep.pl < $a.lua | ./luac.exe -o $a.lob -
++ perl prep.pl < $a.lua | ./luac50.exe -o $a.lob -
+ done
+Index: kq-0.99.cvs20060330/scripts/comp.bat
+===================================================================
+--- kq-0.99.cvs20060330.orig/scripts/comp.bat 2002-09-03 23:13:53.000000000 +0200
++++ kq-0.99.cvs20060330/scripts/comp.bat 2006-03-30 13:52:13.000000000 +0200
+@@ -1,4 +1,4 @@
+ perl prep.pl < %1.lua > _tmpfile.$$$
+-luac -o %1.lob _tmpfile.$$$
++luac50 -o %1.lob _tmpfile.$$$
+ erase _tmpfile.$$$
+
+Index: kq-0.99.cvs20060330/scripts/Makefile.am
+===================================================================
+--- kq-0.99.cvs20060330.orig/scripts/Makefile.am 2006-03-30 13:13:00.000000000 +0200
++++ kq-0.99.cvs20060330/scripts/Makefile.am 2006-03-30 14:55:09.000000000 +0200
+@@ -15,7 +15,7 @@
+ all-am: Makefile confirm-dir $(LOBS)
+
+ %.lob: pscripts/%.lua $(INCLUDES)
+- luac -o $@ $<
++ luac50 -o $@ $<
+
+
+ pscripts/%.lua: $(srcdir)/%.lua
+Index: kq-0.99.cvs20060330/scripts/Makefile.in
+===================================================================
+--- kq-0.99.cvs20060330.orig/scripts/Makefile.in 2006-03-30 14:09:44.000000000 +0200
++++ kq-0.99.cvs20060330/scripts/Makefile.in 2006-03-30 14:55:29.000000000 +0200
+@@ -308,7 +308,7 @@
+ all-am: Makefile confirm-dir $(LOBS)
+
+ %.lob: pscripts/%.lua $(INCLUDES)
+- luac -o $@ $<
++ luac50 -o $@ $<
+
+ pscripts/%.lua: $(srcdir)/%.lua
+ $(CPP) $(foreach X, $(INCLUDES), -include $(X)) $< > $@
Added: unstable/kq/debian/patches/020_misc.diff
===================================================================
--- unstable/kq/debian/patches/020_misc.diff 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/patches/020_misc.diff 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,178 @@
+Index: kq-0.99.cvs20060330/include/kq.h
+===================================================================
+--- kq-0.99.cvs20060330.orig/include/kq.h 2006-03-02 23:38:44.000000000 +0100
++++ kq-0.99.cvs20060330/include/kq.h 2006-03-30 13:52:13.000000000 +0200
+@@ -31,6 +31,7 @@
+
+
+ #include <allegro.h>
++#include "config.h"
+ #include "entity.h"
+
+ #define MAX_TILES 1024
+Index: kq-0.99.cvs20060330/scripts/cult.lua
+===================================================================
+--- kq-0.99.cvs20060330.orig/scripts/cult.lua 2005-11-12 10:32:25.000000000 +0100
++++ kq-0.99.cvs20060330/scripts/cult.lua 2006-03-30 13:52:13.000000000 +0200
+@@ -372,7 +372,7 @@
+ local a, b, dx, dy
+ local ax, ay, z
+
+- create_df("data/mpcx.dat", "LFLAME_PCX")
++ create_df("/usr/share/games/kq/data/mpcx.dat", "LFLAME_PCX")
+ create_bmp(0, 24, 24)
+ df2bmp(0, 0, 16, 0, 0, 24, 24)
+ create_bmp(1, 64, 16)
+Index: kq-0.99.cvs20060330/src/credits.c
+===================================================================
+--- kq-0.99.cvs20060330.orig/src/credits.c 2005-11-12 10:32:25.000000000 +0100
++++ kq-0.99.cvs20060330/src/credits.c 2006-03-30 13:52:13.000000000 +0200
+@@ -131,7 +131,7 @@
+ }
+ e = 320 - ticks;
+ if (e != last_e) {
+- x0 = (320 - wk->w) / 2;
++ x0 = (320 - wk->w) / 2 + 8;
+ for (i = 0; i < wk->w; ++i) {
+ blit (wk, double_buffer, i, ease (i + e), i + x0, 185, 1, 32);
+ }
+Index: kq-0.99.cvs20060330/src/kq.c
+===================================================================
+--- kq-0.99.cvs20060330.orig/src/kq.c 2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060330/src/kq.c 2006-03-30 13:52:13.000000000 +0200
+@@ -164,7 +164,7 @@
+ /*! True if the intro is to be skipped (the bit where the heroes learn of the quest) */
+ unsigned char skip_intro = 0;
+ /*! Graphics mode settings */
+-unsigned char wait_retrace = 0, windowed = 0, stretch_view = 0, cpu_usage = 0;
++unsigned char wait_retrace = 0, windowed = 0, stretch_view = 1, cpu_usage = 0;
+ /*! Current sequence position of animated tiles */
+ unsigned short tilex[MAX_TILES];
+ /*! Current 'time' for animated tiles. When this increments to adata[].delay,
+@@ -353,16 +353,16 @@
+ poll_keyboard ();
+ }
+
+- balt = key[kalt];
+- besc = key[kesc];
+- bctrl = key[kctrl];
+- benter = key[kenter];
++ balt = key[kalt] | key[KEY_SPACE];
++ besc = key[kesc] | key[KEY_ESC];
++ bctrl = key[kctrl] | key[KEY_ESC];
++ benter = key[kenter] | key[KEY_ENTER];
+ bhelp = key[KEY_F1];
+
+- up = key[kup];
+- down = key[kdown];
+- left = key[kleft];
+- right = key[kright];
++ up = key[kup] | key[KEY_UP];
++ down = key[kdown] | key[KEY_DOWN];
++ left = key[kleft] | key[KEY_LEFT];
++ right = key[kright] | key[KEY_RIGHT];
+
+ // TT: Is there a reason this has to be called twice in one function?
+ // poll_music ();
+@@ -1826,7 +1826,7 @@
+ startup ();
+ game_on = 1;
+ /* Also this can be overridden by settings in config */
+- skip_splash = 0;
++ skip_splash = 1;
+ while (game_on) {
+ switch (start_menu (skip_splash)) {
+ case 0:
+Index: kq-0.99.cvs20060330/src/setup.c
+===================================================================
+--- kq-0.99.cvs20060330.orig/src/setup.c 2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060330/src/setup.c 2006-03-30 13:52:13.000000000 +0200
+@@ -781,26 +781,37 @@
+ */
+ void show_help (void)
+ {
++ char key[80];
+ menubox (double_buffer, 116 + xofs, yofs, 9, 1, BLUE);
+ print_font (double_buffer, 132 + xofs, 8 + yofs, "KQ Help", FGOLD);
+ menubox (double_buffer, 32 + xofs, 32 + yofs, 30, 20, BLUE);
+ menubox (double_buffer, xofs, 216 + yofs, 38, 1, BLUE);
++#if 0
+ print_font (double_buffer, 16 + xofs, 224 + yofs,
+ "Press CONFIRM to exit this screen", FNORMAL);
+- citem (72, "Up Key:", kq_keyname (kup), FNORMAL);
+- citem (80, "Down Key:", kq_keyname (kdown), FNORMAL);
+- citem (88, "Left Key:", kq_keyname (kleft), FNORMAL);
+- citem (96, "Right Key:", kq_keyname (kright), FNORMAL);
+- citem (104, "Confirm Key:", kq_keyname (kalt), FNORMAL);
+- citem (112, "Cancel Key:", kq_keyname (kctrl), FNORMAL);
+- citem (120, "Menu Key:", kq_keyname (kenter), FNORMAL);
+- citem (128, "System Menu Key:", kq_keyname (kesc), FNORMAL);
++#endif
++ sprintf(key, kup != KEY_UP ? "UP/%s" : "%s", kq_keyname (kup));
++ citem (80, "Up Key:", key, FNORMAL);
++ sprintf(key, kdown != KEY_DOWN ? "DOWN/%s" : "%s", kq_keyname (kdown));
++ citem (88, "Down Key:", key, FNORMAL);
++ sprintf(key, kleft != KEY_LEFT ? "LEFT/%s" : "%s", kq_keyname (kleft));
++ citem (96, "Left Key:", key, FNORMAL);
++ sprintf(key, kright != KEY_RIGHT ? "RIGHT/%s" : "%s", kq_keyname (kright));
++ citem (104, "Right Key:", key, FNORMAL);
++ sprintf(key, kalt != KEY_SPACE ? "SPACE/%s" : "%s", kq_keyname (kalt));
++ citem (112, "Confirm Key:", key, FNORMAL);
++ sprintf(key, kctrl != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kctrl));
++ citem (120, "Cancel Key:", key, FNORMAL);
++ sprintf(key, kenter != KEY_ENTER ? "ENTER/%s" : "%s", kq_keyname (kenter));
++ citem (128, "Menu Key:", key, FNORMAL);
++ sprintf(key, kesc != KEY_ESC ? "ESC/%s" : "%s", kq_keyname (kesc));
++ citem (136, "System Menu Key:", key, FNORMAL);
+ do {
+ blit2screen (xofs, yofs);
+ readcontrols ();
+ kq_yield ();
+ }
+- while (!balt && !bctrl);
++ while (!balt && !bctrl && !besc);
+ unpress ();
+ }
+
+Index: kq-0.99.cvs20060330/src/unix.c
+===================================================================
+--- kq-0.99.cvs20060330.orig/src/unix.c 2006-03-30 12:57:58.000000000 +0200
++++ kq-0.99.cvs20060330/src/unix.c 2006-03-30 14:00:23.000000000 +0200
+@@ -41,6 +41,9 @@
+
+
+
++#define LIB_DIR "/usr/lib/games/kq"
++#define SHARE_DIR "/usr/share/games/kq"
++
+ /*! \brief Return the name of 'significant' directories.
+ *
+ * Checks to see if the exe is in its correct, install location (set
+@@ -75,17 +78,7 @@
+ strcpy (user_dir, ".");
+ }
+ /* Now the data directory */
+- get_executable_name(exe, sizeof(exe));
+- if (strcmp(exe, KQ_BIN)==0)
+- {
+- /* It's in its proper installed location */
+- strcpy(game_dir, KQ_DATA);
+- }
+- else
+- {
+- /* Not installed, development version */
+- strcpy(game_dir, ".");
+- }
++ strcpy(game_dir, SHARE_DIR);
+ init_path = 1;
+ }
+ switch (dir) {
+@@ -103,7 +96,7 @@
+ sprintf (ans, "%s/%s", user_dir, file);
+ break;
+ case SCRIPT_DIR:
+- sprintf (ans, "%s/scripts/%s", game_dir, file);
++ sprintf (ans, "%s/scripts/%s", LIB_DIR, file);
+ break;
+ default:
+ return NULL;
Added: unstable/kq/debian/patches/series
===================================================================
--- unstable/kq/debian/patches/series 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/patches/series 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,2 @@
+010_luac50.diff -p1
+020_misc.diff -p1
Added: unstable/kq/debian/rules
===================================================================
--- unstable/kq/debian/rules 2006-03-30 10:56:35 UTC (rev 5)
+++ unstable/kq/debian/rules 2006-03-30 13:09:35 UTC (rev 6)
@@ -0,0 +1,81 @@
+#!/usr/bin/make -f
+
+build: build-stamp
+build-stamp:
+ dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ touch configure.ac
+ touch aclocal.m4
+ touch configure
+ touch config.h.in
+ touch `find . -name Makefile.in`
+ ./configure --prefix=/usr
+ $(MAKE)
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ -$(MAKE) veryclean
+ rm -f `find maps -name '*.o' -o -name 'mapdraw'`
+ rm -f game.log #src/res.c
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs -pkq usr/games \
+ usr/share/games/kq \
+ usr/lib/games/kq/scripts
+ dh_installdirs -pkq-data usr/share/doc \
+ usr/share/games/kq/data \
+ usr/share/games/kq/maps \
+ usr/share/games/kq/music
+
+ install -m 755 kq `pwd`/debian/kq/usr/games/
+ install -m 644 debian/kq.xpm `pwd`/debian/kq/usr/share/games/kq/
+
+ install -m 644 `find data -name '*.dat' -o -name '*.mon' -o -name '*.kq'` \
+ `pwd`/debian/kq-data/usr/share/games/kq/data/
+ install -m 644 `find maps -name '*.map'` \
+ `pwd`/debian/kq-data/usr/share/games/kq/maps/
+ install -m 644 `find music -name '*.*m*'` \
+ `pwd`/debian/kq-data/usr/share/games/kq/music/
+ # Hahaha! luac-compiled files are not fully portable!
+ install -m 644 `find scripts -name '*.lob'` \
+ `pwd`/debian/kq/usr/lib/games/kq/scripts/
+
+ ln -s kq `pwd`/debian/kq-data/usr/share/doc/kq-data
+
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_compress -i
+ dh_fixperms -i
+ dh_installdeb -i
+ dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a readme.txt
+ dh_installmenu -a
+ dh_installman -a debian/kq.6
+ dh_installchangelogs -a ChangeLog
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Property changes on: unstable/kq/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-allegro-commits
mailing list