From 290b0c1099d045fddf71c5cf0f6371a3699b05fe Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 7 Sep 2008 22:31:15 +0000 Subject: [PATCH] (svn r14271) [0.6] -Backport from trunk: - Change: Makefile updates for compile farm - Change: Updated debian package generation metadata --- Makefile.bundle => Makefile.bundle.in | 11 +- Makefile.in | 20 ++- Makefile.lang.in | 2 - Makefile.msvc | 2 +- Makefile.src.in | 58 ++------- config.lib | 14 +- findversion.sh | 106 +++++++++++++++ os/debian/README.Debian | 15 +-- os/debian/changelog | 178 ++++++++++++-------------- os/debian/config | 12 +- os/debian/control | 20 --- os/debian/control.in | 21 +++ os/debian/patches/00list | 0 os/debian/po/ca.po | 39 +++--- os/debian/po/cs.po | 42 ++++++ os/debian/po/de.po | 55 ++++++++ os/debian/po/eu.po | 42 ++++++ os/debian/po/fi.po | 32 +++++ os/debian/po/fr.po | 42 ++++++ os/debian/po/gl.po | 41 ++++++ os/debian/po/nl.po | 43 +++++++ os/debian/po/pt.po | 42 ++++++ os/debian/po/pt_BR.po | 43 +++++++ os/debian/po/ru.po | 45 +++++++ os/debian/po/sv.po | 56 ++++++++ os/debian/po/ta.po | 43 +++++++ os/debian/po/templates.pot | 25 ++-- os/debian/rules | 36 ++++-- os/debian/templates | 20 ++- src/cargopacket.cpp | 2 +- 30 files changed, 863 insertions(+), 244 deletions(-) rename Makefile.bundle => Makefile.bundle.in (94%) create mode 100644 findversion.sh delete mode 100644 os/debian/control create mode 100644 os/debian/control.in delete mode 100644 os/debian/patches/00list create mode 100644 os/debian/po/cs.po create mode 100644 os/debian/po/de.po create mode 100644 os/debian/po/eu.po create mode 100644 os/debian/po/fi.po create mode 100644 os/debian/po/fr.po create mode 100644 os/debian/po/gl.po create mode 100644 os/debian/po/nl.po create mode 100644 os/debian/po/pt.po create mode 100644 os/debian/po/pt_BR.po create mode 100644 os/debian/po/ru.po create mode 100644 os/debian/po/sv.po create mode 100644 os/debian/po/ta.po diff --git a/Makefile.bundle b/Makefile.bundle.in similarity index 94% rename from Makefile.bundle rename to Makefile.bundle.in index 66490caf48..55f0f91220 100644 --- a/Makefile.bundle +++ b/Makefile.bundle.in @@ -6,14 +6,11 @@ ifdef REVISION REV := $(REVISION) else -# Are we a SVN dir? -ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) -# Find if the local source if modified -REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' ) -# Find the revision like: rXXXX-branch -REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); for (i in a) if(a[i]=="branches") { BRANCH="-"a[i+1]; break } } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') -endif +# Detect the revision +VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh") +REV := $(shell echo "$(VERSIONS)" | cut -f 1) endif + # Make sure we have something in REV ifeq ($(REV),) REV := norev000 diff --git a/Makefile.in b/Makefile.in index 100b9498f8..cc212b1c51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,5 +1,3 @@ -# Auto-generated file -- DO NOT EDIT - # Check if we want to show what we are doing ifdef VERBOSE Q = @@ -11,6 +9,7 @@ include Makefile.am SOURCE_LIST = !!SOURCE_LIST!! CONFIG_CACHE_SOURCE_LIST = !!CONFIG_CACHE_SOURCE_LIST!! +CONFIG_CACHE_PWD = !!CONFIG_CACHE_PWD!! CONFIGURE_FILES = !!CONFIGURE_FILES!! LIPO = !!LIPO!! BIN_DIR = !!BIN_DIR!! @@ -37,9 +36,10 @@ REVISION = !!REVISION!! AWK = !!AWK!! DISTCC = !!DISTCC!! -RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi ) +RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi ) +RES := $(shell if [ ! -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST) 2>/dev/null`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi ) -all: config.cache +all: config.pwd config.cache ifdef DISTCC @if [ -z "`echo '$(MFLAGS)' | grep '\-j'`" ]; then echo; echo "WARNING: you enabled distcc support, but you don't seem to be using the -jN paramter"; echo; fi endif @@ -78,7 +78,13 @@ help: @echo " bundle_lha create the lha installation bundle" @echo " bundle_dmg create the dmg installation bundle" +config.pwd: $(CONFIG_CACHE_PWD) + $(MAKE) reconfigure + config.cache: $(CONFIG_CACHE_SOURCE_LIST) $(CONFIGURE_FILES) + $(MAKE) reconfigure + +reconfigure: ifeq ($(shell if test -f config.cache; then echo 1; fi), 1) @echo "----------------" @echo "The system detected that source.list or any configure file is altered." @@ -87,7 +93,7 @@ ifeq ($(shell if test -f config.cache; then echo 1; fi), 1) # Make sure we don't lock config.cache @$(shell cat config.cache | sed 's/\\ /\\\\ /g') || exit 1 @echo "----------------" - @echo "Reconfig done. Now compiling..." + @echo "Reconfig done. Please re-execute make." @echo "----------------" else @echo "----------------" @@ -113,9 +119,9 @@ mrproper: rm -f $$dir/Makefile; \ done $(Q)rm -rf objs - $(Q)rm -f Makefile Makefile.am + $(Q)rm -f Makefile Makefile.am Makefile.bundle $(Q)rm -f media/openttd.desktop - $(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.log + $(Q)rm -f $(CONFIG_CACHE_SOURCE_LIST) config.cache config.pwd config.log $(CONFIG_CACHE_PWD) $(Q)rm -rf $(BUNDLE_DIR) $(Q)rm -rf $(BUNDLES_DIR) diff --git a/Makefile.lang.in b/Makefile.lang.in index 11b12ddd24..18db5a6134 100644 --- a/Makefile.lang.in +++ b/Makefile.lang.in @@ -1,5 +1,3 @@ -# Auto-generated file -- DO NOT EDIT - STRGEN = !!STRGEN!! ENDIAN_CHECK = !!ENDIAN_CHECK!! SRC_DIR = !!SRC_DIR!! diff --git a/Makefile.msvc b/Makefile.msvc index d6821a905e..73be806c50 100644 --- a/Makefile.msvc +++ b/Makefile.msvc @@ -25,4 +25,4 @@ TARGET := $(shell echo $(PLATFORM) | sed "s/win64/x64/;s/win32/Win32/") all: $(Q)cp objs/$(TARGET)/Release/$(TTD) $(BIN_DIR)/$(TTD) -include Makefile.bundle +include Makefile.bundle.in diff --git a/Makefile.src.in b/Makefile.src.in index d2b83fcf8d..98e06abcb3 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -1,5 +1,3 @@ -# Auto-generated file -- DO NOT EDIT - CC_HOST = !!CC_HOST!! CXX_HOST = !!CXX_HOST!! CC_BUILD = !!CC_BUILD!! @@ -11,6 +9,7 @@ CFLAGS = !!CFLAGS!! CFLAGS_BUILD = !!CFLAGS_BUILD!! LIBS = !!LIBS!! LDFLAGS = !!LDFLAGS!! +ROOT_DIR = !!ROOT_DIR!! BIN_DIR = !!BIN_DIR!! LANG_DIR = !!LANG_DIR!! SRC_OBJS_DIR = !!SRC_OBJS_DIR!! @@ -89,58 +88,19 @@ $(LANG_OBJS_DIR)/$(STRGEN): $(LANG_OBJS_DIR)/table/strings.h: $(LANG_DIR)/english.txt $(LANG_OBJS_DIR)/$(STRGEN) $(MAKE) -C $(LANG_OBJS_DIR) table/strings.h +# Always run version detection, so we always have an accurate modified +# flag +VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh") +MODIFIED := $(shell echo "$(VERSIONS)" | cut -f 3) -# Determine if we are using a modified version -ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) -REV_MODIFIED := $(shell svnversion $(SRC_DIR) | sed -n 's/.*\(M\).*/\1/p' ) -else -# Are we a git dir? -ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) -REV_MODIFIED := $(shell if cd "$(SRC_DIR)/.." && git diff-index HEAD src | read dummy; then echo M; fi) -else -# Are we a hg (Mercurial) dir? -ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) -REV_MODIFIED := $(shell if hg status $(SRC_DIR) | grep -v '^?' | read dummy; then echo M; fi) -else -MODIFIED="1" -endif -endif -endif - -ifneq ($(MODIFIED),"1") -ifeq ($(REV_MODIFIED),) -MODIFIED="0" -else -MODIFIED="2" -endif -endif - -# Make the revision number ifdef REVISION +# Use specified revision (which should be of the form "r000"). REV := $(REVISION) REV_NR := $(shell echo $(REVISION) | sed "s/[^0-9]//g") else -# Are we a SVN dir? -ifeq ($(shell if test -d $(SRC_DIR)/.svn; then echo 1; fi), 1) -# Find if the local source if modified -# Find the revision like: rXXXXM-branch -REV := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^URL:.*branches/ { split($$2, a, "/"); for(i in a) if (a[i]=="branches") { BRANCH="-"a[i+1]; break } } /^Last Changed Rev:/ { REV="r"$$4"$(REV_MODIFIED)" } END { print REV BRANCH }') -REV_NR := $(shell LC_ALL=C svn info $(SRC_DIR) | $(AWK) '/^Last Changed Rev:/ { print $$4 }') -else -# Are we a git dir? -ifeq ($(shell if test -d $(SRC_DIR)/../.git; then echo 1; fi), 1) -# Find the revision like: gXXXXM-branch -REV := g$(shell if head=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null`; then echo "$$head" | cut -c1-8; fi)$(REV_MODIFIED)$(shell git branch|grep '[*]' | sed 's/\* /-/;s/^-master$$//') -REV_NR := $(shell LC_ALL=C cd "$(SRC_DIR)/.." && git log --pretty=format:%s src | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) -else -# Are we a hg (Mercurial) dir? -ifeq ($(shell if test -d $(SRC_DIR)/../.hg; then echo 1; fi), 1) -# Find the revision like: hXXXXM-branch -REV := h$(shell if head=`LC_ALL=C hg tip 2>/dev/null`; then echo "$$head" | head -n 1 | cut -d: -f3 | cut -c1-8; fi)$(REV_MODIFIED)$(shell hg branch | sed 's/^/-/;s/^-default$$//') -REV_NR := $(shell LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" $(SRC_DIR) | grep -m 1 "^(svn r[0-9]*)" | sed "s/.*(svn r\([0-9]*\)).*/\1/" ) -endif -endif -endif +# Use autodetected revisions +REV := $(shell echo "$(VERSIONS)" | cut -f 1) +REV_NR := $(shell echo "$(VERSIONS)" | cut -f 2) endif # Make sure we have something in REV and REV_NR diff --git a/config.lib b/config.lib index 8e02959ce4..f22bae0e41 100644 --- a/config.lib +++ b/config.lib @@ -2311,6 +2311,7 @@ make_sed() { s#!!CONFIG_CACHE_SOURCE!!#config.cache.source#g; s#!!CONFIG_CACHE_VERSION!!#config.cache.version#g; s#!!CONFIG_CACHE_SOURCE_LIST!!#config.cache.source.list#g; + s#!!CONFIG_CACHE_PWD!!#config.cache.pwd#g; s#!!LANG_SUPPRESS!!#$lang_suppress#g; s#!!OBJS_C!!#$OBJS_C#g; s#!!OBJS_CPP!!#$OBJS_CPP#g; @@ -2372,13 +2373,18 @@ generate_main() { # Create the main Makefile echo "Generating Makefile..." - < $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" > Makefile + echo "# Auto-generated file from 'Makefile.in' -- DO NOT EDIT" > Makefile + < $ROOT_DIR/Makefile.in sed "$SRC_REPLACE" >> Makefile + cp $ROOT_DIR/Makefile.bundle.in Makefile.bundle echo "# Auto-generated file -- DO NOT EDIT" > Makefile.am echo >> Makefile.am # Make the copy of the source-list, so we don't trigger an unwanted recompile cp $SOURCE_LIST config.cache.source.list + # Add the current directory, so we don't trigger an unwanted recompile + echo "`pwd`" > config.cache.pwd # Make sure config.cache is OLDER then config.cache.source.list touch config.cache + touch config.pwd if [ "$menu_dir" != "" ]; then generate_menu_item @@ -2394,7 +2400,8 @@ generate_lang() { mkdir -p $LANG_OBJS_DIR echo "Generating lang/Makefile..." - < $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" > $LANG_OBJS_DIR/Makefile + echo "# Auto-generated file from 'Makefile.lang.in' -- DO NOT EDIT" > $LANG_OBJS_DIR/Makefile + < $ROOT_DIR/Makefile.lang.in sed "$SRC_REPLACE" >> $LANG_OBJS_DIR/Makefile echo "DIRS += $LANG_OBJS_DIR" >> Makefile.am echo "LANG_DIRS += $LANG_OBJS_DIR" >> Makefile.am } @@ -2408,7 +2415,8 @@ generate_src_normal() { mkdir -p $SRC_OBJS_DIR echo "Generating $2/Makefile..." - < $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" > $SRC_OBJS_DIR/Makefile + echo "# Auto-generated file from 'Makefile.src.in' -- DO NOT EDIT" > $SRC_OBJS_DIR/Makefile + < $ROOT_DIR/Makefile.src.in sed "$SRC_REPLACE" >> $SRC_OBJS_DIR/Makefile echo "DIRS += $SRC_OBJS_DIR" >> Makefile.am echo "SRC_DIRS += $SRC_OBJS_DIR" >> Makefile.am } diff --git a/findversion.sh b/findversion.sh new file mode 100644 index 0000000000..1d7c52a471 --- /dev/null +++ b/findversion.sh @@ -0,0 +1,106 @@ +#!/bin/sh + +# Arguments given? Show help text. +if [ "$#" != "0" ]; then + cat <\t\t +REV + a string describing what version of the code the current checkout is + based on. The exact format of this string depends on the version + control system in use, but it tries to identify the revision used as + close as possible (using the svn revision number or hg/git hash). + This also includes an indication of whether the checkout was + modified and which branch was checked out. This value is not + guaranteed to be sortable, but is mainly meant for identifying the + revision and user display. + + If no revision identifier could be found, this is left empty. +REV_NR + the revision number of the svn revision this checkout is based on. + This can be used to determine which functionality is present in this + checkout. For trunk svn checkouts and hg/git branches based upon it, + this number should be accurate. For svn branch checkouts, this + number is mostly meaningless, at least when comparing with the + REV_NR from other branches or trunk. + + This number should be sortable. Within a given branch or trunk, a + higher number means a newer version. However, when using git or hg, + this number will not increase on new commits. + + If no revision number could be found, this is left empty. +MODIFIED + Whether (the src directory of) this checkout is modified or not. A + value of 0 means not modified, a value of 2 means it was modified. + Modification is determined in relation to the commit identified by + REV, so not in relation to the svn revision identified by REV_NR. + + A value of 1 means that the modified status is unknown, because this + is not an svn/git/hg checkout for example. + +By setting the AWK environment variable, a caller can determine which +version of "awk" is used. If nothing is set, this script defaults to +"awk". +EOF +exit 1; +fi + +# Allow awk to be provided by the caller. +if [ -z "$AWK" ]; then + AWK=awk +fi + +# Find out some dirs +cd `dirname "$0"` +ROOT_DIR=`pwd` +SRC_DIR=src + +# Determine if we are using a modified version +# Assume the dir is not modified +MODIFIED="0" +if [ -d "$ROOT_DIR/.svn" ]; then + # We are an svn checkout + if svnversion "$SRC_DIR" | grep 'M' > /dev/null; then + MODIFIED="2" + fi + # Find the revision like: rXXXXM-branch + BRANCH=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^URL:.*branches/ { split($2, a, "/"); for(i in a) if (a[i]=="branches") { print a[i+1]; break } }'` + REV_NR=`LC_ALL=C svn info "$SRC_DIR" | "$AWK" '/^Last Changed Rev:/ { print $4 }'` + REV="r$REV_NR" +elif [ -d "$ROOT_DIR/.git" ]; then + # We are a git checkout + if git diff-index HEAD "$SRC_DIR" | read dummy; then + MODIFIED="2" + fi + HASH=`LC_ALL=C git rev-parse --verify HEAD 2>/dev/null | cut -c1-8` + REV="g$HASH" + BRANCH=`git branch|grep '[*]' | sed 's/\* //;s/^master$//'` + REV_NR=`LC_ALL=C git log --pretty=format:%s "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"` +elif [ -d "$ROOT_DIR/.hg" ]; then + # We are a hg checkout + if hg status "$SRC_DIR" | grep -v '^?' | read dummy; then + MODIFIED="2" + fi + HASH=`LC_ALL=C hg tip 2>/dev/null | head -n 1 | cut -d: -f3 | cut -c1-8` + REV="h$HASH" + BRANCH=`hg branch | sed 's/^default$//'` + REV_NR=`LC_ALL=C hg log -k "svn" -l 1 --template "{desc}\n" "$SRC_DIR" | grep "^(svn r[0-9]*)" | head -n 1 | sed "s/.*(svn r\([0-9]*\)).*/\1/"` +else + # We don't know + MODIFIED="1" + BRANCH="" + REV="" + REV_NR="" +fi + +if [ "$MODIFIED" -eq "2" ]; then + REV="${REV}M" +fi + +if [ -n "$BRANCH" ]; then + REV="${REV}-$BRANCH" +fi + +echo "$REV $REV_NR $MODIFIED" diff --git a/os/debian/README.Debian b/os/debian/README.Debian index 6e861ebb5d..fa06175861 100644 --- a/os/debian/README.Debian +++ b/os/debian/README.Debian @@ -15,7 +15,7 @@ You should copy the data files from the original TTD into the data directory For in game music (optional), you should copy all files in the gm/ subdir of your ttd installation to /usr/share/games/openttd/gm. You should also install timidity and a soundfont (freepats is packaged in - debian and works out of the box). + Debian and works out of the box). Don't forget to use -m extmidi if you want music, and if you have problems, remember that not all audio devices support multiple @@ -23,12 +23,9 @@ 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. - * 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. + 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. - -- Matthijs Kooijman , Tue, 25 Jan 2004 14:11:01 +0200 + -- Matthijs Kooijman , Tue, 25 Jan 2004 14:11:01 +0200 diff --git a/os/debian/changelog b/os/debian/changelog index 2f7dd93f02..3475321ccd 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,146 +1,126 @@ openttd (0.6.2-1) unstable; urgency=low * New upstream release. + - Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714 - -- Matthijs Kooijman Fri, 01 Aug 2008 21:25:00 +0200 + -- Matthijs Kooijman Fri, 08 Aug 2008 11:07:05 +0200 -openttd (0.6.2~RC2-1) unstable; urgency=low +openttd (0.6.2~rc2-1) experimental; urgency=low + [ Matthijs Kooijman ] * New upstream release. - -- Matthijs Kooijman Fri, 25 Jul 2008 22:00:00 +0200 + [ Jordi Mallach ] + * Fix typo in README.Debian (lintian). + * Remove dpatch build-dep and the empty debian/patches dir. + * Don't ignore possible "make distclean" errors. -openttd (0.6.2~RC1-1) unstable; urgency=low + -- Jordi Mallach Sat, 26 Jul 2008 01:35:30 +0200 +openttd (0.6.2~rc1-1) experimental; urgency=low + + [ Matthijs Kooijman ] * New upstream release. - -- Matthijs Kooijman Wed, 16 Jul 2008 19:45:00 +0200 + -- Jordi Mallach Thu, 24 Jul 2008 16:09:57 +0200 openttd (0.6.1-1) unstable; urgency=low + [ Matthijs Kooijman ] * New upstream release. + * Remove no_install_personal.dpatch, it is included upstream now. - -- Matthijs Kooijman Sun, 01 Jun 2008 15:35:00 +0200 + -- Jordi Mallach Thu, 05 Jun 2008 00:47:36 +0200 -openttd (0.6.1~RC2-1) unstable; urgency=low +openttd (0.6.0-2) unstable; urgency=low - * New upstream release. + [ Jordi Mallach ] + * Rename XS-Vcs-* to the official Vcs-* fields. - -- Matthijs Kooijman Wed, 21 May 2008 00:05:00 +0200 + [ Matthijs Kooijman ] + * Don't install anything into ~ during make install, this prevented + successful builds on some architectures. Fix imported from upstream. + * Put the homepage in it's own Homepage field instead of in the description. + * Bump Standards-Version to 3.7.3 -openttd (0.6.1~RC1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Sat, 26 Apr 2008 22:55:00 +0200 + -- Jordi Mallach Thu, 03 Apr 2008 00:07:10 +0200 openttd (0.6.0-1) unstable; urgency=low - * New upstream release. + [ Matthijs Kooijman ] + * New upstream release: + - Adds note about font-configuration for non-latin languages. + Closes: #462604 + * Add .desktop file, provided by Andrea Colangelo. + Closes: #460073 + * Add Finnish Debconf translation, provided by Esko Arajärvi. + Closes: #456956 - -- Matthijs Kooijman Tue, 01 Apr 2008 13:33:37 +0100 + [ Jordi Mallach ] + * Fixes and improvements for the .desktop file according to the spec. -openttd (0.6.0~RC1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Wed, 26 Mar 2008 15:51:40 +0100 - -openttd (0.6.0~beta5-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Mon, 04 Mar 2008 18:06:31 +0100 - -openttd (0.6.0~beta4-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Mon, 18 Feb 2008 20:09:29 +0100 - -openttd (0.6.0~beta3-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Tue, 16 Jan 2008 21:40:07 +0100 - -openttd (0.6.0~beta2-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Sun, 09 Dec 2007 22:05:05 +0100 - -openttd (0.6.0~beta1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Sun, 18 Nov 2007 16:05:05 +0100 + -- Jordi Mallach Wed, 02 Apr 2008 14:04:40 +0200 openttd (0.5.3-1) unstable; urgency=low - * New upstream release. + [ Matthijs Kooijman ] + * New upstream release - -- Matthijs Kooijman Sat, 15 Sep 2007 13:30:00 +0100 - -openttd (0.5.3~rc3-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Thu, 30 Aug 2007 23:30:00 +0100 - -openttd (0.5.3~rc2-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Sat, 7 Jul 2007 20:05:00 +0100 - -openttd (0.5.3~rc1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Thu, 28 Jun 2007 18:00:00 +0100 + -- Jordi Mallach Tue, 18 Sep 2007 12:05:28 +0200 openttd (0.5.2-1) unstable; urgency=low + [ Jordi Mallach ] * New upstream release. + * Debconf translation updates: + - Catalan. - -- Matthijs Kooijman Tue, 29 May 2007 20:00:00 +0100 + [ Christian Perrier ] + * Debconf templates and debian/control reviewed by the debian-l10n- + english team as part of the Smith review project. + Closes: #422183, #419096. + * Debconf translation updates: + - Swedish. Closes: #422780 + - Basque. Closes: #422786 + - Czech. Closes: #422809 + - Galician. Closes: #422831 + - German. Closes: #422908 + - Tamil. Closes: #423079 + - Russian. Closes: #423224 + - Portuguese. Closes: #423413 + - French. Closes: #424436 + - Brazilian Portuguese. Closes: #425585 + - Dutch. Closes: #425707 -openttd (0.5.2~rc1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Wed, 16 May 2007 23:35:39 +0100 + -- Jordi Mallach Sat, 02 Jun 2007 06:24:34 +0200 openttd (0.5.1-1) unstable; urgency=low - * New upstream release. + [ Matthijs Kooijman ] + * New upstream release + * Add German and Swedish translations (Closes: #420258, #419097) + * Remove bogus fuzzy mark from the Catalan translation - -- Matthijs Kooijman Fri, 20 Apr 2007 21:45:32 +0100 + [ Jordi Mallach ] + * debian/control: add XS-Vcs-Svn and XS-Vcs-Browser fields. -openttd (0.5.1~rc3-1) unstable; urgency=low + -- Jordi Mallach Mon, 23 Apr 2007 21:03:06 +0200 - * New upstream release. +openttd (0.5.0-2) unstable; urgency=low - -- Matthijs Kooijman Tue, 17 Apr 2007 22:00:46 +0100 + * Upload to Debian. -openttd (0.5.1~rc2-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Fri, 23 Mar 2007 23:45:46 +0100 - -openttd (0.5.1~rc1-1) unstable; urgency=low - - * New upstream release. - - -- Matthijs Kooijman Wed, 20 Mar 2007 22:03:46 +0100 + -- Jordi Mallach Sun, 11 Mar 2007 14:12:37 +0100 openttd (0.5.0-1) unstable; urgency=low + [ Matthijs Kooijman ] * New upstream release - -- Matthijs Kooijman Mon, 26 Feb 2007 21:07:05 +0100 + [ Jordi Mallach ] + * Depend on ${misc:Depends}, not debconf directly. + + -- Jordi Mallach Thu, 8 Mar 2007 15:34:54 +0100 openttd (0.5.0~rc5-1) unstable; urgency=low @@ -243,13 +223,13 @@ openttd (0.4.0.1-1) unstable; urgency=low * New upstream release - -- Matthijs Kooijman Mon, 23 May 2005 13:04:24 +0200 + -- Matthijs Kooijman Mon, 23 May 2005 13:04:24 +0200 openttd (0.4.0-1) unstable; urgency=low * New upstream release - -- Matthijs Kooijman Mon, 16 May 2005 00:16:17 +0200 + -- Matthijs Kooijman Mon, 16 May 2005 00:16:17 +0200 openttd (0.3.6-1) unstable; urgency=low @@ -257,18 +237,18 @@ openttd (0.3.6-1) unstable; urgency=low * Modifed Makefile to install xpm icon and scenarios in /usr/share/games/openttd/ * Added openttd.32.xpm, openttd.64.xpm was too big - -- root Tue, 25 Jan 2005 19:21:08 +0100 + -- Matthijs Kooijman Tue, 25 Jan 2005 19:21:08 +0100 openttd (0.3.5-2) unstable; urgency=low * Fixed some lintian warnings. * Added openttd.64.xpm (icon for menu). - -- Matthijs Kooijman Mon, 27 Dec 2004 01:51:36 +0100 + -- Matthijs Kooijman Mon, 27 Dec 2004 01:51:36 +0100 openttd (0.3.5-1) unstable; urgency=low * Initial Release. - -- Matthijs Kooijman Fri, 24 Dec 2004 02:58:47 +0100 + -- Matthijs Kooijman Fri, 24 Dec 2004 02:58:47 +0100 diff --git a/os/debian/config b/os/debian/config index 01dfb36591..a4e1268f65 100755 --- a/os/debian/config +++ b/os/debian/config @@ -6,16 +6,16 @@ FILES="trg1r.grf trgcr.grf trghr.grf trgir.grf trgtr.grf sample.cat" DATADIR=/usr/share/games/openttd/data -MISSING="No"; +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; + MISSING="Yes" + break + fi; +done if [ $MISSING = "Yes" ]; then db_input high openttd/datafiles || true db_go -fi; +fi diff --git a/os/debian/control b/os/debian/control deleted file mode 100644 index a0d6ee1c6c..0000000000 --- a/os/debian/control +++ /dev/null @@ -1,20 +0,0 @@ -Source: openttd -Section: contrib/games -Priority: optional -Maintainer: Matthijs Kooijman -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 -Architecture: any -Depends: ${shlibs:Depends}, debconf -Suggests: timidity, freepats -Description: reimplementation of Transport Tycoon Deluxe with enhancements - A reimplementation of the Microprose game "Transport Tycoon Deluxe" with lots - of new features and enhancements. - You require the data files of the original Transport Tycoon Deluxe - for Windows to play the game. You have to MANUALLY copy them to the - game data directory! (see README.Debian for details) - . - Homepage: http://www.openttd.org/ diff --git a/os/debian/control.in b/os/debian/control.in new file mode 100644 index 0000000000..0c6a4a0534 --- /dev/null +++ b/os/debian/control.in @@ -0,0 +1,21 @@ +Source: PACKAGE +Section: contrib/games +Priority: optional +Maintainer: Matthijs Kooijman +Uploaders: Jordi Mallach +Build-Depends: debhelper (>= 4.0.0), libsdl-dev, zlib1g-dev, libpng-dev, libfreetype6-dev, libfontconfig-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 +Homepage: http://www.openttd.org/ + +Package: PACKAGE +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Suggests: timidity, freepats +Description: reimplementation of Transport Tycoon Deluxe with enhancements + OpenTTD is a reimplementation of the Microprose game "Transport + Tycoon Deluxe" with lots of new features and enhancements. The data + files of the original Transport Tycoon Deluxe for Windows are + mandatory to play the game. They must be manually copied to the game + data directory (see README.Debian for details). diff --git a/os/debian/patches/00list b/os/debian/patches/00list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/os/debian/po/ca.po b/os/debian/po/ca.po index dff637995c..d0fb63b5d9 100644 --- a/os/debian/po/ca.po +++ b/os/debian/po/ca.po @@ -1,35 +1,40 @@ # Catalan translation of openttd's Debconf templates. -# Copyright 2007 Software in the Public Interest +# Copyright © 2007 Software in the Public Interest, Inc. # 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" +"Project-Id-Version: openttd 0.5.2-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" +"POT-Creation-Date: 2007-05-08 09:39+0200\n" +"PO-Revision-Date: 2007-06-01 00:45+0200\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 +#. Type: error #. Description -#: ../templates:1001 -msgid "You need to install data files" -msgstr "Heu d'installar els fitxers de dades" +#: ../templates:2001 +msgid "Data files needed" +msgstr "Es necessiten els fitxers de dades" -#. Type: note +#. Type: error #. Description -#: ../templates:1001 +#: ../templates:2001 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." +"For its operation, OpenTTD needs the data files from the original Transport " +"Tycoon Deluxe game." msgstr "" -"OpenTTD necessita els fitxers de dades del joc TTD original per a funcionar. " -"Haureu d'installar aquests fitxers de dades abans de poder jugar al joc. " -"Llegiu el document README.Debian per a obtindre ms detalls sobre quins " -"fitxers s'han de copiar i a quina ubicaci." +"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 new file mode 100644 index 0000000000..c87382e1a6 --- /dev/null +++ b/os/debian/po/cs.po @@ -0,0 +1,42 @@ +# 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. +# +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 \n" +"Language-Team: Czech \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 new file mode 100644 index 0000000000..d7b54fba88 --- /dev/null +++ b/os/debian/po/de.po @@ -0,0 +1,55 @@ +# Translation of openttd debconf templates to German +# Copyright (C) Helge Kreutzmann , 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 \n" +"Language-Team: German \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 new file mode 100644 index 0000000000..1cabc9e410 --- /dev/null +++ b/os/debian/po/eu.po @@ -0,0 +1,42 @@ +# 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 , 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 \n" +"Language-Team: Euskara \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 new file mode 100644 index 0000000000..eede54a210 --- /dev/null +++ b/os/debian/po/fi.po @@ -0,0 +1,32 @@ +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 \n" +"Language-Team: Finnish \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 new file mode 100644 index 0000000000..04bc925df3 --- /dev/null +++ b/os/debian/po/fr.po @@ -0,0 +1,42 @@ +# 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 , 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 \n" +"Language-Team: debian-l10n-french \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 new file mode 100644 index 0000000000..154204e308 --- /dev/null +++ b/os/debian/po/gl.po @@ -0,0 +1,41 @@ +# Galician translation of openttd's debconf templates +# This file is distributed under the same license as the openttd package. +# Jacobo Tarrio , 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 \n" +"Language-Team: Galician \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 new file mode 100644 index 0000000000..7681410bab --- /dev/null +++ b/os/debian/po/nl.po @@ -0,0 +1,43 @@ +# 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. +# +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 \n" +"Language-Team: debian-l10n-dutch \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 new file mode 100644 index 0000000000..d40e189e78 --- /dev/null +++ b/os/debian/po/pt.po @@ -0,0 +1,42 @@ +# Portuguese translation of openttd's debconf messages. +# Copyright (C) 2007 +# This file is distributed under the same license as the openttd package. +# Ricardo Silva , 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 \n" +"Language-Team: Portuguese \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 new file mode 100644 index 0000000000..505c1a2446 --- /dev/null +++ b/os/debian/po/pt_BR.po @@ -0,0 +1,43 @@ +# 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 , 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 \n" +"Language-Team: l10n Portuguese \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 new file mode 100644 index 0000000000..0c2a7fb81c --- /dev/null +++ b/os/debian/po/ru.po @@ -0,0 +1,45 @@ +# 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 , 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 \n" +"Language-Team: Russian \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 new file mode 100644 index 0000000000..21aa8dea39 --- /dev/null +++ b/os/debian/po/sv.po @@ -0,0 +1,56 @@ +# 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 , 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 \n" +"Language-Team: Swedish \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 new file mode 100644 index 0000000000..2c068805b6 --- /dev/null +++ b/os/debian/po/ta.po @@ -0,0 +1,43 @@ +# 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 , 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 \n" +"Language-Team: TAMIL \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 index 0ba7cebaa9..7f7e0623a8 100644 --- a/os/debian/po/templates.pot +++ b/os/debian/po/templates.pot @@ -8,7 +8,7 @@ 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" +"POT-Creation-Date: 2007-05-08 09:39+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,17 +16,24 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#. Type: note +#. Type: error #. Description -#: ../templates:1001 -msgid "You need to install data files" +#: ../templates:2001 +msgid "Data files needed" msgstr "" -#. Type: note +#. Type: error #. Description -#: ../templates:1001 +#: ../templates:2001 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." +"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/rules b/os/debian/rules index afc687f7c0..d6fa65dbf1 100755 --- a/os/debian/rules +++ b/os/debian/rules @@ -6,9 +6,22 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +DEFAULT_PACKAGE := openttd +# Find the package name from the topmost changelog entry. +# Is this the best way to do this? +PACKAGE = $(shell cat debian/changelog | head -1 | cut -f1 -d' ') -configure: patch configure-stamp +debian/control: + # Generate control file + sed 's/PACKAGE/$(PACKAGE)/' debian/control.in > debian/control + + # TODO: How to do this using makefile conditionals? + if [ "$(PACKAGE)" != "$(DEFAULT_PACKAGE)" ]; then \ + echo "Provides: $(DEFAULT_PACKAGE)" >> debian/control ; \ + echo "Conflicts: $(DEFAULT_PACKAGE)" >> debian/control ; \ + fi; + +configure: debian/control configure-stamp configure-stamp: dh_testdir # Add here commands to configure the package. @@ -16,30 +29,35 @@ configure-stamp: touch configure-stamp -build: configure build-stamp +build: debian/control 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 + ./configure --prefix-dir=/usr --binary-dir=games --data-dir=share/games/openttd --icon-dir=share/pixmaps --personal-dir=.openttd --install-dir=debian/$(PACKAGE) $(MAKE) #/usr/bin/docbook-to-man debian/openttd.sgml > openttd.1 touch build-stamp -clean: unpatch +clean: debian/control dh_testdir dh_testroot rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) clean + # 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. + [ ! -f Makefile ] || $(MAKE) distclean dh_clean + # Clean up generated control file + -rm debian/control -install: build +install: debian/control build dh_testdir dh_testroot dh_clean -k @@ -53,7 +71,7 @@ binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. -binary-arch: build install +binary-arch: debian/control build install dh_testdir dh_testroot dh_installchangelogs changelog.txt @@ -84,4 +102,4 @@ binary-arch: build install dh_builddeb binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure patch +.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/os/debian/templates b/os/debian/templates index 0c741ae029..90797cdb7f 100644 --- a/os/debian/templates +++ b/os/debian/templates @@ -1,6 +1,16 @@ +# 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: note -_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. +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. diff --git a/src/cargopacket.cpp b/src/cargopacket.cpp index b19da9a5b0..c2169db5e2 100644 --- a/src/cargopacket.cpp +++ b/src/cargopacket.cpp @@ -218,7 +218,7 @@ bool CargoList::MoveTo(CargoList *dest, uint count, CargoList::MoveToAction mta, if (mta != MTA_FINAL_DELIVERY) { CargoPacket *cp_new = new CargoPacket(); - Money fs = cp->feeder_share * count / cp->count; + Money fs = cp->feeder_share * count / static_cast(cp->count); cp->feeder_share -= fs; cp_new->source = cp->source;