summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--os/debian/README.Debian32
-rw-r--r--os/debian/changelog2
-rw-r--r--os/debian/compat2
-rwxr-xr-xos/debian/config21
-rw-r--r--os/debian/control10
-rw-r--r--os/debian/copyright68
-rw-r--r--os/debian/docs2
-rw-r--r--os/debian/menu2
-rw-r--r--os/debian/openttd-wrapper26
-rw-r--r--os/debian/po/POTFILES.in1
-rw-r--r--os/debian/po/ca.po40
-rw-r--r--os/debian/po/cs.po42
-rw-r--r--os/debian/po/de.po55
-rw-r--r--os/debian/po/eu.po42
-rw-r--r--os/debian/po/fi.po32
-rw-r--r--os/debian/po/fr.po42
-rw-r--r--os/debian/po/gl.po41
-rw-r--r--os/debian/po/nl.po43
-rw-r--r--os/debian/po/pt.po42
-rw-r--r--os/debian/po/pt_BR.po43
-rw-r--r--os/debian/po/ru.po45
-rw-r--r--os/debian/po/sv.po56
-rw-r--r--os/debian/po/ta.po43
-rw-r--r--os/debian/po/templates.pot39
-rw-r--r--os/debian/postinst8
-rwxr-xr-xos/debian/rules117
-rw-r--r--os/debian/templates16
27 files changed, 139 insertions, 773 deletions
diff --git a/os/debian/README.Debian b/os/debian/README.Debian
index fa0617586..10eee1f9e 100644
--- a/os/debian/README.Debian
+++ b/os/debian/README.Debian
@@ -1,15 +1,13 @@
-openttd for Debian
+OpenTTD for Debian
------------------
-To properly play this game, original data files are needed.
-You should copy the data files from the original TTD into the data directory
-(/usr/share/games/openttd/data). You should copy these files:
-* trg1r.grf
-* trgcr.grf
-* trghr.grf
-* trgir.grf
-* trgtr.grf
-* sample.cat
+To properly play this game, you need a base graphics and sound set.
+Currently, the graphics files from the original Transport Tycoon Deluxe
+game (Windows and DOS versions) are supported, as well as the free
+graphics replacement set "OpenGFX".
+
+See readme.txt, section 4.1 for instructions on how to install these
+files.
-Music
For in game music (optional), you should copy all files in the gm/
@@ -19,13 +17,15 @@ You should copy the data files from the original TTD into the data directory
Don't forget to use -m extmidi if you want music, and if you have
problems, remember that not all audio devices support multiple
- audiostreams (music and sound), so you might have to use software
- mixing. My VIA AC97 device cannot do hardware mixing, for example.
+ audiostreams (music and sound), so you might have to use alsa
+ software mixing or pulseaudio.
-Scenarios
There are no scenarios included in this release. Scenarios can be
- downloaded separately from the OpenTTD website and all over the
- internet. Place scenarios in your ~/.openttd/scenario directory to
- use them.
+ downloaded using openttd's content service, which is available from
+ openttd's main menu. If you have obtained a scenario through other
+ means, you can place it either in your ~/.openttd/scenario directory
+ or in the system-wide /usr/share/games/openttd/scenario directory.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl> Mon, 01 Feb 2010 10:42:11 +0100
- -- Matthijs Kooijman <matthijs@stdin.nl>, Tue, 25 Jan 2004 14:11:01 +0200
diff --git a/os/debian/changelog b/os/debian/changelog
index a213f0c47..1a1d2515f 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -3,7 +3,7 @@ openttd (1.1~svn-1) UNRELEASED; urgency=low
* Unreleased SVN version. Versioned to allow normal upgrades to released
versions.
- -- Matthijs Kooijman <matthijs@stdin.nl> Thu, 24 Dec 2009 01:02:03 +0100
+ -- Matthijs Kooijman <matthijs@stdin.nl> Thu, 18 Feb 2010 12:02:03 +0100
openttd (1.0.0~beta4) unstable; urgency=low
diff --git a/os/debian/compat b/os/debian/compat
index b8626c4cf..7f8f011eb 100644
--- a/os/debian/compat
+++ b/os/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/os/debian/config b/os/debian/config
deleted file mode 100755
index a4e1268f6..000000000
--- a/os/debian/config
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Source debconf library.
-. /usr/share/debconf/confmodule
-
-FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat"
-DATADIR=/usr/share/games/openttd/data
-
-MISSING="No"
-for FILE in $FILES; do
- # Check if all the files needed are here.
- if [ ! -e $DATADIR/$FILE ]; then
- MISSING="Yes"
- break
- fi;
-done
-
-if [ $MISSING = "Yes" ]; then
- db_input high openttd/datafiles || true
- db_go
-fi
diff --git a/os/debian/control b/os/debian/control
index 37a242e49..6c5969f7d 100644
--- a/os/debian/control
+++ b/os/debian/control
@@ -3,15 +3,17 @@ Section: contrib/games
Priority: optional
Maintainer: Matthijs Kooijman <matthijs@stdin.nl>
Uploaders: Jordi Mallach <jordi@debian.org>
-Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev
-Standards-Version: 3.7.3
-Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/openttd/trunk/
-Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/openttd/trunk
+Build-Depends: debhelper (>= 7.0.50), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev, liblzo2-dev, libicu-dev
+Standards-Version: 3.8.4
+Vcs-Browser: http://git.debian.org/?p=collab-maint/openttd.git
+Vcs-Git: git://git.debian.org/collab-maint/openttd.git
Homepage: http://www.openttd.org/
Package: openttd
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: openttd-data
+Conflicts: openttd-data
Suggests: timidity, freepats
Description: reimplementation of Transport Tycoon Deluxe with enhancements
OpenTTD is a reimplementation of the Microprose game "Transport
diff --git a/os/debian/copyright b/os/debian/copyright
index 7d9cd87bf..5c58d007a 100644
--- a/os/debian/copyright
+++ b/os/debian/copyright
@@ -1,25 +1,61 @@
-This package was debianized by Matthijs Kooijman <m.kooijman@student.utwente.nl>
+This package was debianized by Matthijs Kooijman <matthijs@stdin.nl>
on Wed, 15 Sep 2004 00:24:01 +0200.
-It was downloaded from http://sourceforge.net/projects/openttd
+This package is not part of the main Debian GNU/Linux distribution, but
+uploaded to the contrib section. This is because the openttd program is
+non-functional by itself, it needs (non-free) graphical and sound
+resources from the Transport Tycoon Deluxe game to work.
Upstream author: Ludvig Strigeus (ludde) and many others.
+Upstream homepage: http://www.openttd.org
-License:
+Copyright © 2004-2009 Ludvig Strigeous and others.
- 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.
+OpenTTD License:
- 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.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License version 2.0 as
+ published by the Free Software Foundation;
- 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
+ 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 GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+ 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
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+This package contains an embedded version of the "Squirrel" programming
+language, which is shipped under the following license:
+
+ Copyright (c) 2003-2009 Alberto Demichelis
+
+ 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.
diff --git a/os/debian/docs b/os/debian/docs
deleted file mode 100644
index e51360c63..000000000
--- a/os/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-readme.txt
-docs/multiplayer.txt
diff --git a/os/debian/menu b/os/debian/menu
index 3afa6e08e..58e23aaa0 100644
--- a/os/debian/menu
+++ b/os/debian/menu
@@ -1,2 +1,2 @@
?package(openttd):needs="X11" section="Games/Simulation" title="OpenTTD"\
-command="/usr/games/openttd" icon="/usr/share/pixmaps/openttd.32.xpm"
+command="/usr/share/games/openttd/openttd-wrapper" icon="/usr/share/pixmaps/openttd.32.xpm"
diff --git a/os/debian/openttd-wrapper b/os/debian/openttd-wrapper
new file mode 100644
index 000000000..3c35f7d36
--- /dev/null
+++ b/os/debian/openttd-wrapper
@@ -0,0 +1,26 @@
+#!/bin/sh
+# This is a wrapper script that checks openttd's exit status and
+# displays its stderr output
+
+# Get a file to capture stderr to
+TMPFILE=`mktemp --tmpdir openttd.errout.XXXXXXXXX`
+
+if [ ! -w "$TMPFILE" ]; then
+ xmessage "Could not create temporary file for error messages. Not starting OpenTTD."
+ exit 1;
+fi
+
+# Capture stderr
+openttd "$@" 2> "$TMPFILE"
+ERRCODE=$?
+if [ "$ERRCODE" -ne 0 ]; then
+ CODEMSG="OpenTTD returned with error code $ERRCODE."
+ if [ -s "$TMPFILE" ]; then
+ MESSAGE="$CODEMSG The following error messages were produced:\n\n"
+ printf "$MESSAGE" | cat - "$TMPFILE" | fold -s | xmessage -file -
+ else
+ xmessage "$CODEMSG No error messages were produced."
+ fi
+fi
+
+rm -f "$TMPFILE"
diff --git a/os/debian/po/POTFILES.in b/os/debian/po/POTFILES.in
deleted file mode 100644
index cef83a340..000000000
--- a/os/debian/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff --git a/os/debian/po/ca.po b/os/debian/po/ca.po
deleted file mode 100644
index d0fb63b5d..000000000
--- a/os/debian/po/ca.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# Catalan translation of openttd's Debconf templates.
-# Copyright © 2007 Software in the Public Interest, Inc.
-# This file is distributed under the same license as the openttd package.
-# Jordi Mallach <jordi@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.2-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-06-01 00:45+0200\n"
-"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
-"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Es necessiten els fitxers de dades"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Per a funcionar, OpenTTD necessita els fitxers de dades del joc "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr "Vegeu el fitxer /usr/share/doc/openttd/README.Debian per a obtenir-ne més detalls sobre els fitxers necessaris i la seua ubicació."
diff --git a/os/debian/po/cs.po b/os/debian/po/cs.po
deleted file mode 100644
index c87382e1a..000000000
--- a/os/debian/po/cs.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 10:52+0200\n"
-"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
-"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Vyžadovány datové soubory"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pro svůj běh vyžaduje OpenTTD datové soubory z původní hry Transport Tycoon "
-"Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Podrobnosti o vyžadovaných souborech a jejich umístění naleznete v souboru /"
-"usr/share/doc/openttd/README.Debian."
diff --git a/os/debian/po/de.po b/os/debian/po/de.po
deleted file mode 100644
index d7b54fba8..000000000
--- a/os/debian/po/de.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# Translation of openttd debconf templates to German
-# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2007.
-# This file is distributed under the same license as the openttd package.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 21:21+0200\n"
-"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
-"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Bentigte Datendateien"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Zum Betrieb bentigt OpenTTD Datendateien aus dem Originalspiel Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Lesen Sie die Datei /usr/share/doc/openttd/README.Debian fr weitere Details "
-"ber die bentigten Dateien und ihren Ort."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Sie mssen Daten-Dateien installieren"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD bentigt zur Ausfhrung Daten-Dateien aus dem Originalspiel "
-#~ "Transport Tycoon Deluxe. Sie sollten diese Daten-Dateien installieren, "
-#~ "bevor Sie das Spiel spielen knnen. Lesen Sie README.Debian fr weitere "
-#~ "Details darber, welche Dateien wohin kopiert werden mssen."
diff --git a/os/debian/po/eu.po b/os/debian/po/eu.po
deleted file mode 100644
index 1cabc9e41..000000000
--- a/os/debian/po/eu.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# OpenTTD debconf template basque translation
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Piarres eobide <pi@beobide.net>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenTTD Debconf\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:55+0200\n"
-"Last-Translator: Piarres eobide <pi@beobide.net>\n"
-"Language-Team: Euskara <Librezale@librezale.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datu fitxategiak behar dira"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Funtziona dezan, OpenTTD-ek jatorrizko 'Transport Tycoon Deluxe' jokoaren "
-"datu fitxategiak behar ditu."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"/usr/share/doc/openttd/README.Debian fitxategia begiratu beharrezko "
-"fitategien eta bere kokapenari buruz xehetasun gehiago ikusteko."
diff --git a/os/debian/po/fi.po b/os/debian/po/fi.po
deleted file mode 100644
index eede54a21..000000000
--- a/os/debian/po/fi.po
+++ /dev/null
@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd_0.5.3-1\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-19 04:33+0200\n"
-"PO-Revision-Date: 2007-12-18 20:01+0200\n"
-"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
-"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: Finland\n"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "Data files needed"
-msgstr "Datatiedostoja puuttuu"
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "For its operation, OpenTTD needs the data files from the original Transport Tycoon Deluxe game."
-msgstr "OpenTTD tarvitsee toimiakseen datatiedostoja alkuperäisestä Transport Tycoon Deluxe -pelistä."
-
-#. Type: error
-#. Description
-#: ../templates:1001
-msgid "See the /usr/share/doc/openttd/README.Debian file for more details about the needed files and their location."
-msgstr "Tiedostossa /usr/share/doc/openttd/README.Debian on (englanniksi) lisätietoja tarvittavista tiedostoista ja niiden sijainnista."
-
diff --git a/os/debian/po/fr.po b/os/debian/po/fr.po
deleted file mode 100644
index 04bc925df..000000000
--- a/os/debian/po/fr.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# debian-l10n-french translation of 0.5.1-1.
-# Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# Ivan Buresi <err747@free.fr>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:41+0200\n"
-"Last-Translator: Ivan Buresi <err747@free.fr>\n"
-"Language-Team: debian-l10n-french <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Fichiers de données indispensables"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Pour fonctionner correctement, OpenTTD a besoin des fichiers de données du "
-"jeu « Transport Tycoon Deluxe » original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veuillez lire le fichier /usr/share/doc/openttd/README.Debian pour plus "
-"d'informations sur les fichiers requis et leur emplacement."
diff --git a/os/debian/po/gl.po b/os/debian/po/gl.po
deleted file mode 100644
index 154204e30..000000000
--- a/os/debian/po/gl.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# Galician translation of openttd's debconf templates
-# This file is distributed under the same license as the openttd package.
-# Jacobo Tarrio <jtarrio@debian.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 13:12+0200\n"
-"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
-"Language-Team: Galician <proxecto@trasno.net>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Precísase de ficheiros de datos"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para o seu funcionamento, OpenTTD precisa dos ficheiros de datos do xogo "
-"Transport Tycoon Deluxe orixinal."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Consulte o ficheiro /usr/share/doc/openttd/README.Debian para máis "
-"información sobre os ficheiros necesarios e as súas ubicacións."
diff --git a/os/debian/po/nl.po b/os/debian/po/nl.po
deleted file mode 100644
index 7681410ba..000000000
--- a/os/debian/po/nl.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-16 19:25+0100\n"
-"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
-"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Databestanden zijn vereist"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Om te werken heeft OpenTTD de databestanden van het oorspronkelijkee "
-"'Transport Tycoon Deluxe'-spel nodig."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Meer informatie over de vereiste bestanden en hun locatie vindt u in /usr/"
-"share/doc/openttd/README.Debian . "
diff --git a/os/debian/po/pt.po b/os/debian/po/pt.po
deleted file mode 100644
index d40e189e7..000000000
--- a/os/debian/po/pt.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# Portuguese translation of openttd's debconf messages.
-# Copyright (C) 2007
-# This file is distributed under the same license as the openttd package.
-# Ricardo Silva <ardoric@gmail.com>, 2007
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-09 09:37+0100\n"
-"Last-Translator: Ricardo Silva <ardoric@gmail.com>\n"
-"Language-Team: Portuguese <traduz@debianpt.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "São necessários ficheiros de dados"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para esta operação o OpenTTD precisa dos ficheiros de dados do jogo original "
-"Transport Tycool Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o ficheiro /usr/share/doc/openttd/README.Debian para mais detalhes "
-"sobre os ficheiros que são necessários e a sua localização."
diff --git a/os/debian/po/pt_BR.po b/os/debian/po/pt_BR.po
deleted file mode 100644
index 505c1a244..000000000
--- a/os/debian/po/pt_BR.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# openttd Brazilian Portuguese translation
-# Copyright (C) 2007, Eder L. Marques
-# This file is distributed under the same license as the openttd package.
-# Eder L. Marques <frolic@debian-ce.org>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd 0.5.0-2\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 11:00-0300\n"
-"Last-Translator: Eder L. Marques <frolic@debian-ce.org>\n"
-"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"pt_BR utf-8\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Arquivos de dados necessários"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Para sua operação, o OpenTTD necessita dos arquivos de dados do jogo "
-"Transport Tycoon Deluxe original."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Veja o arquivo /usr/share/doc/openttd/README.Debian para maiores detalhes "
-"sobre os arquivos necessários e suas localizações."
diff --git a/os/debian/po/ru.po b/os/debian/po/ru.po
deleted file mode 100644
index 0c2a7fb81..000000000
--- a/os/debian/po/ru.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# translation of openttd_debconf_ru.po to Russian
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Yuri Kozlov <kozlov.y@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: 0.5.1-1\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-10 21:45+0400\n"
-"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
-"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Необходимы файлы данных"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"Для работы OpenTTD требуются файлы данных от оригинальной игры Transport "
-"Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"В файле /usr/share/doc/openttd/README.Debian приведена информация о том, "
-"какие файлы нужны и где они лежат."
diff --git a/os/debian/po/sv.po b/os/debian/po/sv.po
deleted file mode 100644
index 21aa8dea3..000000000
--- a/os/debian/po/sv.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# Swedish translation for openttd debconf template.
-# Copyright (C) 2007 Free Software Foundation, Inc.
-# This file is distributed under the same license as the openttd package.
-# Daniel Nylander <po@danielnylander.se>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 09:47+0100\n"
-"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
-"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "Datafiler behövs"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"För att fungera behöva OpenTTD datafilerna från det ursprungliga spelet "
-"Transport Tycoon Deluxe."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"Se filen /usr/share/doc/openttd/README.Debian för mer information om de "
-"nödvändiga filera och var de finns någonstans."
-
-#~ msgid "You need to install data files"
-#~ msgstr "Du behöver installera datafilerna"
-
-#~ msgid ""
-#~ "OpenTTD needs the data files from the original Transport Tycoon Deluxe "
-#~ "game to run. You should install these data files before you can play the "
-#~ "game. See README.Debian for more details on which files need to be copied "
-#~ "where."
-#~ msgstr ""
-#~ "OpenTTD behöver datafilerna från det ursprungliga spelet Transport Tycoon "
-#~ "Deluxe för att kunna köras. Du måste installera dessa datafiler innan du "
-#~ "kan spela spelet. Se README.Debian för fler detaljer om vilka filer som "
-#~ "behöver kopieras."
diff --git a/os/debian/po/ta.po b/os/debian/po/ta.po
deleted file mode 100644
index 2c068805b..000000000
--- a/os/debian/po/ta.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# translation of openttd.po to TAMIL
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Dr.T.Vasudevan <agnihot3@gmail.com>, 2007.
-msgid ""
-msgstr ""
-"Project-Id-Version: openttd\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: 2007-05-08 15:04+0530\n"
-"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
-"Language-Team: TAMIL <ubuntu-l10n-tam@lists.ubuntu.com>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr "தேவையான தரவு கோப்புகள்"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-"இயங்குவதற்கு ஓபன் டிடிடி(OpenTTD) க்கு ட்ரான்ஸ்போர்ட் டைகூன் டீலக்ஸ் விளையாட்டிலிருந்து "
-"தரவு கோப்புகள் தேவை."
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
-"தேவையான கோப்புகள் அவற்றின் இடம் ஆகியவற்றை அறிய /usr/share/doc/openttd/README "
-"டெபியன் கோப்பை பார்க்கவும்."
diff --git a/os/debian/po/templates.pot b/os/debian/po/templates.pot
deleted file mode 100644
index 7f7e0623a..000000000
--- a/os/debian/po/templates.pot
+++ /dev/null
@@ -1,39 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n"
-"POT-Creation-Date: 2007-05-08 09:39+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid "Data files needed"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"For its operation, OpenTTD needs the data files from the original Transport "
-"Tycoon Deluxe game."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../templates:2001
-msgid ""
-"See the /usr/share/doc/openttd/README.Debian file for more details about the "
-"needed files and their location."
-msgstr ""
diff --git a/os/debian/postinst b/os/debian/postinst
deleted file mode 100644
index 710d223d6..000000000
--- a/os/debian/postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/sh
-
-set -e
-
-
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
diff --git a/os/debian/rules b/os/debian/rules
index 6bc9868ab..a8834ed36 100755
--- a/os/debian/rules
+++ b/os/debian/rules
@@ -1,88 +1,43 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- # Add here commands to configure the package.
-
- touch configure-stamp
-
-
-build: configure build-stamp
-build-stamp:
- dh_testdir
-
- # Add here commands to compile the package.
-
- ./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/openttd
- $(MAKE)
+# Makefile to build the openttd debian package.
+
+# Use debhelper default for all targets (but some are overridden below).
+%:
+ dh $@
+
+DEB_HOST_GNU_TYPE=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE=$(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+# Pass custom options to configure. Since it's not autoconf but a custom
+# script, some of the option names are slightly different. We also need
+# to be explicit about the dependencies, in case we're not running in a
+# clean build root.
+override_dh_auto_configure:
+ ./configure $(CROSS) --prefix-dir=/usr --install-dir=debian/openttd --without-allegro --with-zlib --with-lzo2 --with-sdl --with-png --with-freetype --with-fontconfig --with-icu
+
+# Do some extra installation
+override_dh_auto_install:
+ $(MAKE) install
- #/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1
+ # Install the wrapper and make it executable
+ install -d debian/openttd/usr/share/games/openttd/
+ install -m755 debian/openttd-wrapper debian/openttd/usr/share/games/openttd/
- touch build-stamp
+ # Since 0.7.0, upstream Makefile installs some unwanted stuff.
+ -rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/COPYING
+ -rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/changelog.txt
+ -rm $(CURDIR)/debian/openttd/usr/share/doc/openttd/ob*_format.txt
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp
+# Don't do testing. Because the OpenTTD Makefile always does dependency
+# generation (even on invalid targets), dh_auto_test thinks there is a
+# "test" target, while there isn't.
+override_dh_auto_test:
- # Add here commands to clean up after the build process.
- # We check for Makefile presence, because clean is called at the
- # start of the build process (before configure) where we don't
- # have a Makefile yet.
+# Call mrproper. Again, dh_auto_clean thinks there is a distclean
+# target, while there isn't.
+override_dh_auto_clean:
[ ! -f Makefile ] || $(MAKE) mrproper
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- # Add here commands to install the package into debian/openttd.
- $(MAKE) install
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs changelog.txt
- dh_installdocs
- dh_installexamples
-# dh_install
- dh_installmenu
- dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
- dh_installman docs/openttd.6
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
-# dh_perl
-# dh_python
-# dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/os/debian/templates b/os/debian/templates
deleted file mode 100644
index 90797cdb7..000000000
--- a/os/debian/templates
+++ /dev/null
@@ -1,16 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-Template: openttd/datafiles
-Type: error
-_Description: Data files needed
- For its operation, OpenTTD needs the data files from the original
- Transport Tycoon Deluxe game.
- .
- See the /usr/share/doc/openttd/README.Debian file for more details
- about the needed files and their location.