[extremetuxracer] 01/02: Imported Upstream version 0.7.2
Markus Koschany
apo at moszumanska.debian.org
Sun Apr 17 06:40:45 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository extremetuxracer.
commit 74729b3e11b5852a9a08599bb088003d2acd1b37
Author: Markus Koschany <apo at debian.org>
Date: Sun Apr 17 08:30:49 2016 +0200
Imported Upstream version 0.7.2
---
.pc/.quilt_patches | 1 -
.pc/.quilt_series | 1 -
.pc/.version | 1 -
.pc/applied-patches | 0
NEWS | 8 +
build/Installer/productInfo.wxi | 4 +-
configure | 20 +-
configure.ac | 2 +-
data/credits.lst | 2 +-
data/fonts/Makefile.am | 5 +-
data/fonts/Makefile.in | 5 +-
data/fonts/fonts.lst | 3 -
data/fonts/pc_outline.ttf | Bin 174856 -> 0 bytes
data/fonts/stditalic.ttf | Bin 107896 -> 0 bytes
debian/changelog | 248 -------------------
debian/compat | 1 -
debian/control | 58 -----
debian/copyright | 75 ------
debian/etr.xpm | 481 ------------------------------------
debian/extremetuxracer-data.install | 2 -
debian/extremetuxracer.install | 5 -
debian/extremetuxracer.menu | 7 -
debian/man/etr.6 | 15 --
debian/man/etr.de.6 | 16 --
debian/manpages | 1 -
debian/rules | 19 --
debian/source/format | 1 -
debian/watch | 3 -
src/racing.cpp | 35 ++-
src/racing.h | 2 +-
src/states.cpp | 13 +-
src/states.h | 2 +-
src/version.h | 4 +-
src/winsys.cpp | 5 +-
src/winsys.h | 3 -
35 files changed, 59 insertions(+), 989 deletions(-)
diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/.pc/applied-patches b/.pc/applied-patches
deleted file mode 100644
index e69de29..0000000
diff --git a/NEWS b/NEWS
index 6c9ffae..084abbc 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,13 @@
NEWS for Extreme Tux Racer
===============================================================================
+Version 0.7.2 14th of April, 2016
+-------------------------------------------------------------------------------
+
+- Fixed Joystick handling
+- Removed unused fonts
+
+
Version 0.7.1 5th of February, 2016
-------------------------------------------------------------------------------
Bugfix release
@@ -13,6 +20,7 @@ Bugfix release
- Do not try to save screenshots to read-only location but to user
home directory
+
Version 0.7 23th of January, 2016
-------------------------------------------------------------------------------
diff --git a/build/Installer/productInfo.wxi b/build/Installer/productInfo.wxi
index c6845b9..566b0a7 100644
--- a/build/Installer/productInfo.wxi
+++ b/build/Installer/productInfo.wxi
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
- <?define ProductName = "Extreme TuxRacer 0.7.1 ($(var.Platform))" ?>
+ <?define ProductName = "Extreme TuxRacer 0.7.2 ($(var.Platform))" ?>
<?define ProductNameShort = "Extreme TuxRacer" ?>
- <?define ProductVersion = "0.7.1.0" ?>
+ <?define ProductVersion = "0.7.2.0" ?>
<?define ProductManufacturer = "The ExtremeTuxRacer team" ?>
<?define ProductDescription = "High speed arctic racing game" ?>
diff --git a/configure b/configure
index f94172e..7223d01 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for etr 0.7.1.
+# Generated by GNU Autoconf 2.69 for etr 0.7.2.
#
# Report bugs to <https://sourceforge.net/projects/extremetuxracer>.
#
@@ -580,8 +580,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='etr'
PACKAGE_TARNAME='etr'
-PACKAGE_VERSION='0.7.1'
-PACKAGE_STRING='etr 0.7.1'
+PACKAGE_VERSION='0.7.2'
+PACKAGE_STRING='etr 0.7.2'
PACKAGE_BUGREPORT='https://sourceforge.net/projects/extremetuxracer'
PACKAGE_URL=''
@@ -1312,7 +1312,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures etr 0.7.1 to adapt to many kinds of systems.
+\`configure' configures etr 0.7.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1383,7 +1383,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of etr 0.7.1:";;
+ short | recursive ) echo "Configuration of etr 0.7.2:";;
esac
cat <<\_ACEOF
@@ -1493,7 +1493,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-etr configure 0.7.1
+etr configure 0.7.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1954,7 +1954,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by etr $as_me 0.7.1, which was
+It was created by etr $as_me 0.7.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2822,7 +2822,7 @@ fi
# Define the identity of the package.
PACKAGE='etr'
- VERSION='0.7.1'
+ VERSION='0.7.2'
cat >>confdefs.h <<_ACEOF
@@ -6054,7 +6054,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by etr $as_me 0.7.1, which was
+This file was extended by etr $as_me 0.7.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -6120,7 +6120,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-etr config.status 0.7.1
+etr config.status 0.7.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 8cb300e..06a31cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61])
-AC_INIT([etr], [0.7.1], [https://sourceforge.net/projects/extremetuxracer])
+AC_INIT([etr], [0.7.2], [https://sourceforge.net/projects/extremetuxracer])
AC_CONFIG_SRCDIR([src/gui.cpp])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([etr_config.h])
diff --git a/data/credits.lst b/data/credits.lst
index 52ef502..4127c1d 100644
--- a/data/credits.lst
+++ b/data/credits.lst
@@ -1,5 +1,5 @@
*[offs] 0 [text] Extreme Tux Racer [font] 0 [size] 7 [col] 1
-*[offs] 50 [text] Version 0.7.1 [font] 0 [size] 3 [col] 0
+*[offs] 50 [text] Version 0.7.2 [font] 0 [size] 3 [col] 0
*[offs] 40 [text] Some courses may have been modified from their [font] 0 [size] 2 [col] 0
*[offs] 20 [text] original versions to fit the requirements of the game. [font] 0 [size] 2 [col] 0
diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index c6fcf8a..7417ac3 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -4,10 +4,7 @@ pkgdatadir = $(datadir)/$(PACKAGE)/fonts
pkgdata_DATA = \
fonts.lst \
std.ttf \
- stditalic.ttf \
stdbold.ttf \
- outline.ttf \
- pc_20.ttf \
- pc_outline.ttf
+ pc_20.ttf
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/data/fonts/Makefile.in b/data/fonts/Makefile.in
index a6d65d3..1a41883 100644
--- a/data/fonts/Makefile.in
+++ b/data/fonts/Makefile.in
@@ -262,11 +262,8 @@ top_srcdir = @top_srcdir@
pkgdata_DATA = \
fonts.lst \
std.ttf \
- stditalic.ttf \
stdbold.ttf \
- outline.ttf \
- pc_20.ttf \
- pc_outline.ttf
+ pc_20.ttf
EXTRA_DIST = $(pkgdata_DATA)
all: all-am
diff --git a/data/fonts/fonts.lst b/data/fonts/fonts.lst
index 811f7f2..74750a9 100644
--- a/data/fonts/fonts.lst
+++ b/data/fonts/fonts.lst
@@ -1,8 +1,5 @@
# list of fonts
*[name] normal [file] std.ttf
-*[name] italic [file] stditalic.ttf
*[name] bold [file] stdbold.ttf
-*[name] outline [file] outline.ttf
*[name] pc20 [file] pc_20.ttf
-*[name] pcoutline [file] pc_outline.ttf
\ No newline at end of file
diff --git a/data/fonts/pc_outline.ttf b/data/fonts/pc_outline.ttf
deleted file mode 100644
index e4f014d..0000000
Binary files a/data/fonts/pc_outline.ttf and /dev/null differ
diff --git a/data/fonts/stditalic.ttf b/data/fonts/stditalic.ttf
deleted file mode 100644
index 2198824..0000000
Binary files a/data/fonts/stditalic.ttf and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index b225b65..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,248 +0,0 @@
-extremetuxracer (0.7.1-1) unstable; urgency=medium
-
- * Upload to unstable.
- * Imported Upstream version 0.7.1.
- * Drop all patches. Applied upstream.
- * Remove source/local-options.
- * Declare compliance with Debian Policy 3.9.7.
-
- -- Markus Koschany <apo at debian.org> Sun, 07 Feb 2016 14:31:52 +0100
-
-extremetuxracer (0.7.0-1) experimental; urgency=medium
-
- * Imported Upstream version 0.7.0.
- - Switch from SDL1 to SFML.
- - This release includes the tuxracer-extras courses.
- - Many GUI and performance improvements.
- * Mark extremetuxracer-data as Multi-Arch: foreign.
- * Add get-orig-source target.
- * Vcs: Switch to https.
- * debian/control:
- - Drop libfreetype6-dev from Build-Depends and add pkg-config.
- - Switch to libglu1-mesa-dev and libsfml-dev.
- * Refresh desktop.patch and rename it to desktop-file.patch.
- * Remove etr.svg in /usr/share/pixmaps because it is installed into
- the hicolor icon directory too.
- * Update debian/copyright for new release.
- * ADD CPPFLAGS.patch and add Debian's default compiler flags to the build.
-
- -- Markus Koschany <apo at debian.org> Sat, 23 Jan 2016 21:37:16 +0100
-
-extremetuxracer (0.4-9) unstable; urgency=medium
-
- * Mark extremetuxracer-data and extremetuxracer-gimp-dev as
- Multi-Arch: foreign. (Closes: #811039)
-
- -- Markus Koschany <apo at debian.org> Fri, 15 Jan 2016 18:34:26 +0100
-
-extremetuxracer (0.4-8) unstable; urgency=medium
-
- * Add libpng16-transition.patch.
- Fix FTBFS with libpng16. Thanks to Nobuhiro Iwamatsu for the report and
- patch. (Closes: #649557)
-
- -- Markus Koschany <apo at debian.org> Fri, 08 Jan 2016 18:42:49 +0100
-
-extremetuxracer (0.4-7) unstable; urgency=medium
-
- * Declare compliance with Debian Policy 3.9.6.
- * Vcs-Browser: Use cgit and https.
- * Update my e-mail address.
- * Drop debug package because automatic debug packages will be provided
- in the near future.
- * Remove quilt build-dependency because source format 3.0 uses quilt by
- default.
-
- -- Markus Koschany <apo at debian.org> Thu, 03 Dec 2015 16:44:14 +0100
-
-extremetuxracer (0.6.0-3) experimental; urgency=medium
-
- * Add Breaks and Replaces to extremetuxracer-data
- because the svg icon was moved to the data package. (Closes: #806537)
- * Drop the debug package because automatic debug packages will be provided in
- the near future. There is no reason to keep a separate package for this use
- case.
-
- -- Markus Koschany <apo at debian.org> Thu, 03 Dec 2015 16:25:36 +0100
-
-extremetuxracer (0.6.0-2) experimental; urgency=medium
-
- * Declare compliance with Debian Policy 3.9.6.
- * Update my e-mail address.
- * Vcs-Browser: Switch to cgit and use https.
- * Install svg icon to hicolor directory.
- Thanks to Ronny Standtke for the report. (Closes: #747975)
- * desktop.patch: Use svg icon.
-
- -- Markus Koschany <apo at debian.org> Sat, 21 Nov 2015 00:31:03 +0100
-
-extremetuxracer (0.6.0-1) experimental; urgency=low
-
- * New upstream release.
- - The binary of Extreme Tux Racer is now known as etr. Update man pages,
- icon names and paths accordingly.
- * Do not recommend extremetuxracer-extras anymore. Third party courses are
- not supported with this version.
- * Update debian/copyright to copyright format 1.0.
- * Convert sgml files to man pages.
- * Drop desktop file. It is shipped by upstream now.
- * Switch to dh-sequencer and simplify debian/rules.
- * Build with --parallel and autoreconf.
- * debian/control:
- - Drop extremetuxracer-gimp-dev binary package because upstream does not
- ship the corresponding files anymore. Please refer to the documentation in
- /usr/share/doc/extremetuxracer for more information how to create courses
- for etr.
- - Drop the following build-dependencies. They are obsolete.
- + libpng-dev, tcl8.5-dev, docbook-to-man, sharutils, quilt, pkg-config,
- autotools-dev, libxi-dev, libxmu-dev
- - Add dh-autoreconf and libsdl-image1.2-dev instead.
- * Drop all patches. They are either obsolete or merged upstream.
- * desktop.patch: Add keywords to the desktop file.
-
- -- Markus Koschany <apo at gambaru.de> Tue, 06 May 2014 21:33:10 +0200
-
-extremetuxracer (0.4-6) unstable; urgency=medium
-
- [ Alexander Reichle-Schmehl ]
- * Remove myself from Uploaders.
-
- [ Markus Koschany ]
- * Add myself to Uploaders.
- * Switch to source format 3.0 (quilt).
- * Remove README.source. Source format 3.0 (quilt) uses quilt by default.
- * Use compat level 9 and require debhelper >= 9.
- * Update watch file. Thanks to Bart Martens. (Closes: #738142)
- * Merge changelog entries from experimental into master branch.
- * wrap-and-sort -sab.
- * debian/control:
- - Switch Vcs to Git and change Vcs-fields accordingly.
- - Update Homepage field. (Closes: #706898)
- - Drop transitional packages for planetpenguin-racer and remove Replaces,
- Breaks and Provides fields. They are obsolete.
- - extremetuxracer-data: Change Recommends to Suggests extremetuxracer.
- * debian/rules:
- - Replace dh_clean -k with dh_prep.
- - Pass dpkg's CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS to build system.
- Support hardening.
- * desktop.file:
- - Update icon field and point to etracericon.svg.
- - Add keywords to desktop file.
- * Install etracericon.svg to /usr/share/icons/hicolor/scalable/apps.
- * Add start-in-window-mode.patch.
- * Add fix-d-niehoff_experience-courses.patch. Fix wrong paths in event.tcl
- of the d-niehoff_experience courses and prevent the game from crashing.
- - (Closes: #543618, #684582)
- - (LP: #229518, #609487, #909449)
- * Add Mayhem-report.patch. Fix segmentation fault when using the hidden -c
- option without valid parameters. (Closes: #715872)
- * Drop obsolete patches. They were not applied anyway.
- - 20_german_translation.diff
- - 30_G++4.1-fix.diff
- - fix_cups_cheat.diff
- * extremetuxracer-gimp-dev: delete last paragraph of package description.
- - The old homepage went offline and the documentation is no longer
- available.
- * Fix spelling and typos in German man page.
-
- [ Vincent Cheng ]
- * Import from Ubuntu:
- - Made build infrastructure multiarch-Tcl-aware, fixing FTBFS.
-
- -- Markus Koschany <apo at gambaru.de> Tue, 06 May 2014 21:20:42 +0200
-
-extremetuxracer (0.4-5) unstable; urgency=low
-
- * Replace Build-Depends on libpng12-dev with libpng-dev
- (Closes: #662318)
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org> Tue, 06 Mar 2012 00:12:31 +0100
-
-extremetuxracer (0.4-4) unstable; urgency=low
-
- [ Bertrand Marc ]
- * debian/control: -gimp-dev recommends extremetuxracer (Closes: #589819)
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org> Wed, 21 Jul 2010 14:33:51 +0200
-
-extremetuxracer (0.4-3) unstable; urgency=low
-
- [ Gonéri Le Bouder ]
- * Add planetpenguin-racer, a dummy package to help
- the extremetuxracer transition
-
- [ Alexander Reichle-Schmehl ]
- * Renenable gimp developer extensions
-
- [ Paul Wise ]
- * Capitalize "racer" in the Debian menu (Closes: #528996)
- * Correct the path to the README in the manual page (Closes: #529182)
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org> Tue, 20 Jul 2010 14:45:15 +0200
-
-extremetuxracer (0.5beta-2) experimental; urgency=low
-
- [ Paul Wise ]
- * Capitalize "racer" in the Debian menu (Closes: #528996)
- * Correct the path to the README in the manual page (Closes: #529182)
-
- [ Alexander Reichle-Schmehl ]
- * Add kfreebsd_glutesselator.diff to fix FTBFS on kfreebsd-* (Closes:
- #565805)
- Thanks to Felix Geyer for providing the patch
-
- -- Alexander Reichle-Schmehl <tolimar at debian.org> Tue, 20 Jul 2010 14:11:12 +0200
-
-extremetuxracer (0.5beta-1) experimental; urgency=low
-
- [ Gonéri Le Bouder ]
- * New upstream (beta) release
- - drop 10_norwegian_translation.diff, upstream switched to gettext
- - drop 40_fix_keyboard_config.diff, doesn't appy anymore, is that still
- needed?
- - refresh fix_segfault_in_race_select_menu.diff
- * Refresh debian/copyright
- * Add planetpenguin-racer, a dummy package to help
- the extremetuxracer transition
- * Clean etracer.6 etracer.de.6
-
- [ Paul Wise ]
- * Make extremetuxracer.desktop file valid according to desktop-file-validate
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sat, 11 Apr 2009 23:53:00 +0200
-
-extremetuxracer (0.4-2) unstable; urgency=low
-
- [ Alexander Schmehl ]
- * Improve package description as proposed by Christian Perrier
- * Fix copy paste errors in package descriptions refering to ppracer packages,
- thanks, Guillaume Martres (Closes: #500246)
-
- [ Eddy Petrișor ]
- * add missing Vcs-Svn headers
-
- [ Alexander Reichle-Schmehl ]
- * Adopt debian/control to my new name
-
- [ Gonéri Le Bouder ]
- * Add myself in uploaders:
- * Bump the versionned dep on debhelper, Guillaume Martres (Closes: #500255)
- * Do not apply fix_cups_cheat.diff, fix upstream, thanks Guillaume Martres
- (Closes: #500280)
- * Use the .xpm file for the icon since the .svg has some side effect,
- Mark Purcell (Closes: #488510)
- * Drop the dependency on the obsolete libglu1-xorg-dev
- * extremetuxracer replaces planetpenguin-racer and extremetuxracer-data
- replaces planetpenguin-racer-data and planetpenguin-racer-extras, thanks
- Sven Joachim (Closes: #517887)
- * Bump de standard version to 3.8.1
- * Apply Guillaume Martres patch against debian/copyright, again, thanks!
- (Closes: #500135)
-
- -- Gonéri Le Bouder <goneri at rulezlan.org> Sun, 15 Mar 2009 14:04:33 +0100
-
-extremetuxracer (0.4-1) unstable; urgency=low
-
- * Initial release (Closes: #465660, #461911, #435288)
-
- -- Alexander Schmehl <tolimar at debian.org> Wed, 13 Feb 2008 18:47:03 +0100
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index ec63514..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/control b/debian/control
deleted file mode 100644
index f38a2be..0000000
--- a/debian/control
+++ /dev/null
@@ -1,58 +0,0 @@
-Source: extremetuxracer
-Section: games
-Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders:
- Markus Koschany <apo at debian.org>,
- Gonéri Le Bouder <goneri at rulezlan.org>
-Build-Depends:
- debhelper (>= 9),
- dh-autoreconf,
- libglu1-mesa-dev,
- libsfml-dev,
- pkg-config
-Standards-Version: 3.9.7
-Homepage: http://sourceforge.net/projects/extremetuxracer/
-Vcs-Git: https://anonscm.debian.org/git/pkg-games/extremetuxracer.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/extremetuxracer.git
-
-Package: extremetuxracer
-Architecture: any
-Depends:
- extremetuxracer-data (>= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Description: 3D racing game featuring Tux, the Linux penguin
- Extreme Tux Racer, or etracer as it is called for short, 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, avoiding the
- trees and rocks that will slow you down.
- .
- Collect herrings and other goodies while sliding down the hill, but avoid fish
- bones.
- .
- This game is based on the GPL version of the famous game TuxRacer.
- .
- You must have working 3D acceleration or this game will run quite slowly.
-
-Package: extremetuxracer-data
-Architecture: all
-Multi-Arch: foreign
-Suggests:
- extremetuxracer
-Depends:
- ${misc:Depends}
-Breaks:
- extremetuxracer (<< 0.6.0-2)
-Replaces:
- extremetuxracer (<< 0.6.0-2)
-Description: data files for the game Extreme Tux Racer
- Extreme Tux Racer, or etracer as it is called for short, 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, avoiding the
- trees and rocks that will slow you down.
- .
- This game is based on the GPL version of famous game TuxRacer.
- .
- This package contains data like graphics and courses. If you want to play the
- game, you need to install the package extremetuxracer.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index d7b0796..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,75 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Extreme Tux Racer
-Source: http://sourceforge.net/projects/extremetuxracer/
-
-Files: *
-Copyright: 1999-2001, Jasmin F. Patry (Tuxracer)
- 2004-2005, Volker Stroebel (Planetpenguin Racer)
- 2010-2016, Extreme Tux Racer Team
-License: GPL-2+
-Comment:
- Please refer to the AUTHORS file and to the readme and *.lst files in the
- data source directory for a complete list of contributors for Extreme Tux
- Racer.
-
-Files: src/quadtree.*
-Copyright: 1999-2000, Ulrich Thatcher <tu at tulrich.com>
-License: quadtree-License
- 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.
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: Expat
- Copyright (C) 1994 X Consortium 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 X
- CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- TION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- .
- Except as contained in this notice, the name of the X Consortium shall not be
- used in advertising or otherwise to promote the sale, use or other deal- ings
- in this Software without prior written authorization from the X Consor- tium.
-
-Files: data/courses/extras/*
-Copyright: Milo Fungus <milofungus at lycos.com>
- S.ET
- garions
- FUdel <clt at exmail.de>
- Korora the Penguin <kororapenguin at yahoo.com>
- David Furodet <david.furodet at oreka.com>
- Siechfred
- Tom Kocourek <tko at atempest.net>
- Crazywater <Crazytofire at web.de>
- Monsterslayer
- BlankHare <softpaws at mageos.com>
- John Michael Mulesa <slipstream2001 at mac.com>
- J. W. Bruce <jwbruce at ieee.org>
-License: GPL-2+
-Comment:
- The extra courses were once part of Debian's tuxracer-extras package. They
- were converted by the Extreme Tux Racer team to ETR's new course format.
-
-Files: debian/*
-Copyright: 2008-2010, Alexander Reichle-Schmehl <tolimar at debian.org>
- 2009-2010, Gonéri Le Bouder <goneri at rulezlan.org>
- 2010, Paul Wise <pabs at debian.org>
- 2013-2016, Markus Koschany <apo at debian.org>
-License: GPL-2+
-
-License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License 2 can
- be found in '/usr/share/common-licenses/GPL-2'.
diff --git a/debian/etr.xpm b/debian/etr.xpm
deleted file mode 100644
index 0a79c0f..0000000
--- a/debian/etr.xpm
+++ /dev/null
@@ -1,481 +0,0 @@
-/* XPM */
-static char * etracericon_xpm[] = {
-"32 32 446 2",
-" c None",
-". c #D76F2B",
-"+ c #C8692A",
-"@ c #BA6026",
-"# c #B15A23",
-"$ c #AC561F",
-"% c #AA541C",
-"& c #AB5118",
-"* c #B35216",
-"= c #BF5512",
-"- c #CC5710",
-"; c #CA6A2B",
-"> c #BA662D",
-", c #BE672D",
-"' c #D06D2C",
-") c #DE7028",
-"! c #E47125",
-"~ c #E86F21",
-"{ c #E66C1E",
-"] c #E0681A",
-"^ c #D36017",
-"/ c #BE5513",
-"( c #A84B10",
-"_ c #AC4B0C",
-": c #C1510A",
-"< c #CD6824",
-"[ c #BB652D",
-"} c #C66B2D",
-"| c #EA792D",
-"1 c #FD802D",
-"2 c #FF812D",
-"3 c #FD7E2A",
-"4 c #FB7A27",
-"5 c #F97723",
-"6 c #F77420",
-"7 c #F7721C",
-"8 c #F67019",
-"9 c #F66E15",
-"0 c #F16A12",
-"a c #D55C0E",
-"b c #AE4B0B",
-"c c #AE4A08",
-"d c #CA5205",
-"e c #BC4B00",
-"f c #B44E0A",
-"g c #E6762B",
-"h c #FE812D",
-"i c #FF802C",
-"j c #FC7D29",
-"k c #FA7925",
-"l c #F87622",
-"m c #F7731E",
-"n c #F6711B",
-"o c #F66F17",
-"p c #F66D14",
-"q c #F66B11",
-"r c #F3670D",
-"s c #CF570A",
-"t c #A94506",
-"u c #C25004",
-"v c #B64800",
-"w c #B94A00",
-"x c #F46100",
-"y c #FF6E0E",
-"z c #FD7F2B",
-"A c #FB7B27",
-"B c #F97824",
-"C c #F87520",
-"D c #F6721D",
-"E c #F6701A",
-"F c #F66D16",
-"G c #F66C12",
-"H c #F76A0F",
-"I c #F8690C",
-"J c #E35F08",
-"K c #AD4805",
-"L c #BE4E01",
-"M c #BD4C00",
-"N c #FB6400",
-"O c #FF6600",
-"P c #FF7315",
-"Q c #FD7E29",
-"R c #FA7A26",
-"S c #F97622",
-"T c #F7741F",
-"U c #F66E18",
-"V c #F66D15",
-"W c #F7690E",
-"X c #F9680A",
-"Y c #EC6207",
-"Z c #B04703",
-"` c #C85000",
-" . c #C75000",
-".. c #B34800",
-"+. c #F86400",
-"@. c #FF7A21",
-"#. c #FE7F2B",
-"$. c #FC7C28",
-"%. c #F97924",
-"&. c #F87621",
-"*. c #F6711A",
-"=. c #F66E17",
-"-. c #F66C13",
-";. c #F66B10",
-">. c #F96709",
-",. c #E65F05",
-"'. c #AB4502",
-"). c #D25400",
-"!. c #AC4500",
-"~. c #EF5F00",
-"{. c #FF6804",
-"]. c #FF7F29",
-"^. c #F7751F",
-"/. c #F6721C",
-"(. c #F66F19",
-"_. c #F8690B",
-":. c #FA6707",
-"<. c #D75804",
-"[. c #B54800",
-"}. c #C14D00",
-"|. c #CB5200",
-"1. c #FF6701",
-"2. c #FF6D0C",
-"3. c #FE802C",
-"4. c #F66C14",
-"5. c #F76B10",
-"6. c #F7690D",
-"7. c #B64902",
-"8. c #CE5200",
-"9. c #AB4400",
-"0. c #F56504",
-"a. c #FF771C",
-"b. c #BE5B21",
-"c. c #9B512A",
-"d. c #FA6C0E",
-"e. c #DD5C07",
-"f. c #B14801",
-"g. c #CA5100",
-"h. c #BD4D01",
-"i. c #FF6E0D",
-"j. c #FF6702",
-"k. c #DC5E0D",
-"l. c #8F4B29",
-"m. c #5C403C",
-"n. c #433A45",
-"o. c #3C3948",
-"p. c #433F4D",
-"q. c #5C484A",
-"r. c #8B5841",
-"s. c #C26C37",
-"t. c #FC802D",
-"u. c #DA671F",
-"v. c #614641",
-"w. c #142F56",
-"x. c #F96B0F",
-"y. c #F66B12",
-"z. c #AB4603",
-"A. c #D55700",
-"B. c #B84900",
-"C. c #D85905",
-"D. c #FF6F0F",
-"E. c #F06305",
-"F. c #674238",
-"G. c #163055",
-"H. c #343D55",
-"I. c #575E73",
-"J. c #687C99",
-"K. c #6A86A8",
-"L. c #667D9C",
-"M. c #546480",
-"N. c #394762",
-"O. c #183156",
-"P. c #293753",
-"Q. c #7C5243",
-"R. c #DF722E",
-"S. c #D96C28",
-"T. c #6C4941",
-"U. c #193156",
-"V. c #2A4469",
-"W. c #515A72",
-"X. c #2A344F",
-"Y. c #F86A0E",
-"Z. c #F9721A",
-"`. c #BF5006",
-" + c #C55002",
-".+ c #AA4400",
-"++ c #EE680F",
-"@+ c #D75D0F",
-"#+ c #32364B",
-"$+ c #323A53",
-"%+ c #6D85A7",
-"&+ c #91B1D5",
-"*+ c #A1BDDB",
-"=+ c #A2BDDC",
-"-+ c #9CB9D9",
-";+ c #87A9CD",
-">+ c #5D789C",
-",+ c #2F415E",
-"'+ c #183056",
-")+ c #203354",
-"!+ c #173057",
-"~+ c #2A4368",
-"{+ c #6587AE",
-"]+ c #99B6D7",
-"^+ c #655E6B",
-"/+ c #534043",
-"(+ c #F8731D",
-"_+ c #D45D0E",
-":+ c #B54A04",
-"<+ c #FB731A",
-"[+ c #E56009",
-"}+ c #2E354D",
-"|+ c #4B4A59",
-"1+ c #7EA1C8",
-"2+ c #94B3D4",
-"3+ c #94B2D3",
-"4+ c #93B2D3",
-"5+ c #92B1D3",
-"6+ c #91B0D3",
-"7+ c #91B0D2",
-"8+ c #89A9CE",
-"9+ c #6384AA",
-"0+ c #395378",
-"a+ c #5E81AA",
-"b+ c #88AACF",
-"c+ c #8EAED1",
-"d+ c #8CACD0",
-"e+ c #474455",
-"f+ c #7C4B38",
-"g+ c #E06516",
-"h+ c #AA4506",
-"i+ c #CE5100",
-"j+ c #AB4500",
-"k+ c #FF7C24",
-"l+ c #FE6D0C",
-"m+ c #4F3D40",
-"n+ c #454251",
-"o+ c #769CC3",
-"p+ c #7FA3C8",
-"q+ c #7FA2C8",
-"r+ c #7EA2C7",
-"s+ c #7DA1C7",
-"t+ c #7CA1C7",
-"u+ c #7CA0C6",
-"v+ c #7BA0C6",
-"w+ c #7A9FC6",
-"x+ c #799EC5",
-"y+ c #789EC5",
-"z+ c #749BC3",
-"A+ c #353C52",
-"B+ c #8A4F35",
-"C+ c #F77623",
-"D+ c #E56C1F",
-"E+ c #A84708",
-"F+ c #CC5100",
-"G+ c #AD4500",
-"H+ c #FF7F2A",
-"I+ c #BE5C21",
-"J+ c #66748C",
-"K+ c #678FB9",
-"L+ c #668FB9",
-"M+ c #668EB8",
-"N+ c #658EB8",
-"O+ c #504B59",
-"P+ c #574243",
-"Q+ c #F67826",
-"R+ c #E46F25",
-"S+ c #A7470A",
-"T+ c #F86E15",
-"U+ c #3F3946",
-"V+ c #46404C",
-"W+ c #6487AD",
-"X+ c #628AB3",
-"Y+ c #626D83",
-"Z+ c #183055",
-"`+ c #E3681B",
-" @ c #F67E30",
-".@ c #E06E25",
-"+@ c #A8490C",
-"@@ c #F17625",
-"#@ c #FF761B",
-"$@ c #DF5E0C",
-"%@ c #443F4D",
-"&@ c #607EA0",
-"*@ c #6086AE",
-"=@ c #5A7FA7",
-"-@ c #44526E",
-";@ c #273B5C",
-">@ c #354D70",
-",@ c #476991",
-"'@ c #5D82AA",
-")@ c #5F85AD",
-"!@ c #273652",
-"~@ c #9E5630",
-"{@ c #F6833A",
-"]@ c #D56722",
-"^@ c #B04D0E",
-"/@ c #B24800",
-"(@ c #DE6515",
-"_@ c #E05E0B",
-":@ c #3D3947",
-"<@ c #293450",
-"[@ c #5C5E6E",
-"}@ c #5B80A8",
-"|@ c #5D82A9",
-"1@ c #53779D",
-"2@ c #465570",
-"3@ c #203456",
-"4@ c #353A50",
-"5@ c #995D3E",
-"6@ c #644B48",
-"7@ c #1F3355",
-"8@ c #193157",
-"9@ c #354765",
-"0@ c #1F3354",
-"a@ c #724A3E",
-"b@ c #F68D4B",
-"c@ c #C45C19",
-"d@ c #BC5410",
-"e@ c #C54E00",
-"f@ c #C45206",
-"g@ c #FF8C40",
-"h@ c #FF6905",
-"i@ c #F76403",
-"j@ c #85492D",
-"k@ c #1E3152",
-"l@ c #273551",
-"m@ c #4D4A58",
-"n@ c #575B6D",
-"o@ c #57667E",
-"p@ c #55647D",
-"q@ c #4F5A70",
-"r@ c #494D60",
-"s@ c #2E3A54",
-"t@ c #3D3E4F",
-"u@ c #A0603E",
-"v@ c #F97F2E",
-"w@ c #F77C2B",
-"x@ c #B86535",
-"y@ c #764E40",
-"z@ c #4D4048",
-"A@ c #B86639",
-"B@ c #F49051",
-"C@ c #AE5015",
-"D@ c #CB5B11",
-"E@ c #D35500",
-"F@ c #AD4600",
-"G@ c #FB883A",
-"H@ c #FF771D",
-"I@ c #F16305",
-"J@ c #A25122",
-"K@ c #443A44",
-"L@ c #33374B",
-"M@ c #35364A",
-"N@ c #4D3D41",
-"O@ c #6B4436",
-"P@ c #974E26",
-"Q@ c #DA5D0D",
-"R@ c #F78C47",
-"S@ c #E27B39",
-"T@ c #AB5117",
-"U@ c #D65F0F",
-"V@ c #FF8F45",
-"W@ c #FF7C25",
-"X@ c #F98032",
-"Y@ c #F89C61",
-"Z@ c #C05E20",
-"`@ c #C45A19",
-" # c #D55600",
-".# c #AF4600",
-"+# c #F7873C",
-"@# c #FF8533",
-"## c #FF7D27",
-"$# c #FA9D60",
-"%# c #E47F3F",
-"&# c #B1571F",
-"*# c #BF4D00",
-"=# c #C05004",
-"-# c #FD9753",
-";# c #FF7E28",
-"># c #FF822E",
-",# c #FE9E5E",
-"'# c #F49A60",
-")# c #B75F25",
-"!# c #CC631D",
-"~# c #B34700",
-"{# c #CD590D",
-"]# c #FF9E5D",
-"^# c #FF8331",
-"/# c #FFA163",
-"(# c #FCA972",
-"_# c #C3682C",
-":# c #C36426",
-"<# c #C9580D",
-"[# c #FD9E5E",
-"}# c #FF8E43",
-"|# c #FF6C0A",
-"1# c #FF7113",
-"2# c #FF9E5E",
-"3# c #F7A36B",
-"4# c #C76C30",
-"5# c #C26729",
-"6# c #B24700",
-"7# c #BD4F05",
-"8# c #F39251",
-"9# c #FFA365",
-"0# c #FF8635",
-"a# c #FF6B08",
-"b# c #FF7010",
-"c# c #FF8F44",
-"d# c #FFA569",
-"e# c #E9813C",
-"f# c #B34903",
-"g# c #C05B17",
-"h# c #B94900",
-"i# c #AC4400",
-"j# c #CF6016",
-"k# c #F89C60",
-"l# c #FFA86E",
-"m# c #FF9854",
-"n# c #FF8838",
-"o# c #FF7B23",
-"p# c #FF822F",
-"q# c #FF8B3D",
-"r# c #FFA96F",
-"s# c #F18E4E",
-"t# c #C3540A",
-"u# c #C24D00",
-"v# c #B44700",
-"w# c #C35309",
-"x# c #DD7129",
-"y# c #F19050",
-"z# c #FDA468",
-"A# c #FFAB73",
-"B# c #FFAA72",
-"C# c #FB9F63",
-"D# c #EE8A48",
-"E# c #D76920",
-"F# c #BC4F05",
-"G# c #BB4B00",
-"H# c #D05300",
-"I# c #C54F00",
-"J# c #B14800",
-"K# c #B74900",
-"L# c #CC5300",
-"M# c #CC5400",
-" ",
-" . + @ # $ % & * = - ",
-" ; > , ' ) ! ~ { ] ^ / ( _ : ",
-" < [ } | 1 2 3 4 5 6 7 8 9 0 a b c d ",
-" e f g h 2 2 2 i j k l m n o p q r s t u ",
-" v w x y i 2 2 2 2 z A B C D E F G H I J K L ",
-" e M N O O P 2 2 2 2 2 Q R S T n U V q W X Y Z ` ",
-" ...+.O O O O @.2 2 2 2 #.$.%.&.m *.=.-.;.I >.,.'.). ",
-" !.~.O O O O O {.].2 2 2 2 3 4 5 ^./.(.V G W _.:.<.[. ",
-" }.|.1.O O O O O O 2.2 2 2 2 3.$.k l m n =.4.5.6.>.:.7.8. ",
-" 9.0.{.O O O O O O O a.2 2 2 2 z A B C D 8 F G b.c.d.e.f. ",
-" g.h.i.j.O O O k.l.m.n.o.p.q.r.s.t.j R l T n u.v.w.w.x.y.z.A. ",
-" B.C.D.O O E.F.G.H.I.J.K.L.M.N.O.P.Q.R.%.S.T.U.V.W.X.Y.Z.`. + ",
-" .+++i.O @+#+$+%+&+*+=+=+=+=+-+;+>+,+'+)+!+~+{+]+^+/+W (+_+:+ ",
-" .+<+i.[+}+|+1+2+3+3+4+5+5+5+6+7+7+8+9+0+a+b+c+d+e+f+5.6 g+h+ ",
-"i+j+k+l+m+n+o+p+q+q+r+s+s+s+t+u+u+v+w+w+x+x+x+y+z+A+B+G C+D+E+ ",
-"F+G+H+I+w.J+K+K+K+L+L+M+L+M+M+M+N+N+N+N+N+N+N+N+N+O+P+p Q+R+S+ ",
-" .+z T+U+V+W+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+X+Y+Z+`+ @. at +@ ",
-" .+@@#@$@}+%@&@*@*@*@*@*@*@*@*@*@*@*@=@-@;@>@,@'@)@!@~@{@]@^@ ",
-" /@(@i O _@:@<@[@}@|@|@|@|@|@|@|@1 at 2@3 at 4@5 at 6@7 at 8@9 at 0@a at b@c at d@ ",
-" e at f@g at h@O i at j@k at l@m at n@o at p@q at r@s at w.t@u at v@2 2 w at x@y at z@A at B@C at D@ ",
-" E at F@G at H@O O O I at J@F.K at L@M at N@O at P@Q at H@2 2 2 2 i j k l R at S@T@ ",
-" w U at V@{.O O O O O O O O O O O O j.W at 2 2 2 2 z A X at Y@Z@`@ ",
-" #.#+#@#O O O O O O O O O O O O O h@##2 2 2 2 1 $#%#&# ",
-" *#=#-#;#O O O O O O O O O O O O O h at W@2 2 >#,#'#)#!# ",
-" ~#{#]#>#O O O O O O O O O O O O O 1.a.^#/#(#_#:# ",
-" G+<#[#}#|#O O O O O O O O O O O O 1#2#3#4#5# ",
-" 6#7#8#9#0#a#O O O O O O O O b#c#d#e#f#g# ",
-" h#i#j#k#l#m#n#i @.o#p#q#]#r#s#t#.+u# ",
-" |.v#G+w#x#y#z#A#B#C#D#E#F#.+G# ",
-" H#I#J#.+.+!.9..+.+K#` ",
-" L#M# "};
diff --git a/debian/extremetuxracer-data.install b/debian/extremetuxracer-data.install
deleted file mode 100644
index a619e17..0000000
--- a/debian/extremetuxracer-data.install
+++ /dev/null
@@ -1,2 +0,0 @@
-resources/etr.svg usr/share/icons/hicolor/scalable/apps
-usr/share/games
diff --git a/debian/extremetuxracer.install b/debian/extremetuxracer.install
deleted file mode 100644
index 42add88..0000000
--- a/debian/extremetuxracer.install
+++ /dev/null
@@ -1,5 +0,0 @@
-debian/etr.xpm usr/share/pixmaps
-usr/games
-usr/share/applications
-usr/share/doc/etr/* usr/share/doc/extremetuxracer
-usr/share/pixmaps
diff --git a/debian/extremetuxracer.menu b/debian/extremetuxracer.menu
deleted file mode 100644
index 667e396..0000000
--- a/debian/extremetuxracer.menu
+++ /dev/null
@@ -1,7 +0,0 @@
-?package(extremetuxracer): \
- needs="X11" \
- section="Games/Action" \
- title="Extreme Tux Racer" \
- longtitle="Extreme Tux Racer - 3D racing game featuring Tux, the Linux penguin" \
- command="/usr/games/etr" \
- icon="/usr/share/pixmaps/etr.xpm"
diff --git a/debian/man/etr.6 b/debian/man/etr.6
deleted file mode 100644
index ff434d0..0000000
--- a/debian/man/etr.6
+++ /dev/null
@@ -1,15 +0,0 @@
-.TH "ETR" "6"
-.SH "NAME"
-extremetuxracer \- 3D racing game featuring Tux, the Linux penguin
-.SH "SYNOPSIS"
-.PP
-\fBetr\fR
-.SH "DESCRIPTION"
-.PP
-\fBetr\fR alias 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"
-This game has no further command-line options.
diff --git a/debian/man/etr.de.6 b/debian/man/etr.de.6
deleted file mode 100644
index b560cc9..0000000
--- a/debian/man/etr.de.6
+++ /dev/null
@@ -1,16 +0,0 @@
-.TH "ETR" "6"
-.SH "NAME"
-extremetuxracer \- 3D-Rennspiel mit Tux, dem Linux-Pinguin
-.SH "SYNOPSIS"
-.PP
-\fBetr\fR
-.SH "BESCHREIBUNG"
-.PP
-\fBetr\fR alias 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 hinunterzurutschen und dabei möglichst viele Fische
-einzusammeln. Vermeiden Sie Bäume und felsigen Untergrund, der Sie
-abbremsen wird.
-.SH "OPTIONEN"
-.PP
-Für dieses Spiel existieren keine Kommandozeilenparameter.
diff --git a/debian/manpages b/debian/manpages
deleted file mode 100644
index fdb03d9..0000000
--- a/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/*.6
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index df113c8..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/make -f
-#export DH_VERBOSE=1
-
-%:
- dh $@ --parallel --with autoreconf
-
-override_dh_auto_configure:
- dh_auto_configure -- \
- --prefix=/usr \
- --bindir=\$${prefix}/games \
- --datadir=\$${prefix}/share/games
-
-override_dh_install:
- dh_install
- $(RM) $(CURDIR)/debian/extremetuxracer/usr/share/pixmaps/etr.svg
-
-get-orig-source:
- uscan --download-current-version --force-download
-
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8..0000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index b7f2cdc..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts=uversionmangle=s/(\d)(beta\d*)$/$1~$2/ \
-http://qa.debian.org/watch/sf.php/extremetuxracer/etr[_\-](\d\S*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
diff --git a/src/racing.cpp b/src/racing.cpp
index f1352e0..a74fa16 100644
--- a/src/racing.cpp
+++ b/src/racing.cpp
@@ -159,11 +159,20 @@ void CRacing::Jaxis(int axis, float value) {
}
}
-void CRacing::Jbutt(int button, int state) {
- if (button == 0) {
- key_charging = state != 0;
- } else if (button == 1) {
-// key_charging = (bool) state;
+void CRacing::Jbutt(int button, bool pressed) {
+ switch (button) {
+ case 0:
+ key_paddling = pressed;
+ break;
+ case 1:
+ trick_modifier = pressed;
+ break;
+ case 2:
+ key_braking = pressed;
+ break;
+ case 3:
+ key_charging = pressed;
+ break;
}
}
@@ -250,12 +259,18 @@ void CRacing::Enter() {
static void PlayTerrainSound(CControl *ctrl, bool airborne) {
if (airborne == false) {
int terridx = Course.GetTerrainIdx(ctrl->cpos.x, ctrl->cpos.z, 0.5);
- if (terridx >= 0) {
+ if (terridx >= 0)
newsound = (int)Course.TerrList[terridx].sound;
- } else newsound = -1;
- } else newsound = -1;
- if ((newsound != lastsound) && (lastsound >= 0)) Sound.Halt(lastsound);
- if (newsound >= 0) Sound.Play(newsound, -1);
+ else
+ newsound = -1;
+ } else {
+ newsound = -1;
+ }
+
+ if ((newsound != lastsound) && (lastsound >= 0))
+ Sound.Halt(lastsound);
+ if (newsound >= 0)
+ Sound.Play(newsound, -1);
lastsound = newsound;
}
diff --git a/src/racing.h b/src/racing.h
index 7f3bc82..9f8a0b9 100644
--- a/src/racing.h
+++ b/src/racing.h
@@ -26,7 +26,7 @@ class CRacing : public State {
void Loop(float time_step);
void Keyb(sf::Keyboard::Key key, bool release, int x, int y);
void Jaxis(int axis, float value);
- void Jbutt(int button, int state);
+ void Jbutt(int button, bool pressed);
void Exit();
public:
};
diff --git a/src/states.cpp b/src/states.cpp
index 0bf2fbe..7e91372 100644
--- a/src/states.cpp
+++ b/src/states.cpp
@@ -86,17 +86,14 @@ void State::Manager::PollEvent() {
break;
}
- case sf::Event::JoystickMoved:
- if (Winsys.joystick_isActive()) {
- float val = event.joystickMove.position / 32768.f;
- current->Jaxis(event.joystickMove.axis == sf::Joystick::X ? 0 : 1, val);
- }
+ case sf::Event::JoystickMoved: {
+ float val = event.joystickMove.position / 100.f;
+ current->Jaxis(event.joystickMove.axis == sf::Joystick::X ? 0 : 1, val);
break;
+ }
case sf::Event::JoystickButtonPressed:
case sf::Event::JoystickButtonReleased:
- if (Winsys.joystick_isActive()) {
- current->Jbutt(event.joystickButton.button, event.type == sf::Event::JoystickButtonPressed);
- }
+ current->Jbutt(event.joystickButton.button, event.type == sf::Event::JoystickButtonPressed);
break;
case sf::Event::Resized:
diff --git a/src/states.h b/src/states.h
index c492a19..5f7608b 100644
--- a/src/states.h
+++ b/src/states.h
@@ -61,7 +61,7 @@ public:
virtual void Mouse(int button, int state, int x, int y) {}
virtual void Motion(int x, int y) {}
virtual void Jaxis(int axis, float value) {}
- virtual void Jbutt(int button, int state) {}
+ virtual void Jbutt(int button, bool pressed) {}
virtual void TextEntered(char text) {}
virtual void Exit() {}
};
diff --git a/src/version.h b/src/version.h
index 3df0867..1827f25 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,2 +1,2 @@
-#define ETR_VERSION_STRING "0.7.1"
-#define ETR_VERSION 0,7,1,0
+#define ETR_VERSION_STRING "0.7.2"
+#define ETR_VERSION 0,7,2,0
diff --git a/src/winsys.cpp b/src/winsys.cpp
index 6a6d8c1..81b9a01 100644
--- a/src/winsys.cpp
+++ b/src/winsys.cpp
@@ -28,8 +28,6 @@ GNU General Public License for more details.
#include "ogl.h"
#include <iostream>
-#define USE_JOYSTICK true
-
TVector2i cursor_pos(0, 0);
CWinsys Winsys;
@@ -37,13 +35,12 @@ CWinsys Winsys;
CWinsys::CWinsys()
: sfmlRenders(false)
, auto_resolution(800, 600) {
- for (unsigned int i = 0; i < 8; i++) {
+ for (unsigned int i = 0; i < sf::Joystick::Count; i++) {
if (sf::Joystick::isConnected(i))
numJoysticks++;
else
break;
}
- joystick_active = false;
sf::VideoMode desktopMode = sf::VideoMode::getDesktopMode();
resolutions[0] = TScreenRes(desktopMode.width, desktopMode.height);
diff --git a/src/winsys.h b/src/winsys.h
index 779df88..93bd420 100644
--- a/src/winsys.h
+++ b/src/winsys.h
@@ -33,7 +33,6 @@ struct TScreenRes {
class CWinsys {
private:
unsigned int numJoysticks;
- bool joystick_active;
// sfml window
bool sfmlRenders;
@@ -47,7 +46,6 @@ public:
CWinsys();
- // sdl window
const TScreenRes& GetResolution(size_t idx) const;
string GetResName(size_t idx) const;
void Init();
@@ -60,7 +58,6 @@ public:
void SwapBuffers() { window.display(); }
void Quit();
void Terminate();
- bool joystick_isActive() const { return joystick_active; }
void draw(const sf::Drawable& drawable, const sf::RenderStates& states = sf::RenderStates::Default) { window.draw(drawable, states); }
void clear() { window.clear(colBackgr); }
void beginSFML() { if (!sfmlRenders) window.pushGLStates(); sfmlRenders = true; }
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/extremetuxracer.git
More information about the Pkg-games-commits
mailing list