r8900 - in packages/trunk/supertuxkart/debian: . patches
Christoph Egger
christoph-guest at alioth.debian.org
Sat Feb 21 15:42:52 UTC 2009
Author: christoph-guest
Date: 2009-02-21 15:42:52 +0000 (Sat, 21 Feb 2009)
New Revision: 8900
Removed:
packages/trunk/supertuxkart/debian/patches/bug1996464.patch
packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch
packages/trunk/supertuxkart/debian/patches/modesetting.patch
packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch
Modified:
packages/trunk/supertuxkart/debian/changelog
packages/trunk/supertuxkart/debian/copyright
packages/trunk/supertuxkart/debian/patches/series
packages/trunk/supertuxkart/debian/rules
packages/trunk/supertuxkart/debian/watch
Log:
* prepare upload of 0.6.1a
* manually merge 0.5+dfsg1
* remove now unneeded patches
* Adopt README.Source to the new situation
Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/changelog 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,28 +1,34 @@
-supertuxkart (0.5-1.2) UNRELEASED; urgency=low
+supertuxkart (0.6.1a+dfsg1-1) UNRELEASED; urgency=low
- [ Vincent Fourmond ]
- * NOT RELEASED YET
-
[ Peter De Wachter ]
* Added patch to check for SDL errors and to allow the game to run on
- low-end hardware (closes: #501116).
+ low-end hardware (closes: #501116), (LP: #203144); Applied Upstream
[ Christoph Egger ]
- * Use patch upstream uses for their bug #1996464
- * Fix incorrect recreation of items
- * Correct Issue when restarting follow-the-leader game:
- recreation-and-restart.patch
+ * New Upstream Release (Closes: #512994), (LP: #319990)
+ * Fix incorrect recreation of items
+ * Correct Issue when restarting follow-the-leader game
+ * Fix build with GCC 4.4 (Closes: #505671)
+ * Drop all patches (now upstream)
* Use $(QUILT_STAMPFN) insted of direct patch target for quilt make-snippet
- * Fix build with GCC 4.4 (Closes: #505671)
- ftbfs-gcc-4.4.patch
- * Change my Mailadress
* Wrap Uploaders, Build-Depends
+ * get-orig-source target
+ * mangle watchfile correctly
[ Stefan Potyra ]
* debian/supertuxcart.sgml: fix dhusername entity.
- -- Stefan Potyra <sistpoty at ubuntu.com> Sun, 15 Feb 2009 02:21:23 +0100
+ -- Christoph Egger <debian at christoph-egger.org> Wed, 18 Feb 2009 18:13:28 +0100
+supertuxkart (0.5+dfsg1-1) unstable; urgency=medium
+
+ * urgency medium due to RC fix
+ * Replacing nonfree stuff (Closes: #514416)
+ * Improving debian/copyright
+ * Update my Email address
+
+ -- Christoph Egger <debian at christoph-egger.org> Sun, 08 Feb 2009 19:38:27 +0100
+
supertuxkart (0.5-1.1) unstable; urgency=high
* Non-maintainer upload.
Modified: packages/trunk/supertuxkart/debian/copyright
===================================================================
--- packages/trunk/supertuxkart/debian/copyright 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/copyright 2009-02-21 15:42:52 UTC (rev 8900)
@@ -5,125 +5,189 @@
<pkg-games-devel at lists.alioth.debian.org>
It was downloaded from http://supertuxkart.sourceforge.net/
+Data to replace non-free bits is available at
+ http://alioth.debian.org/~christoph-guest/stk-0.6.1a-dfsg.tar.bz2
The project leaders are:
- Joerg Henrichs (hiker)
- Eduardo Hernandez Munoz (coz)
+ Joerg Henrichs (hiker)
+ Eduardo Hernandez Munoz (coz)
-Copyright Holder:
+###
-Copyright (C) 2004, 2006 Ingo Ruhnke
-Copyright (C) 2004 Matthias Braun
-Copyright (C) 2004-2007 Eduardo Hernandez Munoz
-Copyright (C) 2006-2008 Joerg Henrichs
-Copyright (C) 2006-2008 Patrick Ammann
-Copyright (C) 2007 Damien Morel
-Copyright (C) 2007-2008 Robert Schuster
-Copyright (C) 2007 Maik Semder
-Copyright (C) 2008 Paul Elms
-Copyright (C) 2004 James Gregory
-Copyright (C) 2004 Paul Carley
-Copyright (C) 2004 Craig Keogh
-Copyright (C) 2004 Pascal Giard
-Copyright (C) 2004 Caleb Sawtell
-Copyright (C) 2004 Ricardo Cruz
-Copyright (C) 2004 Oliver Jeeves
-Copyright (C) 2004 Jacob Persson
-Copyright (C) 2004 Willian Padovani Germano
+Copyright:
-Copyright (C) 2007 Johannes Sjolund
-Copyright (C) 2007 Frederico de Oliveira Linhares
+Everything with no further Notice is
+For Supertuxkart:
+ Copyright © 2004, 2006 Ingo Ruhnke
+ Copyright © 2004 Matthias Braun
+ Copyright © 2004-2007 Eduardo Hernandez Munoz
+ Copyright © 2006-2008 Joerg Henrichs
+ Copyright © 2006-2008 Patrick Ammann
+ Copyright © 2007 Damien Morel
+ Copyright © 2007-2008 Robert Schuster
+ Copyright © 2007 Maik Semder
+ Copyright © 2008 Paul Elms
+ Copyright © 2004 James Gregory
+ Copyright © 2004 Paul Carley
+ Copyright © 2004 Craig Keogh
+ Copyright © 2004 Pascal Giard
+ Copyright © 2004 Caleb Sawtell
+ Copyright © 2004 Ricardo Cruz
+ Copyright © 2004 Oliver Jeeves
+ Copyright © 2004 Jacob Persson
+ Copyright © 2004 Willian Padovani Germano
+ Copyright © 2007 Johannes Sjolund
+ Copyright © 2007 Frederico de Oliveira Linhares
+ Copyright © 2007 Christian Zigotzky
+ Copyright © 2007 Canarix
+ Copyright © 2004 SuperTuxKart Team
-Copyright (C) 2007 Christian Zigotzky
+For Tuxkart (Supertuxkart is derived from Tuxkart
+ Copyright © 2000-2002, 2004 Steve Baker
+ Copyright © 2000 Oliver Baker
+ Copyright © 2007 Matt Thomas
-Copyright (C) 2007 Canarix
+Debian Packaging (debian/)
+ Copyright © 2006,2007,2008 Gonéri Le Bouder
+ Copyright © 2008 Alexander Schmehl
+ Copyright © 2007,2008 Sam Hocevar
+ Copyright © 2007,2008 Cyril Brulebois
+ Copyright © 2008,2009 Christoph Egger
-Copyright 2004 SuperTuxKart Team
+From Neverball (src/widget_set.cpp and src/widget_set.hpp)
+ Copyright © 2003 Robert Kooima
+data/tracks/islandtrack/road_sand
+ Copyright © Steve Baker
+ Copyright © 2009 Christoph Egger
-SuperTuxKart is also a derivated work based on TuxKart:
+License: GNU GPL v2+
+---
+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
+of the License, or (at your option) any later version.
-Authors:
-Copyright (C) 2000-2002, 2004 Steve Baker
-Copyright (C) 2000 Oliver Baker
-Copyright (C) 2007 Matt Thomas
+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.
-License:
- 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
- of the License, or (at your option) any later version.
+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.
- 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.
+On Debian systems, the complete text of the GPL license can be found in the
+/usr/share/common-licenses/GPL-2 file.
- 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.
+==========
+Bullet Physics (src/bullet/*)
+ Copyright © 2003-2008 Erwin Coumans
+ Copyright © 2003-2006 Gino van den Bergen
+ Copyright © 2003-2006 Stan Melax
+ Copyright © 2005-2007 Christer Ericson
+ Copyright © 2005-2007 Simon Hobbs
+ Copyright © 2005-2007 Ricardo Padrela
+ Copyright © 2005-2007 F Richter(res)
+ Copyright © 2005-2007 Stephane Redon
+License: Bullet
+---
+Bullet Continuous Collision Detection and Physics Library
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
+use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
+ that you wrote the original software. If you use this software in a
+ product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+==========
+
+data/tracks/islandtrack/rock{1,4}
+ Copyright © ImageAfter
+ Copyright © 2009 Christoph Egger
+
+data/tracks/islandtrack/road_sand_side
+ Copyright © ImageAfter
+ Copyright © 2009 Christoph Egger
+ Copyright © Gregory Schick
+
+License: GNU GPL v2
+---
+This program is free software; you can redistribute it and/or
+modify it under the terms of Version 2 of the GNU General Public License
+as published by the Free Software Foundation.
+
+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 systems, the complete text of the GPL license can be found in the
/usr/share/common-licenses/GPL-2 file.
-The src/widget_set.cpp and src/widget_set.hpp files come from Neverball and is
-licensed with the same license (GPLv2 or any later version)
-copyright (C) 2003 Robert Kooima
+==========
-Files src/bullet/*:
-Copyright Holder:
+data/tracks/islandtrack/sky2.rgb
+data/tracks/xr591/marscity_yellow{,2}.rgb
+data/textures/{dirt2sand,sand2,palmtree3}.rgb
+data/sfx/{bowling_roll,engine_large,engine_small,goo,gp_end,horn,parachute,shoot,strike}.wav
+ Copyright © 2009 Christoph Egger
-Copyright (C) 2003-2008 Erwin Coumans
-Copyright (C) 2003-2006 Gino van den Bergen
-Copyright (c) 2003-2006 Stan Melax
-Copyright (c) 2005-2007 Christer Ericson
-Copyright (c) 2005-2007 Simon Hobbs
-Copyright (c) 2005-2007 Ricardo Padrela
-Copyright (c) 2005-2007 F Richter(res)
-Copyright (c) 2005-2007 Stephane Redon
+License: ZLib
+---
+This software is provided 'as-is', without any express or
+implied warranty. In no event will the authors be held
+liable for any damages arising from the use of this software.
-License:
- Bullet Continuous Collision Detection and Physics Library
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute
+it freely, subject to the following restrictions:
- This software is provided 'as-is', without any express or implied warranty.
- In no event will the authors be held liable for any damages arising from the
- use of this software.
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it freely,
- subject to the following restrictions:
+1. The origin of this software must not be misrepresented;
+ you must not claim that you wrote the original software.
+ If you use this software in a product, an acknowledgment
+ in the product documentation would be appreciated but
+ is not required.
- 1. The origin of this software must not be misrepresented; you must not claim
- that you wrote the original software. If you use this software in a
- product, an acknowledgment in the product documentation would be
- appreciated but is not required.
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- 3. This notice may not be removed or altered from any source distribution.
+2. Altered source versions must be plainly marked as such,
+ and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any
+ source distribution.
-canyon track and city track
- /usr/share/games/supertuxkart/data/tracks/(city|canyon)
-as well as
- /usr/share/games/supertuxkart/data/tracks/crescentcrossing/roof.rgb
-and
-* city_asphalt
-* city_concrete
-* city_checker
-* grass2
-* palmtree3
-* sand2
-* dirt2sand
-* grass2dirt
-* roaddirt
- in /usr/share/games/supertuxkart/data/textures
+==========
-are are (C) Thomas Oppl <toppl at fh-sbg.ac.at> and licensed under
- Creative Commons by-sa 3.0 (http://creativecommons.org/licenses/by/3.0/)
+data/tracks/{city,canyon}/*
+data/tracks/crescentcrossing/roof.rgb
+data/textures/{city_asphalt,city_concrete,city_checker,roaddirt}.rgb
+ Copyright © Thomas Oppl <toppl at fh-sbg.ac.at>
-License:
+data/tracks/xr591/metal_ground.rgb
+ Copyright © 2009 MiniBjorn
+data/textures/palmtree3 is
+ Copyright © 2009 Christoph Egger <debian at christoph-egger.org>
+ Copyright © Gregory Schick <leadgolem at gmail.com>
+
+License: Creative Commons by-sa 3.0
+---
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
Deleted: packages/trunk/supertuxkart/debian/patches/bug1996464.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/bug1996464.patch 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/patches/bug1996464.patch 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,60 +0,0 @@
-diff -Naur supertuxkart-0.5/src/race_manager.hpp supertuxkart-0.5-patched/src/race_manager.hpp
---- supertuxkart-0.5/src/race_manager.hpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5-patched/src/race_manager.hpp 2008-07-01 22:10:57.000000000 +0200
-@@ -128,6 +128,7 @@
- const std::string& getHerringStyle() const
- { return m_cup.getHerringStyle(); }
- int getKartScore(int krt) const { return m_kart_status[krt].m_score;}
-+ int getKartPlayerId(int krt) const {return m_kart_status[krt].m_player_id;}
- int getPositionScore(int p) const { return m_score_for_position[p-1]; }
- double getOverallTime(int kart) const { return m_kart_status[kart].m_overall_time;}
- int getCoinTarget() const { return m_coin_target; }
-diff -Naur supertuxkart-0.5/src/world.cpp supertuxkart-0.5-patched/src/world.cpp
---- supertuxkart-0.5/src/world.cpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5-patched/src/world.cpp 2008-07-03 18:57:34.000000000 +0200
-@@ -95,7 +96,8 @@
- // karts can be positioned properly on (and not in) the tracks.
- loadTrack() ;
-
-- int playerIndex = 0;
-+ m_player_karts.resize(race_manager->getNumPlayers());
-+
- for(unsigned int i=0; i<race_manager->getNumKarts(); i++)
- {
- int position = i+1; // position start with 1
-@@ -103,16 +105,18 @@
- m_track->getStartCoords(i, &init_pos);
- Kart* newkart;
- const std::string& kart_name=race_manager->getKartName(i);
-+ int playerId = race_manager->getKartPlayerId(i);
-+
- if(user_config->m_profile)
- {
- // In profile mode, load only the old kart
- newkart = new DefaultRobot(kart_name, position, init_pos);
- // Create a camera for the last kart (since this way more of the
-- // karts can be seen.
-+ // karts can be seen.
- if(i==race_manager->getNumKarts()-1)
- {
- btVector3 startpos(init_pos.xyz[0], init_pos.xyz[1], init_pos.xyz[2]);
-- scene->createCamera(playerIndex, newkart);
-+ scene->createCamera(0, newkart);
- }
- }
- else
-@@ -120,10 +124,9 @@
- if (race_manager->isPlayer(i))
- {
- newkart = new PlayerKart(kart_name, position,
-- &(user_config->m_player[playerIndex]),
-- init_pos, playerIndex);
-- m_player_karts.push_back((PlayerKart*)newkart);
-- playerIndex++;
-+ &(user_config->m_player[playerId]),
-+ init_pos, playerId);
-+ m_player_karts[playerId] = (PlayerKart*)newkart;
- }
- else
- {
-
Deleted: packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/patches/ftbfs-gcc-4.4.patch 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,12 +0,0 @@
-Index: supertuxkart-0.5.obsolete.0.162730800760077/src/lisp/lexer.cpp
-===================================================================
---- supertuxkart-0.5.obsolete.0.162730800760077.orig/src/lisp/lexer.cpp 2008-11-15 12:19:49.000000000 +0100
-+++ supertuxkart-0.5.obsolete.0.162730800760077/src/lisp/lexer.cpp 2008-11-15 12:20:27.000000000 +0100
-@@ -19,6 +19,7 @@
- // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #include <sstream>
- #include <stdexcept>
-+#include <cstdio>
- #include <cstring>
-
- #include "lexer.hpp"
Deleted: packages/trunk/supertuxkart/debian/patches/modesetting.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/modesetting.patch 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/patches/modesetting.patch 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,74 +0,0 @@
---- a/src/sdldrv.cpp
-+++ b/src/sdldrv.cpp
-@@ -58,15 +58,11 @@
- : sensedInput(0), actionMap(0), mainSurface(0), flags(0), stickInfos(0),
- mode(BOOTSTRAP), mouseValX(0), mouseValY(0)
- {
-- SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER);
--
-- SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-- SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-- SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-- SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-- SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
-+ if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_TIMER) < 0)
-+ {
-+ fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
-+ exit(1);
-+ }
-
- flags = SDL_OPENGL | SDL_HWSURFACE;
-
-@@ -247,8 +243,50 @@
- {
- //Is SDL_FreeSurface necessary? SDL wiki says not??
- SDL_FreeSurface(mainSurface);
-+
-+ SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
-+ SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
-+ SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
-+ SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
-+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);
-+ SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 1);
-+
- mainSurface = SDL_SetVideoMode(user_config->m_width, user_config->m_height, 0, flags);
-
-+ if (!mainSurface)
-+ {
-+ //ask for lower quality as a fallback
-+ SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
-+ SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 5);
-+ SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 5);
-+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
-+
-+ mainSurface = SDL_SetVideoMode(user_config->m_width, user_config->m_height, 0, flags);
-+ if (mainSurface)
-+ {
-+ fprintf(stderr, "Using fallback OpenGL settings\n");
-+ }
-+ else
-+ {
-+ //one last attempt: get rid of the alpha channel
-+ SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 0);
-+
-+ mainSurface = SDL_SetVideoMode(user_config->m_width, user_config->m_height, 0, flags);
-+ if (mainSurface)
-+ {
-+ fprintf(stderr, "Using fallback OpenGL settings, without alpha channel\n");
-+ }
-+ else
-+ {
-+ fprintf(stderr, "SDL_SetVideoMode (%dx%d) failed: %s\n",
-+ user_config->m_width, user_config->m_height, SDL_GetError());
-+ exit(1);
-+ }
-+ }
-+
-+ }
-+
- #if defined(WIN32) || defined(__APPLE__)
- if(resetTextures)
- {
Deleted: packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/patches/recreation-and-restart.patch 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,90 +0,0 @@
-Index: supertuxkart-0.5/src/herring.cpp
-===================================================================
---- supertuxkart-0.5.orig/src/herring.cpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5/src/herring.cpp 2008-11-15 12:11:21.000000000 +0100
-@@ -69,7 +69,7 @@
- {
- if(m_eaten)
- {
-- const float T = m_time_to_return - world->getTime();
-+ const float T = m_time_to_return - world->getForwardTime();
- if ( T > 0 )
- {
- sgVec3 hell;
-@@ -99,6 +99,6 @@
- void Herring::isEaten()
- {
- m_eaten=true;
-- m_time_to_return=world->getTime()+2.0f;
-+ m_time_to_return=world->getForwardTime()+2.0f;
- }
-
-Index: supertuxkart-0.5/src/race_manager.cpp
-===================================================================
---- supertuxkart-0.5.orig/src/race_manager.cpp 2008-05-31 09:07:09.000000000 +0200
-+++ supertuxkart-0.5/src/race_manager.cpp 2008-11-15 12:11:21.000000000 +0100
-@@ -247,8 +247,10 @@
- {
- m_kart_status[i].m_score -= m_kart_status[i].m_last_score;
- m_kart_status[i].m_overall_time -= m_kart_status[i].m_last_time;
-+ m_kart_status[i].m_is_eliminated = false;
- }
-- world->restartRace();
-+ //world->restartRace(); // seems that world->restartRace() gets called,
-+ // not race_manager->restartRace()
- } // restartRace
-
- /* EOF */
-Index: supertuxkart-0.5/src/world.cpp
-===================================================================
---- supertuxkart-0.5.orig/src/world.cpp 2008-11-15 12:11:21.000000000 +0100
-+++ supertuxkart-0.5/src/world.cpp 2008-11-15 12:11:21.000000000 +0100
-@@ -66,6 +66,7 @@
- m_previous_phase = SETUP_PHASE; // initialise it just in case
- m_track = NULL;
- m_clock = 0.0f;
-+ m_total_clock = 0.0f;
- m_faster_music_active = false;
- m_fastest_lap = 9999999.9f;
- m_fastest_kart = 0;
-@@ -453,6 +454,9 @@
- break;
- default : break;
- } // switch
-+
-+ m_total_clock += dt;
-+
- if(race_manager->getRaceMode()==RaceManager::RM_FOLLOW_LEADER)
- {
- // Count 'normal' till race phase has started, then count backwards
-@@ -724,7 +728,10 @@
- //-----------------------------------------------------------------------------
- void World::restartRace()
- {
-+ race_manager->restartRace();
-+
- m_clock = 0.0f;
-+ m_total_clock = 0.0f;
- m_phase = SETUP_PHASE;
- m_previous_phase = SETUP_PHASE;
- m_faster_music_active = false;
-Index: supertuxkart-0.5/src/world.hpp
-===================================================================
---- supertuxkart-0.5.orig/src/world.hpp 2008-05-31 09:07:10.000000000 +0200
-+++ supertuxkart-0.5/src/world.hpp 2008-11-15 12:11:21.000000000 +0100
-@@ -104,6 +104,7 @@
- void setFastestLap(Kart *k, float time) {m_fastest_kart=k;m_fastest_lap=time;}
- const Highscores* getHighscores() const { return m_highscores; }
- float getTime() const { return m_clock; }
-+ float getForwardTime() const { return m_total_clock; }
-
- void pause();
- void unpause();
-@@ -118,6 +119,7 @@
- Phase m_phase;
- Phase m_previous_phase; // used during the race popup menu
- float m_clock;
-+ float m_total_clock;
- float m_finish_delay_start_time;
- int m_eliminated_karts; // number of eliminated karts
- int m_eliminated_players; // number of eliminated players
Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/patches/series 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,4 +0,0 @@
-bug1996464.patch
-modesetting.patch
-recreation-and-restart.patch
-ftbfs-gcc-4.4.patch
Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/rules 2009-02-21 15:42:52 UTC (rev 8900)
@@ -33,6 +33,17 @@
# Add here commands to configure the package.
CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games
+get-orig-source:
+ TEMPDIR = $(shell mktemp -d)
+ uscan --force-download --destdir $(TEMPDIR)
+ wget http://alioth.debian.org/~christoph-guest/stk-0.6.1a-dfsg.tar.bz2 -O $(TEMPDIR)/replacment.tar.bz2
+ (cd $(TEMPDIR) && \
+ tar -xjf '*.tar.bz' \
+ mv 'supertuxkart*' supertuxkart-0.6.1a.orig \
+ cp -r 'stk*/*' supertuxkart-0.6.1a.orig/ \
+ GZIP="--best" tar -czf supertuxkart_0.6.1a+dfsg1.orig.tar.gz supertuxkart-0.6.1a.orig )
+ mv $(TEMPDIR)/supertuxkart_0.6.1a+dfsg1.orig.tar.gz .
+ rm -rf $(TEMPDIR)
build: build-stamp
@@ -71,7 +82,7 @@
# Add here commands to install the package into debian/supertuxkart.
$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
- find $(CURDIR)/debian/tmp -name "license.txt" -exec rm -f {} \;
+ find $(CURDIR)/debian/tmp \( -iname "License.txt" -o -iname "License.Debian.txt \) -exec rm -f {} \;
mkdir -p $(CURDIR)/debian/tmp/usr/share/pixmaps
mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/32x32/apps
mkdir -p $(CURDIR)/debian/tmp/usr/share/icons/hicolor/64x64/apps
@@ -108,4 +119,4 @@
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install get-orig-source
Modified: packages/trunk/supertuxkart/debian/watch
===================================================================
--- packages/trunk/supertuxkart/debian/watch 2009-02-20 19:28:08 UTC (rev 8899)
+++ packages/trunk/supertuxkart/debian/watch 2009-02-21 15:42:52 UTC (rev 8900)
@@ -1,3 +1,6 @@
version=3
-http://sf.net/supertuxkart/supertuxkart-([\d.]+)\.tar\.bz2
+opts=dversionmangle=s/+dfsg\d+$// \
+ http://sf.net/supertuxkart/supertuxkart-([\d.]+)\.tar\.bz2
+
+#http://sf.net/supertuxkart/supertuxkart-([\d.]+)\.tar\.bz2
More information about the Pkg-games-commits
mailing list