From 285c068aae98e4a9b0fc346ed57232da13161f3e Mon Sep 17 00:00:00 2001 From: Darkvater Date: Tue, 27 Feb 2007 16:51:49 +0000 Subject: (svn r8926) -Merge: Release changes from the 0.5 branch back to trunk. This ensures an updated changelog, readme, etc. --- os/debian/README.Debian | 8 ++++---- os/debian/changelog | 47 +++++++++++++++++++++++++++++++++++++++++++++- os/debian/control | 3 ++- os/debian/copyright | 8 ++++---- os/debian/po/POTFILES.in | 1 + os/debian/po/ca.po | 35 ++++++++++++++++++++++++++++++++++ os/debian/po/templates.pot | 32 +++++++++++++++++++++++++++++++ os/debian/postinst | 36 ----------------------------------- os/debian/postrm | 41 ---------------------------------------- os/debian/templates | 8 ++++---- 10 files changed, 128 insertions(+), 91 deletions(-) create mode 100644 os/debian/po/POTFILES.in create mode 100644 os/debian/po/ca.po create mode 100644 os/debian/po/templates.pot delete mode 100644 os/debian/postrm (limited to 'os/debian') diff --git a/os/debian/README.Debian b/os/debian/README.Debian index f7225a22a..6e861ebb5 100644 --- a/os/debian/README.Debian +++ b/os/debian/README.Debian @@ -23,10 +23,10 @@ You should copy the data files from the original TTD into the data directory mixing. My VIA AC97 device cannot do hardware mixing, for example. -Scenarios - There are a few scenarios included in this release. When you start openttd - it will look for scenarios in ~/.openttd/scenario, while the premade - scenarios are in /usr/share/games/openttd/data/scenario. You have two - options to use the scenarios. + There are a few scenarios included in this release. When you start + openttd it will look for scenarios in ~/.openttd/scenario, while the + premade scenarios are in /usr/share/games/openttd/data/scenario. You + have two options to use the scenarios. * Navigate to /usr/share/games/openttd/data/scenario within openttd. * Copy scenarios from /usr/share/games/openttd/data/scenario to ~/.openttd/scenario. We are looking into a better solution for this. diff --git a/os/debian/changelog b/os/debian/changelog index 30a947969..226e58ad2 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -2,7 +2,52 @@ openttd (0.6~svn) unstable; urgency=low * Unreleased SVN version. Versioned to allow normal upgrades to released versions. - -- Matthijs Kooijman Thu, 21 Dec 2006 14:54:35 +0100 + -- Matthijs Kooijman Mon, 26 Feb 2007 21:07:05 +0100 + +openttd (0.5.0-1) unstable; urgency=low + + * New upstream release + + -- Matthijs Kooijman Mon, 26 Feb 2007 21:07:05 +0100 + +openttd (0.5.0~rc5-1) unstable; urgency=low + + [ Matthijs Kooijman ] + * New upstream release + * Compile with freetype and fontconfig support. + + [ Jordi Mallach ] + * Convert debconf templates to podebconf. + * Add a Catalan translation. + * Minor packaging cleanups. + + -- Matthijs Kooijman Mon, 12 Feb 2007 09:25:41 +0100 + +openttd (0.5.0~rc4-1) unstable; urgency=low + + * New upstream release + + -- Matthijs Kooijman Thu, 18 Jan 2007 21:17:28 +0100 + +openttd (0.5.0~rc3-1) unstable; urgency=low + + * New upstream release + + -- Matthijs Kooijman Thu, 18 Jan 2007 20:21:04 +0100 + +openttd (0.5.0~rc2-1) unstable; urgency=low + + * New upstream release + * Removed fix for empty scenarios dir, openttd Makefile now properly handles + this. + + -- Matthijs Kooijman Sun, 31 Dec 2006 12:24:37 +0100 + +openttd (0.5.0~rc1-1) unstable; urgency=low + + * New upstream release. + + -- Matthijs Kooijman Fri, 22 Dec 2006 11:03:46 +0100 openttd (0.4.8-1) unstable; urgency=low diff --git a/os/debian/control b/os/debian/control index 75dea93fd..a0d6ee1c6 100644 --- a/os/debian/control +++ b/os/debian/control @@ -2,7 +2,8 @@ Source: openttd Section: contrib/games Priority: optional Maintainer: Matthijs Kooijman -Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev +Uploaders: Jordi Mallach +Build-Depends: debhelper (>= 4.0.0), dpatch, libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-dev Standards-Version: 3.7.2 Package: openttd diff --git a/os/debian/copyright b/os/debian/copyright index 077b0f586..7d9cd87bf 100644 --- a/os/debian/copyright +++ b/os/debian/copyright @@ -1,9 +1,9 @@ -This package was debianized by Matthijs Kooijman on -Wed, 15 Sep 2004 00:24:01 +0200. +This package was debianized by Matthijs Kooijman +on Wed, 15 Sep 2004 00:24:01 +0200. It was downloaded from http://sourceforge.net/projects/openttd -Upstream Author: Ludvig Strigeus (ludde) and many others +Upstream author: Ludvig Strigeus (ludde) and many others. License: @@ -19,7 +19,7 @@ License: 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/os/debian/po/POTFILES.in b/os/debian/po/POTFILES.in new file mode 100644 index 000000000..cef83a340 --- /dev/null +++ b/os/debian/po/POTFILES.in @@ -0,0 +1 @@ +[type: gettext/rfc822deb] templates diff --git a/os/debian/po/ca.po b/os/debian/po/ca.po new file mode 100644 index 000000000..dff637995 --- /dev/null +++ b/os/debian/po/ca.po @@ -0,0 +1,35 @@ +# Catalan translation of openttd's Debconf templates. +# Copyright © 2007 Software in the Public Interest +# This file is distributed under the same license as the openttd package. +# Jordi Mallach , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: openttd 0.5.0-1\n" +"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n" +"POT-Creation-Date: 2007-02-01 12:25+0100\n" +"PO-Revision-Date: 2007-02-01 12:16+0100\n" +"Last-Translator: Jordi Mallach \n" +"Language-Team: Catalan \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "You need to install data files" +msgstr "Heu d'instal·lar els fitxers de dades" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "" +"OpenTTD needs the data files from the original TTD 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 necessita els fitxers de dades del joc TTD original per a funcionar. " +"Haureu d'instal·lar aquests fitxers de dades abans de poder jugar al joc. " +"Llegiu el document README.Debian per a obtindre més detalls sobre quins " +"fitxers s'han de copiar i a quina ubicació." diff --git a/os/debian/po/templates.pot b/os/debian/po/templates.pot new file mode 100644 index 000000000..0ba7cebaa --- /dev/null +++ b/os/debian/po/templates.pot @@ -0,0 +1,32 @@ +# 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 , YEAR. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: m.kooijman@student.utwente.nl\n" +"POT-Creation-Date: 2007-02-01 12:25+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=CHARSET\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "You need to install data files" +msgstr "" + +#. Type: note +#. Description +#: ../templates:1001 +msgid "" +"OpenTTD needs the data files from the original TTD 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 "" diff --git a/os/debian/postinst b/os/debian/postinst index 58eb04ac0..710d223d6 100644 --- a/os/debian/postinst +++ b/os/debian/postinst @@ -1,44 +1,8 @@ #! /bin/sh -# postinst script for openttd -# -# see: dh_installdeb(1) set -e -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package -# - . /usr/share/debconf/confmodule -case "$1" in - configure) - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - #DEBHELPER# - -exit 0 - - diff --git a/os/debian/postrm b/os/debian/postrm deleted file mode 100644 index 08e86a760..000000000 --- a/os/debian/postrm +++ /dev/null @@ -1,41 +0,0 @@ -#! /bin/sh -# postrm script for openttd -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `remove' -# * `purge' -# * `upgrade' -# * `failed-upgrade' -# * `abort-install' -# * `abort-install' -# * `abort-upgrade' -# * `disappear' overwrit>r> -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - purge|remove) - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 diff --git a/os/debian/templates b/os/debian/templates index a43703c45..0c741ae02 100644 --- a/os/debian/templates +++ b/os/debian/templates @@ -1,6 +1,6 @@ Template: openttd/datafiles Type: note -Description: You need to install data files - OpenTTD needs the datafiles from the original TTD game to run. You should - install these datafiles before you can play the game. See README.Debian for - more details on which files need to be copied where. +_Description: You need to install data files + OpenTTD needs the data files from the original TTD 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. -- cgit v1.2.3-54-g00ecf