r15782 - in packages/trunk/kball/debian: . patches source
Markus Koschany
apo at moszumanska.debian.org
Thu Jun 2 05:40:31 UTC 2016
Author: apo
Date: 2016-06-02 05:40:31 +0000 (Thu, 02 Jun 2016)
New Revision: 15782
Added:
packages/trunk/kball/debian/kball.manpages
packages/trunk/kball/debian/patches/hardening.patch
packages/trunk/kball/debian/patches/reproducible-build.patch
Removed:
packages/trunk/kball/debian/source/local-options
Modified:
packages/trunk/kball/debian/changelog
packages/trunk/kball/debian/compat
packages/trunk/kball/debian/control
packages/trunk/kball/debian/copyright
packages/trunk/kball/debian/kball.6
packages/trunk/kball/debian/kball.desktop
packages/trunk/kball/debian/patches/01_makefile.patch
packages/trunk/kball/debian/patches/02_intro.patch
packages/trunk/kball/debian/patches/03_screen.patch
packages/trunk/kball/debian/patches/04_dirty_hack.patch
packages/trunk/kball/debian/patches/05_directories.patch
packages/trunk/kball/debian/patches/06_homedir_game.patch
packages/trunk/kball/debian/patches/07_homedir_editor.patch
packages/trunk/kball/debian/patches/08_dont_strip.patch
packages/trunk/kball/debian/patches/09_keypad_enter.patch
packages/trunk/kball/debian/patches/gcc-4.5.patch
packages/trunk/kball/debian/patches/series
packages/trunk/kball/debian/rules
packages/trunk/kball/debian/watch
Log:
Release kball 0.0.20041216-9
Modified: packages/trunk/kball/debian/changelog
===================================================================
--- packages/trunk/kball/debian/changelog 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/changelog 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,8 +1,20 @@
-kball (0.0.20041216-9) UNRELEASED; urgency=low
+kball (0.0.20041216-9) unstable; urgency=medium
- * Correct Vcs-* URLs to point to anonscm.debian.org
+ * Team upload.
+ * wrap-and-sort -sa.
+ * Use compat level 9 and require debhelper >= 9.
+ * Declare compliance with Debian Policy 3.9.8.
+ * Use canonical VCS-URI.
+ * kball.desktop: Add keywords and a comment in German.
+ * Update debian/copyright to copyright format 1.0.
+ * Simplify debian/rules by using dh sequencer. (Closes: #821997)
+ * debian/watch: Use version=4.
+ * Make the build reproducible by adding reproducible-build.patch.
+ Thanks to Reiner Herrmann for the report and patch. (Closes: #825588)
+ * Build with hardening build flags. Add hardening.patch.
+ * Ensure that kball can be built twice in a row.
- -- Evgeni Golov <evgeni at debian.org> Mon, 15 Jul 2013 22:21:35 +0200
+ -- Markus Koschany <apo at debian.org> Thu, 02 Jun 2016 07:28:10 +0200
kball (0.0.20041216-8) unstable; urgency=low
Modified: packages/trunk/kball/debian/compat
===================================================================
--- packages/trunk/kball/debian/compat 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/compat 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1 +1 @@
-5
+9
Modified: packages/trunk/kball/debian/control
===================================================================
--- packages/trunk/kball/debian/control 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/control 2016-06-02 05:40:31 UTC (rev 15782)
@@ -2,16 +2,29 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Barry deFreese <bdefreese at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libxxf86dga-dev, libxxf86vm-dev, liballegro4.2-dev | liballegro-dev, libdumb1-dev, libaldmb1-dev, sharutils, libxcursor-dev
-Standards-Version: 3.9.1
+Uploaders:
+ Miriam Ruiz <little_miry at yahoo.es>,
+ Barry deFreese <bdefreese at debian.org>
+Build-Depends:
+ debhelper (>= 9),
+ libaldmb1-dev,
+ liballegro4.2-dev | liballegro-dev,
+ libdumb1-dev,
+ libxcursor-dev,
+ libxxf86dga-dev,
+ libxxf86vm-dev,
+ sharutils
+Standards-Version: 3.9.8
Homepage: http://kball.sourceforge.net/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/kball/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kball/
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/kball/
Package: kball
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, kball-data (>= ${source:Version})
+Depends:
+ kball-data (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: game of skill and reflexes for all the family
A game of skill and reflexes, non violent, suitable for all ages. The idea
is to move the ball around the map, without falling, without running out of
@@ -20,7 +33,8 @@
Package: kball-data
Architecture: all
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends}
Description: game of skill and reflexes for all the family - data files
A game of skill and reflexes, non violent, suitable for all ages. The idea
is to move the ball around the map, without falling, without running out of
Modified: packages/trunk/kball/debian/copyright
===================================================================
--- packages/trunk/kball/debian/copyright 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/copyright 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,31 +1,36 @@
-This package was debianized by Miriam Ruiz <little_miry at yahoo.es> on
-Sat, 2 Apr 2005 19:59:43 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: http://kball.sourceforge.net/
-It was downloaded from http://kball.sourceforge.net/
+Files: *
+Copyright: 2003-2004, Bruno Diaz (kronoman) <kronopio at users.sourceforge.net>
+ Martijn "amarillion" van Iersel
+License: MIT
-Copyright (c) 2003, 2004, Kronoman
+Files: debian/*
+Copyright: 2005-2008, Miriam Ruiz <little_miry at yahoo.es>
+ 2009, Barry deFreese <bdefreese at debian.org>
+ 2011, Ansgar Burchardt <ansgar at debian.org>
+ 2011, Evgeni Golov <evgeni at debian.org>
+ 2016, Markus Koschany <apo at debian.org>
+License: MIT
-Upstream Author: Bruno Diaz <kronopio at users.sourceforge.net>
-Sphere mapping code by Martijn "amarillion" van Iersel
-
-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
+ 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.
Modified: packages/trunk/kball/debian/kball.6
===================================================================
--- packages/trunk/kball/debian/kball.6 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/kball.6 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,4 +1,4 @@
-.\"
+.\"
.TH "kball" "6" "06.04.2005" "Miriam Ruiz" "Games"
.SH "NAME"
kball \- a game of skill and reflexes for all the family
Modified: packages/trunk/kball/debian/kball.desktop
===================================================================
--- packages/trunk/kball/debian/kball.desktop 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/kball.desktop 2016-06-02 05:40:31 UTC (rev 15782)
@@ -2,9 +2,10 @@
Name=KBall
GenericName=kball
Comment=Find the exit
+Comment[de]=Finde den Ausgang
Type=Application
Exec=kball
Icon=kball
Terminal=false
Categories=Game;ActionGame;
-
+Keywords=ball;reflexes;maps;editor;
Added: packages/trunk/kball/debian/kball.manpages
===================================================================
--- packages/trunk/kball/debian/kball.manpages (rev 0)
+++ packages/trunk/kball/debian/kball.manpages 2016-06-02 05:40:31 UTC (rev 15782)
@@ -0,0 +1 @@
+debian/kball.6
Modified: packages/trunk/kball/debian/patches/01_makefile.patch
===================================================================
--- packages/trunk/kball/debian/patches/01_makefile.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/01_makefile.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,6 +1,15 @@
-diff -ruN kball-0.0.20041216.orig/makefile kball-0.0.20041216.new/makefile
---- kball-0.0.20041216.orig/makefile 2004-08-04 06:28:49.000000000 +0200
-+++ kball-0.0.20041216.new/makefile 2006-09-22 22:45:52.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:21 +0200
+Subject: _makefile
+
+---
+ makefile | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/makefile b/makefile
+index 4fd7b81..de72675 100644
+--- a/makefile
++++ b/makefile
@@ -6,7 +6,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
# ------------------
-@@ -73,7 +75,7 @@
+@@ -73,7 +75,7 @@ OBJSUF = .o
LFLAGS = -Wl,--subsystem,windows -s -laldmb -ldumb -lalleg
# Compiler flags
@@ -30,7 +39,7 @@
endif
# ------------------
-@@ -93,7 +95,7 @@
+@@ -93,7 +95,7 @@ OBJSUF = .o
LFLAGS = -s -laldmb -ldumb `allegro-config --libs`
# Compiler flags
Modified: packages/trunk/kball/debian/patches/02_intro.patch
===================================================================
--- packages/trunk/kball/debian/patches/02_intro.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/02_intro.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,7 +1,16 @@
-diff -ruN kball-0.0.20041216.orig/src/intro.cpp kball-0.0.20041216.new/src/intro.cpp
---- kball-0.0.20041216.orig/src/intro.cpp 2004-08-14 22:32:20.000000000 +0200
-+++ kball-0.0.20041216.new/src/intro.cpp 2006-09-22 22:45:52.000000000 +0200
-@@ -32,7 +32,8 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:21 +0200
+Subject: _intro
+
+---
+ src/intro.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/intro.cpp b/src/intro.cpp
+index 3af144d..c136eb4 100644
+--- a/src/intro.cpp
++++ b/src/intro.cpp
+@@ -32,7 +32,8 @@ void kball_do_the_intro()
play_sample(krono_wav, 255,128,1000,0);
@@ -11,7 +20,7 @@
clear_bitmap(screen);
data.nuke_datafile();
-@@ -92,6 +93,7 @@
+@@ -92,6 +93,7 @@ void kball_do_the_exit()
buf[xbuf] = '\0';
textout_centre_ex(screen, font, buf, x,y,c,-1);
Modified: packages/trunk/kball/debian/patches/03_screen.patch
===================================================================
--- packages/trunk/kball/debian/patches/03_screen.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/03_screen.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,7 +1,16 @@
-diff -ruN kball-0.0.20041216.orig/src/main.cpp kball-0.0.20041216.new/src/main.cpp
---- kball-0.0.20041216.orig/src/main.cpp 2004-08-14 22:38:27.000000000 +0200
-+++ kball-0.0.20041216.new/src/main.cpp 2006-09-22 22:45:52.000000000 +0200
-@@ -73,7 +73,7 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _screen
+
+---
+ src/main.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 5b7ec9f..9376caa 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -73,7 +73,7 @@ void CMain::start(bool want_map_editor)
int main(int argc, char *argv[] )
{
int i;
@@ -10,7 +19,7 @@
int game_color_depth = -1; // default color depth, -1 = autodetect from desktop default
int vid_w = 640; // desired video resolution
int vid_h = 480;
-@@ -102,6 +102,9 @@
+@@ -102,6 +102,9 @@ int main(int argc, char *argv[] )
if (stricmp(argv[i], "-w") == 0)
vid_m = GFX_AUTODETECT_WINDOWED;
Modified: packages/trunk/kball/debian/patches/04_dirty_hack.patch
===================================================================
--- packages/trunk/kball/debian/patches/04_dirty_hack.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/04_dirty_hack.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,7 +1,16 @@
-diff -ruN kball-0.0.20041216.orig/src/sphermap.cpp kball-0.0.20041216.new/src/sphermap.cpp
---- kball-0.0.20041216.orig/src/sphermap.cpp 2004-08-02 20:55:17.000000000 +0200
-+++ kball-0.0.20041216.new/src/sphermap.cpp 2006-09-22 22:45:52.000000000 +0200
-@@ -53,7 +53,8 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _dirty_hack
+
+---
+ src/sphermap.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/sphermap.cpp b/src/sphermap.cpp
+index 4d14e89..be8a0fa 100644
+--- a/src/sphermap.cpp
++++ b/src/sphermap.cpp
+@@ -53,7 +53,8 @@ void mapped_sphere_ex (BITMAP *target, int cx, int cy, int r, BITMAP *map, MATRI
for (x = - fixtoi (q_cos) + 1; x < fixtoi(q_cos) - 1; x++)
{
fixed newq_cos, temp_p, temp_q=0; // some temporary variables
Modified: packages/trunk/kball/debian/patches/05_directories.patch
===================================================================
--- packages/trunk/kball/debian/patches/05_directories.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/05_directories.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,6 +1,16 @@
-diff -ruN kball-0.0.20041216.orig/src/filehelp.cpp kball-0.0.20041216.new/src/filehelp.cpp
---- kball-0.0.20041216.orig/src/filehelp.cpp 2004-03-11 23:43:00.000000000 +0100
-+++ kball-0.0.20041216.new/src/filehelp.cpp 2006-09-22 22:45:52.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _directories
+
+---
+ src/filehelp.cpp | 5 +++--
+ src/gkernel.cpp | 8 +++++---
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/src/filehelp.cpp b/src/filehelp.cpp
+index 0462026..a385235 100644
+--- a/src/filehelp.cpp
++++ b/src/filehelp.cpp
@@ -22,10 +22,11 @@
// --------------------------------------------------------
char *where_is_the_filename(char *buffer, const char *filename)
@@ -15,10 +25,11 @@
replace_filename(str2, str, filename, 2048);
if (! exists(filename) )
-diff -ruN kball-0.0.20041216.orig/src/gkernel.cpp kball-0.0.20041216.new/src/gkernel.cpp
---- kball-0.0.20041216.orig/src/gkernel.cpp 2004-12-03 23:20:02.000000000 +0100
-+++ kball-0.0.20041216.new/src/gkernel.cpp 2006-09-22 22:45:52.000000000 +0200
-@@ -794,12 +794,14 @@
+diff --git a/src/gkernel.cpp b/src/gkernel.cpp
+index 1b10bae..554b7f7 100644
+--- a/src/gkernel.cpp
++++ b/src/gkernel.cpp
+@@ -794,12 +794,14 @@ void CGameKernel::play_a_full_campaign(char *level_filename)
clear_bitmap(screen);
textout_centre_ex(screen, font, "[ Please wait... loading... ]", SCREEN_W / 2, SCREEN_H / 2, makecol(255, 255, 255), makecol(0, 0, 64));
@@ -35,7 +46,7 @@
if (!dattmp2)
raise_error("CGameKernel::play_a_full_campaign\nCan't load %s -> GAME_SCORE_FONT\n", SPRITES_FILE);
FONT *fs = (FONT *)dattmp2->dat;
-@@ -810,7 +812,7 @@
+@@ -810,7 +812,7 @@ void CGameKernel::play_a_full_campaign(char *level_filename)
stats.print(screen, 150, makecol(0,0,255), -1, fs);
// sound
Modified: packages/trunk/kball/debian/patches/06_homedir_game.patch
===================================================================
--- packages/trunk/kball/debian/patches/06_homedir_game.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/06_homedir_game.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,6 +1,15 @@
-diff -ruN kball-0.0.20041216.orig/src/gamemenu.cpp kball-0.0.20041216.new/src/gamemenu.cpp
---- kball-0.0.20041216.orig/src/gamemenu.cpp 2004-08-14 22:20:54.000000000 +0200
-+++ kball-0.0.20041216.new/src/gamemenu.cpp 2006-09-22 22:45:52.000000000 +0200
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _homedir_game
+
+---
+ src/gamemenu.cpp | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 file changed, 127 insertions(+), 10 deletions(-)
+
+diff --git a/src/gamemenu.cpp b/src/gamemenu.cpp
+index 6f6e6ab..28cb5aa 100644
+--- a/src/gamemenu.cpp
++++ b/src/gamemenu.cpp
@@ -16,6 +16,10 @@
#include "gamemenu.h" // I need my prototypes
#include "sound.h" // I need the sound system
@@ -12,7 +21,7 @@
// some globals needed by callback
CParticleManager menu_particle_manager; // our own particle managar :^D -- REMEMBER TO CALL NUKE PARTICLES BEFORE LEAVING!
BITMAP *bmp_real_background = NULL; // menu real background
-@@ -214,7 +218,19 @@
+@@ -214,7 +218,19 @@ void CGameMenu::do_main_menu()
while (ret != 4) // 4 = quit
{
@@ -33,7 +42,7 @@
menu.control.load_configuration_of_controller("KBALL_CONTROLLER");
soundw.music_resume();
-@@ -298,7 +313,18 @@
+@@ -298,7 +314,18 @@ void CGameMenu::do_file_level_selector()
mtracer.add("CGameMenu::do_file_level_selector() started\n");
@@ -53,7 +62,7 @@
menu.control.load_configuration_of_controller("KBALL_CONTROLLER");
menu.set_to_bitmap(screen);
-@@ -320,12 +346,34 @@
+@@ -320,12 +347,34 @@ void CGameMenu::do_file_level_selector()
menu.clear_menu_list();
menu.add_item_to_menu("Full campaign");
menu.add_item_to_menu("Single level");
@@ -91,7 +100,7 @@
fix_filename_slashes(level_path);
mtracer.add("--> \t Level path == %s", level_path);
-@@ -348,6 +396,26 @@
+@@ -348,6 +397,26 @@ void CGameMenu::do_file_level_selector()
full_campaign = false;
break;
@@ -118,7 +127,7 @@
default:
soundw.music_pause();
return ;
-@@ -372,7 +440,9 @@
+@@ -372,7 +441,9 @@ void CGameMenu::do_file_level_selector()
menu.clear_menu_list();
// read files and populate menu with them
@@ -129,7 +138,7 @@
while (!ret)
{
-@@ -413,7 +483,18 @@
+@@ -413,7 +484,18 @@ void CGameMenu::do_file_level_selector()
fix_filename_slashes(path_str);
// play the game - rock 'n roll!
@@ -149,7 +158,7 @@
game_kernel.player_ball.control.load_configuration_of_controller("KBALL_CONTROLLER");
-@@ -561,7 +642,19 @@
+@@ -561,7 +643,19 @@ void CGameMenu::do_options_menu()
int ret = 0;
mtracer.add("CGameMenu::do_options_menu() started\n");
@@ -170,7 +179,7 @@
menu.control.load_configuration_of_controller("KBALL_CONTROLLER");
game_kernel.player_ball.control.load_configuration_of_controller("KBALL_CONTROLLER");
-@@ -617,7 +710,18 @@
+@@ -617,7 +711,18 @@ void CGameMenu::do_options_menu()
menu.add_item_to_menu("< Return >");
@@ -190,7 +199,7 @@
menu.control.load_configuration_of_controller("KBALL_CONTROLLER");
-@@ -679,7 +783,19 @@
+@@ -679,7 +784,19 @@ void CGameMenu::do_options_menu()
}
Modified: packages/trunk/kball/debian/patches/07_homedir_editor.patch
===================================================================
--- packages/trunk/kball/debian/patches/07_homedir_editor.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/07_homedir_editor.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,7 +1,16 @@
-Index: kball-0.0.20041216/src/mapedit.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _homedir_editor
+
===================================================================
---- kball-0.0.20041216.orig/src/mapedit.cpp
-+++ kball-0.0.20041216/src/mapedit.cpp
+---
+ src/mapedit.cpp | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/src/mapedit.cpp b/src/mapedit.cpp
+index 86abe2b..99851d7 100644
+--- a/src/mapedit.cpp
++++ b/src/mapedit.cpp
@@ -12,6 +12,8 @@
#include "sound.h"
#include "musiclvl.h"
@@ -11,7 +20,7 @@
CMapEditor::CMapEditor()
{
mtracer.add("CMapEditor::CMapEditor()");
-@@ -167,7 +169,21 @@
+@@ -167,7 +169,21 @@ void CMapEditor::start_map_editor()
int omx=0,omy=0,old_mouse_z;
char str[2048];
str[0] = '\0';
Modified: packages/trunk/kball/debian/patches/08_dont_strip.patch
===================================================================
--- packages/trunk/kball/debian/patches/08_dont_strip.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/08_dont_strip.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,8 +1,17 @@
-Index: kball-0.0.20041216/makefile
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _dont_strip
+
===================================================================
---- kball-0.0.20041216.orig/makefile 2009-04-06 20:20:46.000000000 -0400
-+++ kball-0.0.20041216/makefile 2009-04-06 20:21:16.000000000 -0400
-@@ -52,7 +52,7 @@
+---
+ makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/makefile b/makefile
+index de72675..fee7a9f 100644
+--- a/makefile
++++ b/makefile
+@@ -52,7 +52,7 @@ BINSUF = dos.exe
OBJSUF = .o
# If you need extra link options (like more librarys, add to LFLAGS var)
@@ -11,7 +20,7 @@
# Compiler flags
CFLAGS = -I$(INCDIR) -Wall -O2
-@@ -72,7 +72,7 @@
+@@ -72,7 +72,7 @@ BINSUF = _w32.exe
OBJSUF = .o
# If you need extra link options (like more librarys, add to LFLAGS var)
@@ -20,7 +29,7 @@
# Compiler flags
CFLAGS = -I$(INCDIR) -Wall -O2
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ BINSUF = _linux.bin
OBJSUF = .o
# If you need extra link options (like more librarys, add to LFLAGS var)
Modified: packages/trunk/kball/debian/patches/09_keypad_enter.patch
===================================================================
--- packages/trunk/kball/debian/patches/09_keypad_enter.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/09_keypad_enter.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,8 +1,17 @@
-Index: kball-0.0.20041216/src/qmenu.cpp
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: _keypad_enter
+
===================================================================
---- kball-0.0.20041216.orig/src/qmenu.cpp 2009-04-06 23:21:11.000000000 -0400
-+++ kball-0.0.20041216/src/qmenu.cpp 2009-04-06 23:23:16.000000000 -0400
-@@ -185,7 +185,7 @@
+---
+ src/qmenu.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/qmenu.cpp b/src/qmenu.cpp
+index 8c11f64..ef2a469 100644
+--- a/src/qmenu.cpp
++++ b/src/qmenu.cpp
+@@ -185,7 +185,7 @@ int CQMenu::do_the_menu(int selected)
// if the last hit was very close (1/6 of second), ignore input
if (abs((int)big_timer_counter - last_hit) < BPS_OF_MENU_MANAGER/10)
{
@@ -11,7 +20,7 @@
clear_keybuf();
cret = 0;
}
-@@ -212,7 +212,7 @@
+@@ -212,7 +212,7 @@ int CQMenu::do_the_menu(int selected)
if (mis < 0) mis = menu_item_text.size()-1;
if ((unsigned)mis > menu_item_text.size()-1) mis = 0;
Modified: packages/trunk/kball/debian/patches/gcc-4.5.patch
===================================================================
--- packages/trunk/kball/debian/patches/gcc-4.5.patch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/gcc-4.5.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,10 +1,16 @@
From: Ansgar Burchardt <ansgar at debian.org>
Date: Mon, 14 Mar 2011 15:12:26 +0100
Subject: Fix compilation with GCC 4.5
-Bug-Debian: http://bugs.debian.org/565011
---- kball.orig/src/cwdata.cpp
-+++ kball/src/cwdata.cpp
-@@ -33,7 +33,7 @@
+
+---
+ src/cwdata.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cwdata.cpp b/src/cwdata.cpp
+index 62e8cca..d441013 100644
+--- a/src/cwdata.cpp
++++ b/src/cwdata.cpp
+@@ -33,7 +33,7 @@ CWDatafile::CWDatafile()
// ------------------------------------------------------------------
CWDatafile::CWDatafile(const char *filename)
{
Added: packages/trunk/kball/debian/patches/hardening.patch
===================================================================
--- packages/trunk/kball/debian/patches/hardening.patch (rev 0)
+++ packages/trunk/kball/debian/patches/hardening.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -0,0 +1,49 @@
+From: Markus Koschany <apo at debian.org>
+Date: Thu, 2 Jun 2016 06:51:00 +0200
+Subject: hardening
+
+---
+ makefile | 7 +++++--
+ makefile.all | 4 ++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/makefile b/makefile
+index fee7a9f..d6fa2ad 100644
+--- a/makefile
++++ b/makefile
+@@ -92,10 +92,13 @@ BINSUF = _linux.bin
+ OBJSUF = .o
+
+ # If you need extra link options (like more librarys, add to LFLAGS var)
+-LFLAGS = -laldmb -ldumb `allegro-config --libs`
++LFLAGS = -laldmb -ldumb `allegro-config --libs` $(LDFLAGS)
++
++CXXFLAGS = `dpkg-buildflags --get CXXFLAGS`
++CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+
+ # Compiler flags
+-CFLAGS = -I$(INCDIR) -Wall -O2
++CFLAGS = -I$(INCDIR) -Wall -O2 `dpkg-buildflags --get CFLAGS`
+ endif
+
+ # ---------------------------------
+diff --git a/makefile.all b/makefile.all
+index 5b88d7c..3b8751d 100644
+--- a/makefile.all
++++ b/makefile.all
+@@ -15,7 +15,7 @@ $(BINDIR)/$(BINARY)$(BINSUF) : $(OBJS)
+ @echo The $(BINDIR)/$(BINARY)$(BINSUF) is ready!
+
+ $(OBJDIR)/%$(OBJSUF) : $(SRCDIR)/%$(SRCSUF)
+- $(GCC) $(CFLAGS) -c $< -o $@
++ $(GCC) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) -c $< -o $@
+
+ .PHONY: clean and also clean the test
+ clean: cleantest
+@@ -44,4 +44,4 @@ test:
+ # Cleans the test
+ .PHONY: cleantest
+ cleantest:
+- rm -rf $(TESTFILE)$(BINSUF) test.run
+\ No newline at end of file
++ rm -rf $(TESTFILE)$(BINSUF) test.run
Added: packages/trunk/kball/debian/patches/reproducible-build.patch
===================================================================
--- packages/trunk/kball/debian/patches/reproducible-build.patch (rev 0)
+++ packages/trunk/kball/debian/patches/reproducible-build.patch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -0,0 +1,22 @@
+From: Reiner Herrmann <reiner at reiner-h.de>
+Date: Thu, 2 Jun 2016 06:21:22 +0200
+Subject: reproducible-build
+
+Debian-Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=825588
+---
+ makefile.all | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/makefile.all b/makefile.all
+index c1b8ae9..5b88d7c 100644
+--- a/makefile.all
++++ b/makefile.all
+@@ -2,7 +2,7 @@
+ # Thanks to Schwarzung for help.
+ # Copyright (c) 2003-2005, Kronoman
+
+-TEMP = $(wildcard $(SRCDIR)/*$(SRCSUF))
++TEMP = $(sort $(wildcard $(SRCDIR)/*$(SRCSUF)))
+ FILES = $(if $(TEMP), $(TEMP), $(error No source code found!))
+ OBJS = $(addprefix $(OBJDIR)/,$(addsuffix $(OBJSUF), $(basename $(notdir $(FILES) ) ) ) )
+
Modified: packages/trunk/kball/debian/patches/series
===================================================================
--- packages/trunk/kball/debian/patches/series 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/patches/series 2016-06-02 05:40:31 UTC (rev 15782)
@@ -8,3 +8,5 @@
08_dont_strip.patch
09_keypad_enter.patch
gcc-4.5.patch
+reproducible-build.patch
+hardening.patch
Modified: packages/trunk/kball/debian/rules
===================================================================
--- packages/trunk/kball/debian/rules 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/rules 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,97 +1,38 @@
#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-CFLAGS = -Wall -g
+%:
+ dh $@ --parallel
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+override_dh_auto_clean:
[ ! -f target.os ] || $(MAKE) clean
+override_dh_clean:
+ dh_clean
find ./ -name "*.o" -delete
+ $(RM) bin/kball_linux.bin
+ $(RM) test_linux.bin
+ $(RM) test.run
- dh_clean
-
-install-indep:
- dh_installdirs -i usr/share/games/kball
- dh_install -i bin/*.dat usr/share/games/kball
- dh_installdirs -i usr/share/games/kball/levels
- dh_install -i bin/levels/*.map usr/share/games/kball/levels
- dh_install -i bin/levels/*.fmp usr/share/games/kball/levels
- dh_installdirs -i usr/share/doc/kball-data
- dh_install -i doc/manual/*.pdf usr/share/doc/kball-data
+override_dh_install-indep:
+ dh_install bin/*.dat usr/share/games/kball
+ dh_install bin/levels/*.map usr/share/games/kball/levels
+ dh_install bin/levels/*.fmp usr/share/games/kball/levels
+ dh_install doc/manual/*.pdf usr/share/doc/kball-data
uudecode -o debian/kball-data/usr/share/doc/kball-data/kball_manual_en.sxw < debian/doc/kball_manual_en.sxw.uu
uudecode -o debian/kball-data/usr/share/doc/kball-data/kball_manual_es.sxw < debian/doc/kball_manual_es.sxw.uu
-install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -a -k
-
- dh_installdirs -a usr/games
- dh_install -a bin/kball_linux.bin usr/games
+override_dh_install-arch:
+ dh_install bin/kball_linux.bin usr/games
mv debian/kball/usr/games/kball_linux.bin debian/kball/usr/games/kball
+ dh_install debian/kball.xpm usr/share/pixmaps
+ dh_install debian/kball.desktop usr/share/applications
- dh_installdirs -a usr/share/pixmaps
- dh_install -a debian/kball.xpm usr/share/pixmaps
+override_dh_installchangelogs:
+ dh_installchangelogs CHANGES
- dh_installdirs -a usr/share/applications
- dh_install -a debian/kball.desktop usr/share/applications
+override_dh_installdocs:
+ dh_installdocs
+ $(RM) -r debian/kball/usr/share/doc/kball
+ dh_link usr/share/doc/kball-data usr/share/doc/kball
-install: install-arch install-indep
-
-# Build architecture-independent files here.
-binary-indep: install-indep
- dh_testdir
- dh_testroot
- dh_installchangelogs -i CHANGES
- 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/kball-data usr/share/doc/kball
- dh_installmenu -a
- dh_installman -a debian/kball.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
Deleted: packages/trunk/kball/debian/source/local-options
===================================================================
--- packages/trunk/kball/debian/source/local-options 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/source/local-options 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,2 +0,0 @@
-abort-on-upstream-changes
-unapply-patches
Modified: packages/trunk/kball/debian/watch
===================================================================
--- packages/trunk/kball/debian/watch 2016-05-24 05:52:36 UTC (rev 15781)
+++ packages/trunk/kball/debian/watch 2016-06-02 05:40:31 UTC (rev 15782)
@@ -1,9 +1,4 @@
-# Watch control file for uscan
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
+version=4
# 16dec2004 --> 0.0.20041216
opts="uversionmangle=s/(\d{2})([a-z]{3})(\d{4})/0.0.$3$2$1/;s/jan/01/;s/feb/02/;s/mar/03/;s/apr/04/;s/may/05/;s/jun/06/;s/jul/07/;s/aug/08/;s/sep/09/;s/oct/10/;s/nov/11/;s/dec/12/" \
More information about the Pkg-games-commits
mailing list