r13968 - in packages/trunk/kraptor/debian: . patches
Markus Koschany
apo-guest at alioth.debian.org
Mon Feb 25 23:33:41 UTC 2013
Author: apo-guest
Date: 2013-02-25 23:33:41 +0000 (Mon, 25 Feb 2013)
New Revision: 13968
Modified:
packages/trunk/kraptor/debian/changelog
packages/trunk/kraptor/debian/compat
packages/trunk/kraptor/debian/control
packages/trunk/kraptor/debian/copyright
packages/trunk/kraptor/debian/kraptor.6
packages/trunk/kraptor/debian/menu
packages/trunk/kraptor/debian/patches/01_makefile.patch
packages/trunk/kraptor/debian/patches/02_mask_bits.patch
packages/trunk/kraptor/debian/patches/03_static_menu.patch
packages/trunk/kraptor/debian/patches/04_static_joymnu.patch
packages/trunk/kraptor/debian/patches/05_static_game.patch
packages/trunk/kraptor/debian/patches/06_default_font.patch
packages/trunk/kraptor/debian/patches/07_directories.patch
packages/trunk/kraptor/debian/patches/08_home.patch
packages/trunk/kraptor/debian/patches/series
packages/trunk/kraptor/debian/rules
packages/trunk/kraptor/debian/watch
Log:
Debian Release 0.0.20040403-8
Modified: packages/trunk/kraptor/debian/changelog
===================================================================
--- packages/trunk/kraptor/debian/changelog 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/changelog 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,16 +1,64 @@
-kraptor (0.0.20040403-7) UNRELEASED; urgency=low
+kraptor (0.0.20040403-8) unstable; urgency=low
+ * Team upload.
+ * Improve 02_mask_bits.patch and fix FTBFS on current and future 64bit arches
+ by defining MASK_WORD_BITBITS more generic in include/pmask.h.
+
+ -- Markus Koschany <apo at gambaru.de> Sun, 24 Feb 2013 23:26:19 +0100
+
+kraptor (0.0.20040403-7) unstable; urgency=low
+
+ * Team upload.
+
[ Gonéri Le Bouder ]
- * Remove myself from Uploaders:
+ * Remove myself from Uploaders.
- [ Ansgar Burchardt ]
- * debian/watch: End replacement in uversionmangle rules.
+ [ Markus Koschany ]
+ * New patches and features:
+ - Add dep3 headers to all patches.
+ - 01_makefile.patch: Add support for hardening build flags.
+ - 09_start-in-windowed-mode.patch: Do not start in fullscreen mode but in
+ windowed mode by default. This implements the Games Team's policy and
+ avoids graphic problems when switching between game and desktop.
+ - 10_fix-Werror-format-security-error.patch: Fixes a FTBFS.
+ - 11_fix-spelling-error-in-binary.patch: requiere <-> require
+ - 12_save-games-in-home.patch: Save game in $HOME/.kraptor.
+ - 13_save-bitmaps-in-home.patch: Save screenshots in $HOME/.kraptor
+ - 14_create-hidden-kraptor-directory-in-home.patch: Create the hidden
+ .kraptor directory in $HOME.
+ Regardless of the current working directory screenshots and savegames are
+ always saved in the home directory of the user. (Closes: #576869)
+ * Switch to package format 3.0 (quilt).
+ * debian/control:
+ - Drop quilt dependency. Package format 3.0 uses quilt by default.
+ - Fix broken VCS-Browser link.
+ - Update Standards-Version to 3.9.4, no changes needed.
+ - Add ${misc:Depends} to kraptor and kraptor-data.
+ * Bump compat level to 9 and require debhelper >= 9 for automatic hardening
+ build flags.
+ * Improve watch file. Thanks to Bart Martens.
+ * Update the package description and the manpage. Fix spelling mistakes.
+ * Update debian/copyright to copyright format 1.0.
+ * debian/rules:
+ - Use dh sequencer to simplify debian/rules.
+ - Build with --parallel.
+ - Build with hardening=+all.
+ * Do not symlink the documentation from kraptor-data to kraptor.
+ Use the docs file to install the documentation and make use of
+ kraptor.preinst. Delete the symlink before upgrading to the new revision
+ because dpkg does not replace symlinks with directories and vice versa.
+ * Install arch-dependent data with kraptor.install and the
+ arch-independent data with kraptor-data.install.
+ * Install kraptor.6 via manpages file.
+ * Add longtitle to menu file.
+ * Add kraptor.desktop and a corresponding icon thus Kraptor can also be
+ started from desktop menus or Gnome Shell.
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 19 Apr 2009 16:06:49 +0200
+ -- Markus Koschany <apo at gambaru.de> Sun, 24 Feb 2013 15:51:02 +0100
kraptor (0.0.20040403-6) unstable; urgency=low
- * Upload to unstable
+ * Upload to unstable
-- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 14 Feb 2009 15:37:36 +0100
@@ -33,12 +81,12 @@
[ Gonéri Le Bouder ]
* Fix the watch file so can compare Debian and upstream versions
- (apr_03_2004 => 0.0.20040403) Closes: #381364
+ (apr_03_2004 => 0.0.20040403) Closes: #381364
* kraptor depends on kraptor-data (= ${source:Version}), was
(>= ${Source-Version})
* Standard Version 3.8.0, no change
* do not ignore make clean return anymore
- * clean target.os
+ * clean target.os
* Upload in experimental because of lenny freeze
-- Gonéri Le Bouder <goneri at rulezlan.org> Tue, 13 Jan 2009 22:08:40 +0100
Modified: packages/trunk/kraptor/debian/compat
===================================================================
--- packages/trunk/kraptor/debian/compat 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/compat 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/kraptor/debian/control
===================================================================
--- packages/trunk/kraptor/debian/control 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/control 2013-02-25 23:33:41 UTC (rev 13968)
@@ -3,34 +3,43 @@
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Miriam Ruiz <little_miry at yahoo.es>
-Build-Depends: debhelper (>= 5.0.0), quilt, libxxf86dga-dev, libxxf86vm-dev, liballegro4.2-dev | liballegro-dev, libdumb1-dev, libaldmb1-dev, libxcursor-dev
-Standards-Version: 3.8.0
+Build-Depends:
+ debhelper (>= 9),
+ libaldmb1-dev,
+ liballegro4.2-dev | liballegro-dev,
+ libdumb1-dev,
+ libxcursor-dev,
+ libxxf86dga-dev,
+ libxxf86vm-dev
+Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/kraptor/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/kraptor/?op=log
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/kraptor/
Homepage: http://kraptor.sourceforge.net/
Package: kraptor
Architecture: any
-Depends: ${shlibs:Depends}, kraptor-data (= ${source:Version})
+Depends: kraptor-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
Description: Classic shoot 'em up scroller game
Kraptor is a classic shoot 'em up scroller game, where you must fight
against tons of bad dudes. The game offers high speed action, with massive
destruction and lots of fun. Kraptor features a powerful engine for 2D
shooter scroller games.
.
- After years of oppression, the slaved people of the world have raised against
- their masters. You, has a mercenary pilot, has been contacted by the popular
- rebellion to fight against the forces of oppression. In the morning, you jump
- into your cockpit and start up the engines. It's time to get airborne and start
- the attack. Get ready to scramble the scum hired by the masters. Murder for
- freedom is the only way, you're on a mission, don't defraud us...
+ After years of oppression, the slaved people of the world have raised
+ against their masters. You, a mercenary pilot, have been contacted by the
+ popular rebellion to fight against the forces of oppression. In the morning
+ you jump into your cockpit and start up the engines. It's time to get airborne
+ and start the attack. Get ready to defeat the scum hired by the masters.
+ Fighting for freedom is the only way, you're on a mission, don't defraud us...
Package: kraptor-data
+Depends: ${misc:Depends}
+Suggests: kraptor
Architecture: all
-Description: Classic shoot 'em up scroller game - data files
+Description: Classic shoot 'em up scroller game -- data files
Kraptor is a classic shoot 'em up scroller game, where you must fight
against tons of bad dudes. The game offers high speed action, with massive
destruction and lots of fun. Kraptor features a powerful engine for 2D
shooter scroller games.
.
- This package includes the data of the game.
+ This package contains the game data files.
Modified: packages/trunk/kraptor/debian/copyright
===================================================================
--- packages/trunk/kraptor/debian/copyright 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/copyright 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,30 +1,33 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Sun, 3 Apr 2005 16:07:14 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Kraptor
+Upstream-Contact: Bruno Diaz <kronopio at users.sourceforge.net>
+Source: http://kraptor.sourceforge.net
-It was downloaded from http://kraptor.sourceforge.net/
+Files: *
+Copyright: 2002-2003, Bruno Diaz <kronopio at users.sourceforge.net> (Kronoman)
+License: MIT
-Copyright (c) 2002, 2003, Kronoman
+Files: debian/*
+Copyright: 2005-2006, Miriam Ruiz <little_miry at yahoo.es>
+ 2009, Gonéri Le Bouder <goneri at rulezlan.org>
+ 2013, Markus Koschany <apo at gambaru.de>
+License: MIT
-Upstream Author: Bruno Diaz <kronopio at users.sourceforge.net>
-
-License:
-
- This program is distributed under The MIT License
-
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- IN THE SOFTWARE.
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
Modified: packages/trunk/kraptor/debian/kraptor.6
===================================================================
--- packages/trunk/kraptor/debian/kraptor.6 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/kraptor.6 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,19 +1,19 @@
-.\"
-.TH "kraptor" "6" "29.05.2005" "Miriam Ruiz" "Games"
+.\"
+.TH "kraptor" "6" "2013-02-20" "Miriam Ruiz" "Games"
.SH "NAME"
kraptor \- a classic shoot 'em up scroller game
.SH "SYNOPSIS"
-.B kraptor [\fIoptions\fR]
+.B kraptor \fI[options]\fR
.SH "DESCRIPTION"
-Kraptor is a classic shoot 'em up scroller game, where you must fight against tons of bad dudes. The game offers high speed action, with massive destruction and lots of fun. Kraptor features a powerful engine for 2D shooter scroller games.
+Kraptor is a classic shoot 'em up scroller game, where you must fight against tons of bad dudes. The game offers high speed action with massive destruction and lots of fun. Kraptor features a powerful engine for 2D shooter scroller games.
-After years of oppression, the slaved people of the world have raised against their masters. You, has a mercenary pilot, has been contacted by the popular rebellion to fight against the forces of oppression.
+After years of oppression the slaved people of the world have raised against their masters. You, a mercenary pilot, have been contacted by the popular rebellion to fight against the forces of oppression.
-In the morning, you jump into your cockpit and start up the engines. It's time to get airborne and start the attack. Get ready to scramble the scum hired by the masters. Murder for freedom is the only way, you're on a mission, don't defraud us...
+In the morning you jump into your cockpit and start up the engines. It's time to get airborne and start the attack. Get ready to defeat the scum hired by the masters. Fighting for freedom is the only way, you're on a mission, don't defraud us...
.SH "USAGE"
-You must drive your plane and fight your enemies through a series of different levels. You can move your plane with the mouse, fire your current selected weapon with your left mouse button and use the right mouse button to change weapon.
+You must fly your plane and fight your enemies through a series of different levels. You can move your plane with the mouse, fire your current selected weapon with your left mouse button and use the right mouse button to change weapons.
-There's access to a 'Black market' shop between levels where you can buy new weapons, upgrade ship, etc. You can always save your game at that point, so you must not start from the beginning every time you play the game.
+There's access to a 'black market' shop between levels where you can buy new weapons and upgrade your ship. You can always save your game at that point, so you don't have to start from the beginning every time you play the game.
.SH "OPTIONS"
These command line options are available:
\-safe Will run the game in 'safe' mode (will try to start it no matter what)
Modified: packages/trunk/kraptor/debian/menu
===================================================================
--- packages/trunk/kraptor/debian/menu 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/menu 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,3 +1,6 @@
-?package(kraptor):needs="x11" section="Games/Action" \
- title="KRaptor" command="/usr/games/kraptor" \
- icon="/usr/share/pixmaps/kraptor.xpm"
+?package(kraptor):needs="x11" \
+ section="Games/Action" \
+ title="Kraptor" \
+ longtitle="Kraptor - classic shoot 'em up scroller game" \
+ command="/usr/games/kraptor" \
+ icon="/usr/share/pixmaps/kraptor.xpm"
Modified: packages/trunk/kraptor/debian/patches/01_makefile.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/01_makefile.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/01_makefile.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,6 +1,15 @@
-diff -ruN kraptor-0.0.20040403.orig/makefile kraptor-0.0.20040403.new/makefile
---- kraptor-0.0.20040403.orig/makefile 2003-12-14 04:13:00.000000000 +0100
-+++ kraptor-0.0.20040403.new/makefile 2006-09-22 22:46:31.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 01_makefile
+
+---
+ makefile | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/makefile b/makefile
+index ed32c56..3fc4ab6 100644
+--- a/makefile
++++ b/makefile
@@ -5,7 +5,9 @@
# ------------------------------------------------------------------------
@@ -12,7 +21,7 @@
# Suggested by GNU Coding Stardards
SHELL = /bin/sh
-@@ -53,7 +55,7 @@
+@@ -53,7 +55,7 @@ OBJSUF = .o
LFLAGS = -s -laldmb -ldumb -lalleg
# Compiler flags
@@ -21,7 +30,7 @@
endif
# ------------------
-@@ -74,7 +76,7 @@
+@@ -74,7 +76,7 @@ OBJSUF = .o
LFLAGS = -s -mwindows -laldmb -ldumb -lalleg
# Compiler flags
@@ -30,12 +39,17 @@
endif
# ------------------
-@@ -95,7 +97,7 @@
+@@ -93,9 +95,12 @@ OBJSUF = .o
+
+ # If you need extra link options (like more librarys, add to LFLAGS var)
LFLAGS = -laldmb -ldumb `allegro-config --libs`
++LFLAGS += `dpkg-buildflags --get LDFLAGS`
# Compiler flags
-CFLAGS = -I$(INCDIR) -Wall -O3
+CFLAGS = -I$(INCDIR) -Wall -O2
++CFLAGS += `dpkg-buildflags --get CFLAGS`
++CFLAGS += `dpkg-buildflags --get CPPFLAGS`
endif
# ---------------------------------
Modified: packages/trunk/kraptor/debian/patches/02_mask_bits.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/02_mask_bits.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/02_mask_bits.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,18 +1,25 @@
-diff -ruN kraptor-0.0.20040403.orig/include/pmask.h kraptor-0.0.20040403.new/include/pmask.h
---- kraptor-0.0.20040403.orig/include/pmask.h 2003-02-03 00:45:00.000000000 +0100
-+++ kraptor-0.0.20040403.new/include/pmask.h 2006-09-22 22:46:31.000000000 +0200
-@@ -43,9 +43,12 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 02_mask_bits
+
+---
+ include/pmask.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/pmask.h b/include/pmask.h
+index 7455a39..51e3929 100644
+--- a/include/pmask.h
++++ b/include/pmask.h
+@@ -43,9 +43,9 @@ extern "C" {
//MASK_WORD_BITBITS should be the log base 2
//of the number of bits in MASK_WORD_TYPE
-//e.g. 4 for 16-bit ints, 5 for 32-bit ints, 6 for 64-bit ints
+-#define MASK_WORD_BITBITS 5
+-
+//e.g. 4 for 16-bit ints, 5 for 32-bit ints, 6 for 64-bit ints
-+#if defined(__alpha__) || defined(__ia64__) || defined(__x86_64__)
-+#define MASK_WORD_BITBITS 6
-+#else
- #define MASK_WORD_BITBITS 5
--
-+#endif
++
++#define MASK_WORD_BITBITS (sizeof(MASK_WORD_TYPE)==4?5:6)
//if SINGLE_MEMORY_BLOCK is defined
//then each mask will be allocated as
Modified: packages/trunk/kraptor/debian/patches/03_static_menu.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/03_static_menu.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/03_static_menu.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,7 +1,16 @@
-diff -ruN kraptor-0.0.20040403.orig/src/menu.c kraptor-0.0.20040403.new/src/menu.c
---- kraptor-0.0.20040403.orig/src/menu.c 2003-07-27 04:22:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/menu.c 2006-09-22 22:46:31.000000000 +0200
-@@ -146,7 +146,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 03_static_menu
+
+---
+ src/menu.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/menu.c b/src/menu.c
+index 2c3235b..a3e51aa 100644
+--- a/src/menu.c
++++ b/src/menu.c
+@@ -146,7 +146,7 @@ static int keybutton_proc(int msg, DIALOG *d, int c)
static void hacer_el_menu_principal_helper()
{
// comenzar un nuevo juego
@@ -10,7 +19,7 @@
{
DIALOG skill_select_dlg[] =
{
-@@ -173,14 +173,14 @@
+@@ -173,14 +173,14 @@ static void hacer_el_menu_principal_helper()
}
// Carga un juego
@@ -27,7 +36,7 @@
{
menu_seleccionado = MNU_S_QUIT_GAME;
-@@ -188,7 +188,7 @@
+@@ -188,7 +188,7 @@ static void hacer_el_menu_principal_helper()
}
/* Permite seleccionar un nuevo modo de video */
@@ -36,7 +45,7 @@
{
int card = 0, w = SCREEN_W, h = SCREEN_H;
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ static void hacer_el_menu_principal_helper()
}
/* Acerca de... */
@@ -45,7 +54,7 @@
{
DIALOG acerca_de_dlg[] =
{
-@@ -241,14 +241,14 @@
+@@ -241,14 +241,14 @@ static void hacer_el_menu_principal_helper()
}
/* idioma -> espa¤ol */
Modified: packages/trunk/kraptor/debian/patches/04_static_joymnu.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/04_static_joymnu.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/04_static_joymnu.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,7 +1,16 @@
-diff -ruN kraptor-0.0.20040403.orig/src/joymnu.c kraptor-0.0.20040403.new/src/joymnu.c
---- kraptor-0.0.20040403.orig/src/joymnu.c 2003-07-27 05:26:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/joymnu.c 2006-09-22 22:46:31.000000000 +0200
-@@ -21,7 +21,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 04_static_joymnu
+
+---
+ src/joymnu.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/joymnu.c b/src/joymnu.c
+index 24aaa38..b265531 100644
+--- a/src/joymnu.c
++++ b/src/joymnu.c
+@@ -21,7 +21,7 @@ void probar_el_joystick(int nj)
y cambia de color cuando presiona el boton 1,2 o 3
usa d2 para propositos internos...
*/
Modified: packages/trunk/kraptor/debian/patches/05_static_game.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/05_static_game.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/05_static_game.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,7 +1,16 @@
-diff -ruN kraptor-0.0.20040403.orig/src/game.c kraptor-0.0.20040403.new/src/game.c
---- kraptor-0.0.20040403.orig/src/game.c 2003-12-17 00:13:00.000000000 +0100
-+++ kraptor-0.0.20040403.new/src/game.c 2006-09-22 22:46:31.000000000 +0200
-@@ -412,7 +412,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 05_static_game
+
+---
+ src/game.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/game.c b/src/game.c
+index b055554..03ae5a3 100644
+--- a/src/game.c
++++ b/src/game.c
+@@ -412,7 +412,7 @@ else
void comenzar_juego(int load_savegame)
{
/* funcion interna que libera listas enlazadas */
@@ -10,7 +19,7 @@
{
/* LIBERAR LISTAS... */
liberar_lista_enemigos();
-@@ -428,7 +428,7 @@
+@@ -428,7 +428,7 @@ void comenzar_juego(int load_savegame)
/* funcion interna que limpia los colores y bufferes
y coloca la paleta de juego, etc */
@@ -19,7 +28,7 @@
{
set_palette(pal_game);
color_map = &tabla_transparencia; /* la rutina de sombras la precisa! */
-@@ -442,7 +442,7 @@
+@@ -442,7 +442,7 @@ void comenzar_juego(int load_savegame)
}
/* Funcion interna para instalar los timers */
@@ -28,7 +37,7 @@
{
/* Timers */
if (install_int_ex(increment_speed_counter, BPS_TO_TIMER(30)))
-@@ -456,7 +456,7 @@
+@@ -456,7 +456,7 @@ void comenzar_juego(int load_savegame)
}
/* Funcion interna para SACAR los timers */
Modified: packages/trunk/kraptor/debian/patches/06_default_font.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/06_default_font.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/06_default_font.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,7 +1,16 @@
-diff -ruN kraptor-0.0.20040403.orig/src/guiprocs.c kraptor-0.0.20040403.new/src/guiprocs.c
---- kraptor-0.0.20040403.orig/src/guiprocs.c 2003-06-19 07:23:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/guiprocs.c 2006-09-22 22:46:31.000000000 +0200
-@@ -562,11 +562,19 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 06_default_font
+
+---
+ src/guiprocs.c | 12 ++++++++++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
+
+diff --git a/src/guiprocs.c b/src/guiprocs.c
+index e84e862..5218658 100644
+--- a/src/guiprocs.c
++++ b/src/guiprocs.c
+@@ -562,11 +562,19 @@ int xedit_proc(int msg, DIALOG *d, int c)
if(d->dp2)
{
button.x = d->x + d->w - button.w - 1;
Modified: packages/trunk/kraptor/debian/patches/07_directories.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/07_directories.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/07_directories.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,7 +1,17 @@
-diff -ruN kraptor-0.0.20040403.orig/src/data.c kraptor-0.0.20040403.new/src/data.c
---- kraptor-0.0.20040403.orig/src/data.c 2003-06-25 09:54:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/data.c 2006-09-22 22:46:31.000000000 +0200
-@@ -575,6 +575,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Wed, 20 Feb 2013 15:21:24 +0100
+Subject: 07_directories
+
+---
+ src/data.c | 10 ++++++----
+ src/filedata.c | 11 ++++++++---
+ 2 files changed, 14 insertions(+), 7 deletions(-)
+
+diff --git a/src/data.c b/src/data.c
+index 2eb37ba..fc88d3c 100644
+--- a/src/data.c
++++ b/src/data.c
+@@ -575,6 +575,7 @@ int cargar_nivel(int nivel, int solo_verificar)
int xx, yy; // para leer las grillas
char tmpstr[1024]; // uso general
char tmpstr2[1024];
@@ -9,7 +19,7 @@
if (krapmain == NULL) return -1;
-@@ -598,7 +599,8 @@
+@@ -598,7 +599,8 @@ int cargar_nivel(int nivel, int solo_verificar)
info_nivel.musica = NULL; /* por ahora, no se si hay musica... */
/* Debo SOLO verificar si el nivel existe? */
@@ -19,7 +29,7 @@
/* ------ Cargar realmente en RAM el archivo... ------ */
-@@ -617,7 +619,7 @@
+@@ -617,7 +619,7 @@ int cargar_nivel(int nivel, int solo_verificar)
if (datmapa == NULL) return -1; /* fallo la carga del nivel */
/* copiarse las grillas */
@@ -28,7 +38,7 @@
fp = pack_fopen(tmpstr2, F_READ);
if (fp == NULL) levantar_error("ERROR: no existe mapa_g en el nivel!");
for (xx =0; xx < W_FONDO / W_GR; xx++)
-@@ -627,11 +629,11 @@
+@@ -627,11 +629,11 @@ int cargar_nivel(int nivel, int solo_verificar)
pack_fclose(fp);
// grilla de enemigos, con soporte para varias dificultades
@@ -42,9 +52,10 @@
fp = pack_fopen(tmpstr2, F_READ);
if (fp == NULL) levantar_error("ERROR: no existe enem_g en el nivel!");
}
-diff -ruN kraptor-0.0.20040403.orig/src/filedata.c kraptor-0.0.20040403.new/src/filedata.c
---- kraptor-0.0.20040403.orig/src/filedata.c 2003-06-18 10:38:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/filedata.c 2006-09-22 22:46:31.000000000 +0200
+diff --git a/src/filedata.c b/src/filedata.c
+index 73d7a20..b98160a 100644
+--- a/src/filedata.c
++++ b/src/filedata.c
@@ -22,8 +22,12 @@
// --------------------------------------------------------
char *where_is_the_filename(char *buffer, const char *filename)
@@ -60,7 +71,7 @@
// check in current executable path
get_executable_name(str, 2048);
replace_filename(str2, str, filename, 2048);
-@@ -49,7 +53,8 @@
+@@ -49,7 +53,8 @@ if (! exists(filename) )
// default
sprintf(buffer,"%s", filename);
Modified: packages/trunk/kraptor/debian/patches/08_home.patch
===================================================================
--- packages/trunk/kraptor/debian/patches/08_home.patch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/08_home.patch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,6 +1,16 @@
-diff -ruN kraptor-0.0.20040403.orig/src/config.c kraptor-0.0.20040403.new/src/config.c
---- kraptor-0.0.20040403.orig/src/config.c 2003-07-27 04:10:00.000000000 +0200
-+++ kraptor-0.0.20040403.new/src/config.c 2006-09-22 22:46:31.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 21 Feb 2013 16:34:16 +0100
+Subject: 08_home
+
+---
+ src/config.c | 32 +++++++++++++++++++++++++++++---
+ src/main.c | 18 +++++++++++++++++-
+ 2 files changed, 46 insertions(+), 4 deletions(-)
+
+diff --git a/src/config.c b/src/config.c
+index b1d136d..f87ee38 100644
+--- a/src/config.c
++++ b/src/config.c
@@ -11,10 +11,25 @@
#include "jugador.h"
#include "config.h"
@@ -29,7 +39,7 @@
teclado_jug.arr = get_config_int("kraptor_keyboard", "arr", teclado_jug.arr);
teclado_jug.abj = get_config_int("kraptor_keyboard", "abj", teclado_jug.abj);
teclado_jug.izq = get_config_int("kraptor_keyboard", "izq", teclado_jug.izq);
-@@ -47,7 +62,18 @@
+@@ -47,7 +62,18 @@ void cargar_configuracion()
void salvar_configuracion()
{
@@ -49,10 +59,11 @@
set_config_int("kraptor_keyboard", "arr", teclado_jug.arr);
set_config_int("kraptor_keyboard", "abj", teclado_jug.abj);
-diff -ruN kraptor-0.0.20040403.orig/src/main.c kraptor-0.0.20040403.new/src/main.c
---- kraptor-0.0.20040403.orig/src/main.c 2004-01-18 07:18:00.000000000 +0100
-+++ kraptor-0.0.20040403.new/src/main.c 2006-09-22 22:46:31.000000000 +0200
-@@ -38,6 +38,7 @@
+diff --git a/src/main.c b/src/main.c
+index a250914..3629bf6 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -38,6 +38,7 @@ int main(int argc, char *argv[] )
int i1; // para el for de los parametros
int rx = 640, ry = 480; // para permitir que el usuario elija la resolucion
int vid_card = GFX_AUTODETECT; // placa de video por defecto
@@ -60,7 +71,7 @@
int snd = TRUE; // quiere sonido
lenguaje[0]='e';
-@@ -47,7 +48,22 @@
+@@ -47,7 +48,22 @@ int main(int argc, char *argv[] )
/* Iniciar Allegro y el hardware */
allegro_init();
atexit(&dumb_exit);
Modified: packages/trunk/kraptor/debian/patches/series
===================================================================
--- packages/trunk/kraptor/debian/patches/series 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/patches/series 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,8 +1,14 @@
-01_makefile.patch -p1
-02_mask_bits.patch -p1
-03_static_menu.patch -p1
-04_static_joymnu.patch -p1
-05_static_game.patch -p1
-06_default_font.patch -p1
-07_directories.patch -p1
-08_home.patch -p1
+01_makefile.patch
+02_mask_bits.patch
+03_static_menu.patch
+04_static_joymnu.patch
+05_static_game.patch
+06_default_font.patch
+07_directories.patch
+08_home.patch
+09_start-in-windowed-mode.patch
+10_fix-Werror-format-security-error.patch
+11_fix-spelling-error-in-binary.patch
+12_save-games-in-home.patch
+13_save-bitmaps-in-home.patch
+14_create-hidden-kraptor-directory-in-home.patch
Modified: packages/trunk/kraptor/debian/rules
===================================================================
--- packages/trunk/kraptor/debian/rules 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/rules 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,92 +1,20 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+%:
+ dh $@ --parallel
-CFLAGS = -Wall -g
+override_dh_auto_build:
+ ./fix.sh linux
+ dh_auto_build
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+override_dh_auto_install:
+ cp bin/kraptor_linux.bin bin/kraptor
+ dh_auto_install
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- $(MAKE) -f /usr/share/quilt/quilt.make patch
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- #docbook-to-man debian/kraptor.sgml > kraptor.1
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+override_dh_clean:
./fix.sh linux
- $(MAKE) clean
- $(MAKE) -f /usr/share/quilt/quilt.make unpatch
- dh_clean target.os
+ dh_clean target.os bin/kraptor
+ dh_clean
-install-indep:
- dh_installdirs -i usr/share/games/kraptor
- dh_install -i bin/*.dat usr/share/games/kraptor
- dh_installdirs -i etc/kraptor
- dh_install -i bin/kraptor.cfg etc/kraptor
-
-install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -a -k
- dh_installdirs
-
- dh_installdirs -a usr/games
- dh_install -a bin/kraptor_linux.bin usr/games
- mv debian/kraptor/usr/games/kraptor_linux.bin debian/kraptor/usr/games/kraptor
-
- dh_installdirs -a usr/share/pixmaps
- dh_install -a debian/kraptor.xpm usr/share/pixmaps
-
-install: install-arch install-indep
-
-# Build architecture-independent files here.
-binary-indep: install-indep
- dh_testdir
- dh_testroot
- dh_installchangelogs -i
- dh_installdocs -i
- dh_compress -i
- dh_fixperms -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
- dh_testdir
- dh_testroot
- dh_link -a usr/share/doc/kraptor-data usr/share/doc/kraptor
- dh_installmenu -a
- dh_installman -a debian/kraptor.6
- 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 install-indep install-arch install binary-indep \
- binary-arch binary configure
Modified: packages/trunk/kraptor/debian/watch
===================================================================
--- packages/trunk/kraptor/debian/watch 2013-02-25 14:16:41 UTC (rev 13967)
+++ packages/trunk/kraptor/debian/watch 2013-02-25 23:33:41 UTC (rev 13968)
@@ -1,9 +1,3 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-opts="uversionmangle=s/jan/01/;s/feb/02/;s/mar/03/;s/apr/04/; \
-s/may/05/;s/jun/06/;s/aug/08/;s/sep/09/;s/oct/10/;s/nov/11/;s/dec/12/; \
-s/(\d{2})_(\d{2})_(\d{4})/0.0.$3$1$2/" \
-http://sf.net/kraptor/kraptor_final_(.*)\.tar\.gz
+opts=uversionmangle=s/^final_apr_03_2004$/0.0.20040403/ \
+http://kraptor.sourceforge.net/download.html .*/kraptor[_\-](.*)\.(?:tgz|tbz2|txz|tar\.(?:gz|bz2|xz)).*
More information about the Pkg-games-commits
mailing list