Your message dated Sun, 15 Mar 2009 13:50:25 +0100
with message-id <20090315125025.ge19...@dedibox-hostname>
and subject line re: Please merge changes from extremetuxracer 0.4-0ubuntu1
has caused the Debian Bug report #483716,
regarding Please merge changes from extremetuxracer 0.4-0ubuntu1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)


-- 
483716: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=483716
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: extremetuxracer
Version: 0.4-1

I'm the maintainer of the Ubuntu version of extremetuxracer. I thought you may 
be interest by some of the changes in my extremetuxracer package, so I've 
attached this debdiff which is a merge of my original extremetuxracer package 
and your package. This should hopefully lead to a smaller delta between 
Debian and Ubuntu.
reverted:
--- extremetuxracer-0.4/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/copyright
+++ extremetuxracer-0.4.orig/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/copyright
@@ -1,46 +0,0 @@
-This package was debianized by Alexander Schmehl <[email protected]> on
-Sun,  6 Feb 2005 08:55:02 +0100.
-
-Some parts of this package are based on the tuxracer package by Oliver M.
-Bolzer <[email protected]>.  Thanks for your work Oliver!
-
-It was downloaded from http://racer.planetpenguin.de/
-
-
-Upstream Author: Volker Stroebel <[email protected]>
-  and others, please  see the file AUTHORS for additional information
-
-
-src/quadtree.cpp is Copyright 1999-2000 by Thatcher Ulrich <[email protected]>.
-
-It's license follows:
-  This code may be freely modified and redistributed.  I make no
-  warrantees about it; use at your own risk.  If you do incorporate
-  this code into a project, I'd appreciate a mention in the credits.
-
-
-The menu icons were downloaded from
-http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ppracer/repository/icons/ and are
-Copyright 2004 by Helder Correia.  They are licensed like all other files (with
-the already mentioned exception of src/quadtree.cpp) under the terms of the
-terms of the GNU General Public Licence, Version 2:
-
-
-Copyright: GNU General Public Licence, Version 2
-
-   ppracer is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   ppracer 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 with
-   your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with 
-   the Debian GNU/Linux bash source package as the file COPYING.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-
reverted:
--- extremetuxracer-0.4/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/changelog.Debian
+++ extremetuxracer-0.4.orig/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/changelog.Debian
@@ -1,5 +0,0 @@
-extremetuxracer (0.4-1) UNRELEASED; urgency=low
-
-  * Initial package release (Close: #465660)
-
- -- Alexander Schmehl <[email protected]>  Wed, 13 Feb 2008 18:47:03 +0100
reverted:
--- extremetuxracer-0.4/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/changelog
+++ extremetuxracer-0.4.orig/debian/planetpenguin-racer-dbg/usr/share/doc/planetpenguin-racer-dbg/changelog
@@ -1,421 +0,0 @@
-== etracer ==
-2007-09-21 Andreas Tarandi <[email protected]>
-	Bug-fixes and translation update.
-2007-09-20 Andreas Tarandi <[email protected]>
-	* src/highscore.cpp:
-	Shouldn't crash on empty highscore now. I think
-2007-09-20 Andreas Tarandi <[email protected]>
-Changes:
-M      src/game_config.cpp
-M      src/event_select.cpp
-M      src/os_util.cpp
-M      src/ppgltk/ui_theme.cpp
-M      src/splash_screen.cpp
-M      src/main.cpp
-M      src/highscore.cpp
-M      src/videoconfig.cpp
-M      data/Makefile.in
-A      data/textures/menu_title_small.png
-A      data/textures/splash_small.png
-A      data/etracer_init.tcl
-D      data/ppracer_init.tcl
-M      data/Makefile.am
-
-* Added some new graphics for small resolutions, and removed some video alteratives for windows (request from cpicon)
-* The edits in other files are just changes from PPRacer -> ETRacer that I made.
-
-2007-09-20 Andreas Tarandi <[email protected]>
-Changes:
-M      src/track_marks.cpp
-M      src/reset.cpp
-M      src/player.h
-M      src/keyframe.cpp
-A      src/model_hndl.cpp
-M      src/Makefile.am
-M      src/phys_sim.cpp
-M      src/Makefile.in
-M      src/tux_shadow.cpp
-D      src/tux.h
-M      src/graphicsconfig.cpp
-M      src/intro.cpp
-M      src/credits.cpp
-M      src/game_over.cpp
-M      src/paused.cpp
-M      src/etracer.h
-M      src/graphicsconfig.h
-M      src/player.cpp
-M      src/racing.cpp
-M      src/view.cpp
-A      src/model_hndl.h
-M      src/main.cpp
-D      src/tux.cpp
-A      data/tux_snowboard.tcl
-M      data/ppracer_init.tcl
-M      data/translations/fr_FR.tcl
-M      data/translations/sv_SE.tcl
-M      data/translations/nl_NL.tcl
-M      data/translations/languages.tcl
-M      data/translations/en_GB.tcl
-A      data/translations/fi_FI.tcl
-M      data/Makefile.in
-A      data/models.tcl
-A      data/fonts/PaperCuts20.ttf
-M      data/Makefile.am
-
-* Added multimodel support (add model in data/models.tcl)
-* Updated some translations.
-* Also added the updated font
-
-2007-09-19 Andreas Tarandi <[email protected]>
-   * src/ppoglk/widget.h
-     Added the function bool getSensitive() (returns set value from setSensitive())
-   * src/event_select.cpp, src/event_race_select.cpp
-     Fixed the bug that made it possible to play a locked level by pressing enter
-   * src/credits.cpp (edit by cpicon92)
-     Added the Extreme Tux Racer team to the credits
-   *	data/translations/sv_SE.tcl
-   	Minor fixes
-   * data/textures/*, /home/torandi/builds/etracer/data/courses/themes/items/herrings/herring_dead.png
-     Updated some graphics (new graphic by Nicosmos and cpicon92s)
-    	
-   	
-2007-09-13 Andreas Tarandi <[email protected]>
-   * data/translations/languages.tcl
-   	data/translations/sv_SE.tcl
-   	data/Makefile.in
-   	Added swedish translation
-   	
-2007-09-13 Andreas Tarandi <[email protected]>
-   * src/race_select.h  src/event_select.cpp src/loop.cpp
-     src/game_over.h src/game_type_select.cpp src/Makefile.in
-     src/winsys.cpp src/game_over.cpp src/race_select.cpp src/loop.h
-     src/player.cpp src/game_type_select.h
-     src/main.cpp src/event_select.h
-     data/translations/en_GB.tcl
-     new files: src/highscore.cpp src/highscore.h
-     Added highscore, plus a way for user to enter username.
-	Some translation is needed. (See #highscore in data/translations/en_GB.tcl)
-	
-2007-9-1  Steven Bell <[email protected]>
-  * AUTHORS    
-
-=== ppracer 0.3.1 ===
-
-2005-02-28  Volker Stroebel <[email protected]>
-	* src/data/translations
-	updated translations
-
-2005-02-27  Volker Stroebel <[email protected]>
-	* src/ppgltk/audio/audio_data.cpp src/hier_util.cpp
-	  src/phys_sim.cpp src/ppgltk/textarea.cpp
-	  src/credis.cpp src/hud.cpp src/quadtree.cpp
-	  src/race_select.cpp src/ppgltk/listbox.cpp
-	  src/callbacks.cpp src/ppgltk/label.cpp
-	fixed compilation with --enable-debug
-	
-	* configure.in
-	fixed --disable-debug
-
-2005-02-26  Volker Stroebel <[email protected]>
-	* src/phys_sim.cpp src/quadtree.* src/string_util.cpp 
-	  src/debug.h src/textures.cpp src/ppgltk/images/png_reader.cpp
-	  src/ppgltk/model.cpp src/ppgltk/model_ac.cpp
-	  src/ppgltk/font.cpp src/course_quad.cpp
-	several code fixes from ArKay
-
-2005-02-24  Volker Stroebel <[email protected]>
-	* src/game_over.cpp
-	fix max speed calculation	
-
-2005-02-18  Volker Stroebel <[email protected]>
-	* data/translations/*
-	updated translations
-	
-	* contrib/palettes/*
-	added gimp color palettes for the terrains
-	
-	* configure.in
-	added --with-tcl-inc and --with-tcl-lib-name
-
-2005-02-15  Volker Stroebel <[email protected]>
-	* src/course_load.cpp
-	made hud translateable
-
-2005-02-11  Volker Stroebel <[email protected]>
-	* src/videoconfig.*
-	added videomode autodetection (only resolutions)
-	
-	* src/gameconfig.*
-	added x_resolution_half_width
-	added disable_videomode_autodetection
-	
-	* src/splash_screen.*
-	made label translateable and changed merged images
-	
-	* src/ppgltk/images/png_reader.*
-	added support for grayscale and palette images
-	
-	*src/credits.cpp
-	added translators to credits
-
-2005-02-10  Volker Stroebel <[email protected]>
-	* src/graphicsconfig.cpp
-	increased size of language selection widget
-	
-	* src/winsys.cpp
-	fixed compilation problem on some sdl version
-
-2005-02-08  Volker Stroebel <[email protected]>
-	* src/quadtree.cpp src/textures.cpp src/lopp.cpp
-	added some fixes from ArKay
-
-2005-02-07  Volker Stroebel <[email protected]>
-	* src/translations/*
-	updated and added new translations
-
-=== ppracer 0.3 ===
-
-2005-02-01  Volker Stroebel <[email protected]>
-	* src/ppgltk/font.* src/callbacks.cpp
-	implemented pp_bind_font
-	
-	* src/data/*
-	updated font registration
-	added fr_FR translation
-	updated translation
-
-2005-01-31  Volker Stroebel <[email protected]>
-	* src/textures.cpp
-	added patch from Stephane Marchesin to fix
-	skybox gabs on ati radeon cards
-	
-	* src/ppgltk/*
-	changed enabled state to sensitive state in pp::Widgets
-	implemented insensitive state in pp::Label and pp::Listbox
-	added insensitiv and focus color to pp::Theme
-	added hasFocus handling to pp::Listbox
-	
-	* src/joystickconfig.*
-	made config insensitive if joystick is disabled
-	finished joystick config
-
-2005-01-30  Volker Stroebel <[email protected]>
-	* src/joystickconfig.*
-	added joystick configuration
-	
-	* src/*
-	cleanups in several gamemodes
-
-2005-01-29  Volker Stroebel <[email protected]>
-	* src/*
-	completed the change to new font system
-	
-	* src/fonts.* data/fonts/*
-	removed old font system and old font data files
-
-2005-01-28  Volker Stroebel <[email protected]>
-	* src/hud.* src/course_load.cpp
-	changed hud to use new font system
-	added some speed optimations
-	
-	* src/ppgltk/font.*
-	added functions for using unicode strings
-
-2005-01-27  Volker Stroebel <[email protected]>
-	* src/ppgltk/label.*
-	added label widget
-	
-	* src/ppgltk/alignment.* src/ppgltk/widget.h
-	added classes Alignment
-	added alignment to pp::Widget
-	
-	* src/* 
-	changed code to use pp::Label
-
-2005-01-26  Volker Stroebel <[email protected]>
-	* src/*
-	partly changed code to use new font system
-	
-	* src/ppgltk/*
-	changed some widget code to new coding convention
-
-2005-01-25  Volker Stroebel <[email protected]>
-	* configure.in src/ppgltk/font.* src/ppgltk/FT/*
-	added FTGL
-	added freetype based font system
-	added freetype detection to configure.in
-
-2005-01-24  Volker Stroebel <[email protected]>
-
-	* configure.in
-	fixed --with-tcl=DIR switch
-	
-	* configure.in src/game_config.cpp
-	changed default data dir to respect the prefix
-	
-	* data/*
-	merged data package
-	added pt_PT (portuguese) translation
-	changed sco item to dead fish
-	
-=== ppracer 0.2.3 ===
-
-2005-01-18  Volker Stroebel <[email protected]>
-	
-	* src/credits
-	updated credits
-	
-	* (*)
-	fix compilation with mingw
-
-2005-01-14  Volker Stroebel <[email protected]>
-	* src/*
-	removed HAVE_SDL macro because this is now unnecessary
-	
-	* src/*
-	integrated language patch from Theo Snelleman
-	
-	* src/tex_font_metrics.cpp
-	fixed crash caused by some (unknown) characters
-
-2005-01-13  Volker Stroebel <[email protected]>
-	* aclocal.am configure.in
-	changed some parts of the configure stuff
-
-=== ppracer 0.2.2 ===
-
-2004-12-27  Volker Stroebel <[email protected]>
-	* src/course_load.* quadtree.cpp
-	added support for terrains wheights
-	fix calculation of nonexistant terrains
-	
-	* src/player.* src/hud.*
-	implement course percentage and add progressbar to HUD
-	
-	* src/game_config.* src/graphicsconfig.*
-	added display_course_percentage to game config
-	and a checkbox in the graphicsconfig UI
-	
-	* src/ppgltk/textarea.*
-	changed createLines() to support newlines
-
-	* src/*
-	code cleanups
-	
-	* doc/*
-	added doc directory and a doxygen file for
-	api/code documentation.
-	
-	* src/credits.cpp
-	updated contributors
-
-2004-12-23  Volker Stroebel <[email protected]>
-	* src/ppgltk/model_ac.cpp
-	fix compilation problem
-
-2004-12-10  Volker Stroebel <[email protected]>
-	* src/fonts.* src/...
-	added Font::getWidth(const char* string)
-	changed some static positions for variable width translations
-
-2004-12-09  Volker Stroebel <[email protected]>
-	* src/translation.* src/main.cpp
-	added simple translation support
-	added ui_language to config files
-
-	* (src/...)
-	changed translateable string to use translation system	
-
-2004-12-08  Volker Stroebel <[email protected]>
-	* src/winsys.cpp
-	some cleanups
-
-=== ppracer 0.2.1-2 ===
-
-2004-12-08  Volker Stroebel <[email protected]>
-	* src/game_config.cpp src/ppracer.h
-	tcl did it again...
-	fix compilation error with tcl<8.4
-	
-	* src/game_config.* src/joystick.h
-	added disable_joystick to game config
-
-=== ppracer 0.2.1 ===
-
-2004-12-06  Volker Stroebel <[email protected]>
-	* src/course_load.* src/pp_classes.h src/phys_sim.cpp
-	changed Item::m_collectable to Item::m_type and added m_collected
-	added -type and removed -uncollectable attribute from item_spec_cb
-	
-	* src/player.* src/phys_sim.cpp src/pp_classes.h
-	added Item::LIFE to item Type
-	added support for increasing lives in class Player
-	
-	* (src/...)
-	changed colour to color
-
-2004-12-03  Volker Stroebel <[email protected]>
-	* src/bench.cpp
-	fix possible segfault on startup
-	
-	* src/bench.* src/main.cpp
-	added cmdline option for setting the condition in benchmode
-	
-	* src/ppgltk/model_ac.*
-	moved ac3d loader in class pp::ModelAC
-
-2004-12-03 Teemu Vesala <[email protected]>
-	* src/game_mgr.h src/game_over.cpp src/intro.cpp src/racing.cpp
-	added support for "airborne calculation. Outputs how many percent
- 	of time the Tux has been flying.
-
-2004-12-01  Volker Stroebel <[email protected]>
-	* src/ppgltk/model.* src/course_load.* src/pp_classes.h
-	added getPolyhedron() to pp::Model
-	added Polyhedron to tree_type_t and class Tree
-
-	* src/phys_sim.cpp
-	changed check_tree_collsion to use new tree model
-
-2004-11-29  Volker Stroebel <[email protected]>
-	* src/ppgktk/model.* src/ppgltk/model_ac.*
-	added support for ac3d models
-	
-	* src/course_load.cpp
-	added tree_model_cb for new tree model system
-	removed some old unused callbacks
-	
-	* src/ppgltk/alg/poly.*
-	added pp::Polyhedron and pp::Polygon
-	
-2004-11-26  Volker Stroebel <[email protected]>
-	* src/bench.cpp src/bench.h and some others
-	added class Benchmark
-	implement benchmark modes
-	added cmdline options for benchmodes
-	
-2004-11-25  Volker Stroebel <[email protected]>
-	* src/main.c src/game_config.c
-	added cmdline option for custom config files
-	
-	* src/game_config.*
-	added disable_collision_detection to config file
-	
-2004-11-23  Volker Stroebel <[email protected]>
-	* (src/...)
-	replaced some char* with std::string
-	
-	* (src/...)
-	fixed compilation error with gcc 2.95.x
-	
-	* (src/...)
-	changed some classes to use new coding specs
-	for privat member variables
-		
-=== ppracer 0.2-2 ===		
-
-2004-11-16  Volker Stroebel <[email protected]>		
-	* src/textures.cpp
-	fix crash on startup
-		
-=== ppracer 0.2 ===
reverted:
--- extremetuxracer-0.4/debian/patches/20_german_translation.diff
+++ extremetuxracer-0.4.orig/debian/patches/20_german_translation.diff
@@ -1,122 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_german_translation.dpatch by  <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: corrects bad translations in the german language file, reported by oli <[email protected]>, corrected by Sven Joachim <[email protected]> 
-
-...@dpatch@
-diff -urNad ppracer-0.3.1~/data/translations/de_DE.tcl ppracer-0.3.1/data/translations/de_DE.tcl
---- ppracer-0.3.1~/data/translations/de_DE.tcl	2005-02-28 09:17:47.000000000 +0100
-+++ ppracer-0.3.1/data/translations/de_DE.tcl	2005-11-05 20:00:07.000000000 +0100
-@@ -1,7 +1,7 @@
- 
- #common strings
- pp_translate_string "Back" "Zurück"
--pp_translate_string "PRESS ANY KEY TO START" "Beliebige Taste drücken um fortzufahren"
-+pp_translate_string "PRESS ANY KEY TO START" "Start mit beliebiger Taste"
- 
- 
- #game_type_select
-@@ -12,32 +12,32 @@
- pp_translate_string "Quit" "Beenden"
- 
- #configuration
--pp_translate_string "Graphics" "Grafiken"
-+pp_translate_string "Graphics" "Grafik"
- #pp_translate_string "Video" "Video"
--pp_translate_string "Audio" "Toneinstellungen"
-+pp_translate_string "Audio" "Ton"
- pp_translate_string "Keyboard" "Tastatur"
- #pp_translate_string "Joystick" "Joystick"
- 
- #config mode
- pp_translate_string "Cancel" "Abbrechen"
--pp_translate_string "Ok" "Übernehmen"
-+pp_translate_string "Ok" "Ok"
- 
- #graphics configuration
--pp_translate_string "Graphics Configuration" "Konfiguration der Grafiken"
-+pp_translate_string "Graphics Configuration" "Grafikeinstellungen"
- pp_translate_string "Language:" "Sprache:"
- pp_translate_string "Show UI Snow:" "Schnee im UI:"
- pp_translate_string "Display FPS:" "Zeige FPS:"
--pp_translate_string "Display Progress Bar:" "Zeige Vortschrittsbalken:"
-+pp_translate_string "Display Progress Bar:" "Zeige Fortschrittsbalken:"
- pp_translate_string "Draw Fog:" "Nebel:"
- pp_translate_string "Reflections:" "Reflektionen:"
- pp_translate_string "Shadows:" "Schatten:"
- 
- #video configuration
--pp_translate_string "Video Configuration" "Video konfigurieren"
-+pp_translate_string "Video Configuration" "Videoeinstellungen"
- pp_translate_string "Resolution:" "Auflösung:"
- pp_translate_string "Bits Per Pixel:" "Bits pro Pixel:"
- pp_translate_string "Fullscreen:" "Vollbild:"
--pp_translate_string "Experimental (needs restart)" "Experimentell (benötigen Neustart)"
-+pp_translate_string "Experimental (needs restart)" "Experimentell (benötigt Neustart)"
- pp_translate_string "Enable FSAA:" "Aktiviere FSAA:"
- 
- #audio configuration
-@@ -51,7 +51,7 @@
- pp_translate_string "Samples Per Second:" "Samples pro Sekunde:"
- 
- #keyboard configuration
--pp_translate_string "Keyboard Configuration" "Tastaturkonfiguration"
-+pp_translate_string "Keyboard Configuration" "Tastatureinstellungen"
- pp_translate_string "Turn left:" "Links:"
- pp_translate_string "Turn right:" "Rechts:"
- pp_translate_string "Paddle:" "Paddeln:"
-@@ -61,11 +61,11 @@
- pp_translate_string "Reset:" "Zurücksetzen:"
- 
- #joystick configuration
--pp_translate_string "Joystick Configuration" "Joystickkonfiguration"
-+pp_translate_string "Joystick Configuration" "Joystickeinstellungen"
- pp_translate_string "Enable Joystick" "Aktiviere Joystick"
- 
- #race select
--pp_translate_string "Race!" "Start"
-+pp_translate_string "Race!" "Start!"
- pp_translate_string "Select a race" "Rennen auswählen"
- pp_translate_string "Contributed by:" "Autor:"
- pp_translate_string "Unknown" "Unbekannt"
-@@ -78,18 +78,18 @@
- pp_translate_string "Select event and cup" "Veranstaltung und Wettbewerb wählen"
- pp_translate_string "Event:" "Veranstaltung:"
- pp_translate_string "Cup:" "Wettbewerb:"
--pp_translate_string "You've won this cup!" "Du hast diesen Wettbewerb gewonnen"
-+pp_translate_string "You've won this cup!" "Du hast diesen Wettbewerb gewonnen!"
- pp_translate_string "You must complete this cup next" "Du must diesen Wettbewerb jetzt absolvieren"
- pp_translate_string "You cannot enter this cup yet" "Du kannst an diesem Wettbewerb noch nicht teilnehmen"
- 
- #event race select
--pp_translate_string "You don't have any lives left." "Du hast keine Leben mehr übrig"
--pp_translate_string "Race won! Your result:" "Abfahrt gewonnen. Deine Ergebnisse:"
-+pp_translate_string "You don't have any lives left." "Du hast keine Leben mehr übrig."
-+pp_translate_string "Race won! Your result:" "Abfahrt gewonnen! Deine Ergebnisse:"
- pp_translate_string "Needed to advance:" "Benötigt:"
--pp_translate_string "You can't enter this race yet." "Du musst erst die vorherigen Rennen gewinnen"
-+pp_translate_string "You can't enter this race yet." "Du kannst an diesem Rennen noch nicht teilnehmen"
- 
- #loading
--pp_translate_string "Loading, Please Wait..." "Laden Abfahrt, bitte warten..."
-+pp_translate_string "Loading, Please Wait..." "Lade Abfahrt, bitte warten..."
- 
- #paused
- pp_translate_string "Resume" "Weiterspielen"
-@@ -103,11 +103,11 @@
- pp_translate_string "Max speed: %3d km/h" "Maximale Geschwindigkeit: %3d km/h"
- pp_translate_string "Was flying: %.01f %% of time" "Geflogen: %.01f %% der Zeit"
- pp_translate_string "Race aborted" "Rennen abgebrochen"
--pp_translate_string "You beat your best score!" "Du hast eine neue Bestzeit aufgestellt"
--pp_translate_string "Congratulations! You won the event!" "Gratulation! Du hast die Veranstaltung gewonnen"
-+pp_translate_string "You beat your best score!" "Du hast deine Bestleistung überboten!"
-+pp_translate_string "Congratulations! You won the event!" "Gratulation! Du hast die Veranstaltung gewonnen!"
- pp_translate_string "Congratulations! You won the cup!" "Gratulation! Du hast den Wettbewerb gewonnen"
--pp_translate_string "You advanced to the next race!" "Du hast dich für das nächste Rennen qualifiziert"
--pp_translate_string "You didn't advance." "Du hast es leider nicht geschafft"
-+pp_translate_string "You advanced to the next race!" "Du hast dich für das nächste Rennen qualifiziert!"
-+pp_translate_string "You didn't advance." "Du hast es leider nicht geschafft."
- 
- #HUD
- #Strings are prefixed to prevent collisions with the UI
diff -u extremetuxracer-0.4/debian/patches/series extremetuxracer-0.4/debian/patches/series
--- extremetuxracer-0.4/debian/patches/series
+++ extremetuxracer-0.4/debian/patches/series
@@ -4 +3,0 @@
-fix_cups_cheat.diff
reverted:
--- extremetuxracer-0.4/debian/patches/30_G++4.1-fix.diff
+++ extremetuxracer-0.4.orig/debian/patches/30_G++4.1-fix.diff
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## G++4.1-fix.dpatch by  Martin Michlmayr <[email protected]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This fixes a FTBFS with g++ 4.1
-
-...@dpatch@
-diff -urNad ppracer-0.3.1~/src/ppgltk/FT/FTTextureGlyph.h ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h
---- ppracer-0.3.1~/src/ppgltk/FT/FTTextureGlyph.h	2005-02-18 11:16:04.000000000 +0100
-+++ ppracer-0.3.1/src/ppgltk/FT/FTTextureGlyph.h	2006-03-30 02:11:04.000000000 +0200
-@@ -52,7 +52,7 @@
-          * Reset the currently active texture to zero to get into a known state before
-          * drawing a string. This is to get round possible threading issues.
-          */
--        static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
-+        static void ResetActiveTexture(){ activeTextureID = 0;}
-         
-     private:
-         /**
reverted:
--- extremetuxracer-0.4/debian/patches/fix_cups_cheat.diff
+++ extremetuxracer-0.4.orig/debian/patches/fix_cups_cheat.diff
@@ -1,14 +0,0 @@
-Index: ppracer-0.3.1/src/ppgltk/widget.cpp
-===================================================================
---- ppracer-0.3.1.orig/src/ppgltk/widget.cpp
-+++ ppracer-0.3.1/src/ppgltk/widget.cpp
-@@ -176,6 +176,9 @@
- void
- Widget::simulateMouseClick()
- {
-+	if ( !m_sensitive ) {
-+		return;
-+	}
- 	performClickAction();
- }
- 
diff -u extremetuxracer-0.4/debian/changelog extremetuxracer-0.4/debian/changelog
--- extremetuxracer-0.4/debian/changelog
+++ extremetuxracer-0.4/debian/changelog
@@ -1,3 +1,36 @@
+extremetuxracer (0.4-2) unstable; urgency=low
+
+  * debian/control:
+    - removed implicit build-deps on libglu1-xorg-dev and libsdl1.2-dev
+    - replaced "planetpenguin-racer" by "extremetuxracer" in the Description
+      fields
+    - uncommented extremetuxracer-gimp-dev
+  * debian/copyright:
+    - replaced "Upstream Author" by "Upstream Authors"
+    - added more complete list of authors
+    - changed the Copyright field to a License field, moved src/quadtree.cpp
+        license there and changed the GPLv2 text to the standard Debian text
+    - added a real Copyright field
+    - added a link to the complete GPLv2 text
+  * debian/patches/20_german_translation.diff and 30_G++4.1-fix.diff:
+    - removed, applied upstream
+  * debian/patches/fix_cups_cheat.diff:
+    - removed, fixed upstream
+  * debian/extremetuxracer.desktop:
+    - removed extension from Icon field to comply with desktop file policy
+  * debian/extremetuxracer.6[.de].sgml:
+    - replaced READMA by README and planetpenguin-racer by extremetuxracer
+  * debian/etracer[.de].6:
+    - removed, they are generated by debian/rules
+  * debian/planetpenguin-racer-dbg:
+    - removed
+  * debian/rules:
+    - fixed lintian warning "debhelper-script-needs-versioned-build-depends
+      dh_icons (>= 5.0.51~)"
+    - uncommented extremetuxracer-gimp-dev
+
+ -- Guillaume Martres <[email protected]>  Sun, 25 May 2008 22:56:48 +0200
+
 extremetuxracer (0.4-1) unstable; urgency=low
 
   * Initial release (Closes: #465660, #461911, #435288)
diff -u extremetuxracer-0.4/debian/extremetuxracer.desktop extremetuxracer-0.4/debian/extremetuxracer.desktop
--- extremetuxracer-0.4/debian/extremetuxracer.desktop
+++ extremetuxracer-0.4/debian/extremetuxracer.desktop
@@ -8,7 +8,7 @@
 Comment=Race a penguin down a mountain
 Comment[de]=Rutsche mit einem Pinguin einen Hügel hinab
 Comment[ro_RO]=Curse cu un pinguin pe munte, la vale
-Icon=etracericon.svg
+Icon=etracericon
 
 Exec=etracer
 Terminal=false
diff -u extremetuxracer-0.4/debian/extremetuxracer.6.sgml extremetuxracer-0.4/debian/extremetuxracer.6.sgml
--- extremetuxracer-0.4/debian/extremetuxracer.6.sgml
+++ extremetuxracer-0.4/debian/extremetuxracer.6.sgml
@@ -145,8 +145,8 @@
   <!--refsect1>
     <title>SEE ALSO</title>
 
-    <para>The programs are documented fully by <citetitle>READMA</citetitle> available via the
-      <file>/usr/share/doc/planetpenguin-racer/README</para>
+    <para>The programs are documented fully by <citetitle>README</citetitle> available via the
+      <file>/usr/share/doc/extremetuxracer/README</para>
   </refsect1-->
   <refsect1>
     <title>AUTHOR</title>
diff -u extremetuxracer-0.4/debian/control extremetuxracer-0.4/debian/control
--- extremetuxracer-0.4/debian/control
+++ extremetuxracer-0.4/debian/control
@@ -4,7 +4,7 @@
 Homepage: http://www.extremetuxracer.com/
 Maintainer: Debian Games Team <[email protected]>
 Uploaders: Alexander Schmehl <[email protected]>
-Build-Depends: debhelper (>= 5.0.0), tcl8.5-dev, libxmu-dev, libglu1-xorg-dev, libpng12-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libfreetype6-dev, docbook-to-man, sharutils, libgl1-mesa-dev, libxi-dev, quilt, pkg-config, autotools-dev
+Build-Depends: debhelper (>= 5.0.51~), tcl8.5-dev, libxmu-dev, libpng12-dev, libsdl-mixer1.2-dev, libfreetype6-dev, docbook-to-man, sharutils, libgl1-mesa-dev, libxi-dev, quilt, pkg-config, autotools-dev
 Standards-Version: 3.7.3
 
 Package: extremetuxracer
@@ -44,7 +44,7 @@
  You should have working 3D acceleration for your X or this game will run quite
  slow.
  .
- This package contains the debugging symbols for planetpenguin-racer.
+ This package contains the debugging symbols for extremetuxracer.
 Tag: game::arcade, interface::3d, uitoolkit::sdl, use::gameplaying, x11::application
 
 Package: extremetuxracer-data
@@ -61,19 +61,19 @@
  This package contains data like graphics and courses.  If you want to play the
- game, you need to install the package planetpenguin-racer.
+ game, you need to install the package extremetuxracer.
 Tag: game::arcade, interface::3d, role::content:data, special::auto-inst-parts, use::gameplaying, x11::application
 
-#Package: extremetuxracer-gimp-dev
-#Architecture: all
-#Depends: gimp
-#Recommends: extremetuxracer-racer
-#Description: plugins for GIMP for easy development of ppracer courses
-# The courses of Extreme Tux Racer, or etracer as it is called for
-# short, are quite easy to create.  They consist of three graphic files
-# and one textfile.
-# .
-# This package contains some scripts and colour palettes, which make it
-# easy to create the graphic files of etracer courses with the GIMP.
-# .
-# Details on how to create courses can be found at
-# http://www.extremetuxracer.com/wiki/index.php?title=Creating_Courses
+Package: extremetuxracer-gimp-dev
+Architecture: all
+Depends: gimp
+Recommends: extremetuxracer
+Description: plugins for GIMP for easy development of ppracer courses
+ The courses of Extreme Tux Racer, or etracer as it is called for
+ short, are quite easy to create.  They consist of three graphic files
+ and one textfile.
+ .
+ This package contains some scripts and colour palettes, which make it
+ easy to create the graphic files of etracer courses with the GIMP.
+ .
+ Details on how to create courses can be found at
+ http://www.extremetuxracer.com/wiki/index.php?title=Creating_Courses
 
diff -u extremetuxracer-0.4/debian/copyright extremetuxracer-0.4/debian/copyright
--- extremetuxracer-0.4/debian/copyright
+++ extremetuxracer-0.4/debian/copyright
@@ -7,40 +7,58 @@
-Upstream Author: Volker Stroebel, Jasmin F. Patry, Andreas Tarandi, Hamish
-  Morrison, Peter Reichel, Henry Maddocks, Daniel Poeira, Petr Pisar and
-  others, please  see the file AUTHORS for additional information.
+Upstream Authors:
 
+    The Extreme Tux Racer Team:
 
-src/quadtree.cpp is Copyright 1999-2000 by Thatcher Ulrich <[email protected]>.
+    Andreas Tarandi <[email protected]>
+    Steven Bell  <[email protected]>
+    Hamish Morrison <[email protected]>
 
-It's license follows:
-  This code may be freely modified and redistributed.  I make no
-  warrantees about it; use at your own risk.  If you do incorporate
-  this code into a project, I'd appreciate a mention in the credits.
 
+    The PlanetPenguin Racer Team:
+
+    Volker Ströbel <[email protected]>
+
+
+    The TuxRacer Team:
+
+    Patrick Gilhuly <[email protected]>
+    Eric Hall <[email protected]>
+    Rick Knowles <[email protected]>
+    Vincent Ma <[email protected]>
+    Jasmin Patry <[email protected]>
+    Mark Riddell <[email protected]>
+
+Copyright:
+    Copyright (C) 2007-2008 The Extreme Tux Racer Team
+    Copyright (C) 2004-2005 The PlanetPenguin Racer Team
+    Copyright (C) 1999-2002 The TuxRacer Team
+    src/quadtree.cpp:
+    Copyright (C) 1999-2000 Thatcher Ulrich <[email protected]>
 
 All other files are Copyright by their specific owners (see AUTHORS or the
 specific file) and published under the Terms of the GNU General Public Licence,
 Version 2 or (at your option) any later version.
 
-Copyright: GNU General Public Licence, Version 2
-
-   Extreme Tux Racer is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public License as
-   published by the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
-
-   ppracer 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 with
-   your Debian GNU/Linux system, in /usr/share/common-licenses/GPL, or with 
-   the Debian GNU/Linux bash source package as the file COPYING.  If not,
-   write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-   Boston, MA 02110-1301, USA.
-
+License: 
+    This package 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.
+
+    This package 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 package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+    src/quadtree.cpp license, by Thatcher Ulrich <[email protected]> :
+    This code may be freely modified and redistributed.  I make no
+    warrantees about it; use at your own risk.  If you do incorporate
+    this code into a project, I'd appreciate a mention in the credits.
 
 The Debian packaging is Copyright 2005-2008 by Alexander Schmehl
 <[email protected]> and published under the Terms of the GNU General
-Public Licence Version 2 or (at your option) any later version.
-
+Public Licence Version 2 or (at your option) any later version
+see '/usr/share/common-licenses/GPL-2'.
diff -u extremetuxracer-0.4/debian/rules extremetuxracer-0.4/debian/rules
--- extremetuxracer-0.4/debian/rules
+++ extremetuxracer-0.4/debian/rules
@@ -74,8 +74,8 @@
 	## extremetuxracer-gimp-dev
 	##
 	# the scripts and paletes for the gimp-dev package
-	#dh_install -pextremetuxracer-gimp-dev contrib/palettes/* /usr/share/gimp/2.0/palettes/
-	#dh_install -pextremetuxracer-gimp-dev contrib/script-fu/* /usr/share/gimp/2.0/scripts/
+	dh_install -pextremetuxracer-gimp-dev contrib/palettes/* /usr/share/gimp/2.0/palettes/
+	dh_install -pextremetuxracer-gimp-dev contrib/script-fu/* /usr/share/gimp/2.0/scripts/
 	##
 	## extremetuxracer-data
 	##
diff -u extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
--- extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
+++ extremetuxracer-0.4/debian/extremetuxracer.6.de.sgml
@@ -92,8 +92,8 @@
   <!--refsect1>
     <title>SEE ALSO</title>
 
-    <para>The programs are documented fully by <citetitle>READMA</citetitle> available via the
-      <file>/usr/share/doc/planetpenguin-racer/README</para>
+    <para>The programs are documented fully by <citetitle>README</citetitle> available via the
+      <file>/usr/share/doc/extremetuxracer/README</para>
   </refsect1-->
   <refsect1>
     <title>AUTHOR</title>
reverted:
--- extremetuxracer-0.4/etracer.6
+++ extremetuxracer-0.4.orig/etracer.6
@@ -1,50 +0,0 @@
-.TH "ETRACER" "6" 
-.SH "NAME" 
-etracer \(em 3D racing game featuring Tux, the Linux penguin 
-.SH "SYNOPSIS" 
-.PP 
-\fBetracer\fR 
-.SH "DESCRIPTION" 
-.PP 
-This manual page documents briefly the 
-\fBetracer\fR command. 
-.PP 
-This manual page was written for the \fBDebian\fP distribution 
-because the original program does not have a manual page. 
-.PP 
-\fBetracer\fR Extreme Tux Racer is a simple OpenGL 
-racing game featuring Tux, the Linux mascot. The goal of the game is to 
-slide down a snow- and ice-covered mountain as quickly as possible while 
-collecting fishes and avoiding the trees and rocks that will slow you 
-down. 
-.SH "OPTIONS" 
-.PP 
-\fBetracer\fR accepts the following options on the 
-command-line: 
-.IP "\fB-c\fP         " 10 
-Configuration file to be used. 
-.IP "\fB-f\fP         " 10 
-Select course to play. 
-.IP "\fB-m\fP         " 10 
-Max frames. 
-.IP "\fB-a\fP         " 10 
-Benchmark::setMode(Benchmark::AUTO) 
-.IP "\fB-p\fP         " 10 
-vector position 
-.IP "\fB-t\fP         " 10 
-Time step 
-.IP "\fB-rc\fP         " 10 
-race condition 
-.SH "AUTHOR" 
-.PP 
-This manual page was written by Alexander Schmehl [email protected] for 
-the \fBDebian\fP system (but may be used by others).  Permission is 
-granted to copy, distribute and/or modify this document under 
-the terms of the GNU General Public License, Version 2 any  
-later version published by the Free Software Foundation. 
- 
-.PP 
-On Debian systems, the complete text of the GNU General Public 
-License can be found in /usr/share/common-licenses/GPL-2. 
- 
-.\" created by instant / docbook-to-man, Thu 14 Feb 2008, 13:28 
reverted:
--- extremetuxracer-0.4/etracer.de.6
+++ extremetuxracer-0.4.orig/etracer.de.6
@@ -1,33 +0,0 @@
-.TH "ETRACER" "6" 
-.SH "NAME" 
-etracer \(em 3D Rennspiel mit Tux, dem Linux Pinguin 
-.SH "SYNOPSIS" 
-.PP 
-\fBetracer\fR 
-.SH "BESCHREIBUNG" 
-.PP 
-Diese manpage dokumentiert kurz das \fBetracer\fR. 
-.PP 
-Diese manpage wurde f�r die \fBDebian\fP-Distribution geschrieben, weil 
-das orginal Programm keine manpage hatte. 
-.PP 
-\fBetracer\fR     Extreme Tux Racer ist ein einfaches OpenGL Rennspiel mit Tux, dem Linux 
-Maskottchen.  Ziel ist es einen schnee- und eisbedeckten Berg so schnell 
-wie m�glich hinunterzu rutschen und dabei m�glichst viele Fische 
-auszusammeln.  Vermeiden sie B�ume und felsigen Untergrund, der sie 
-abbremsen wird. 
-.SH "OPTIONEN" 
-.PP 
-F�r dieses Kommando existieren keine Kommdozeilen-Parameter. 
- 
-.SH "AUTHOR" 
-.PP 
-Diese manpage wurde von Alexander Schmehl [email protected] f�r das \fBDebian\fP     System geschrieben (und darf von anderen benutzt werden).  Es ist ihnen 
-erlaubt, sie zu kopieren, weiterzugeben und/oder Modifikationen dieses 
-Dokumentes unter den Bedingungen der GNU General Public License, Version 
-2 oder jede sp�tere, ver�ffentlich durch die Free Software Foundation, vorzunehmen. 
- 
-.PP 
-Auf Debian-Systemen finden sie den kompletten text der GNU General Public License unter /usr/share/common-licenses/GPL-2 
- 
-.\" created by instant / docbook-to-man, Thu 14 Feb 2008, 13:28 

--- End Message ---
--- Begin Message ---
Hi,

Actually your patch is a bit to much extreme since it
drops the debian directory :).

I close the bug for now. Are you willing to join us in the Games Team
to maintain this package?

Cheers,

     Gonéri

Attachment: signature.asc
Description: Digital signature


--- End Message ---

Reply via email to