diff options
| author | planetmaker <planetmaker@openttd.org> | 2010-12-31 14:08:21 +0000 |
|---|---|---|
| committer | planetmaker <planetmaker@openttd.org> | 2010-12-31 14:08:21 +0000 |
| commit | fe6080650ced233a1fbc5e91148d287c72c68406 (patch) | |
| tree | 7938274cc3c0e0f328c1d4afd07604cbd2283945 /os | |
| parent | b46aee796b40be583a98aaaf48c4f4d342ddbe7a (diff) | |
| download | openttd-fe6080650ced233a1fbc5e91148d287c72c68406.tar.xz | |
(svn r21676) -Prepare 1.1.0-beta2
Diffstat (limited to 'os')
| -rw-r--r-- | os/debian/changelog | 7 | ||||
| -rw-r--r-- | os/os2/installer/make_installer.cmd | 2 | ||||
| -rw-r--r-- | os/rpm/openttd.spec | 1 | ||||
| -rw-r--r-- | os/windows/installer/install.nsi | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/os/debian/changelog b/os/debian/changelog index 5b46b1d4f..d4efdb45e 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,9 +1,8 @@ -openttd (1.1~svn-0) UNRELEASED; urgency=low +openttd (1.1.0~beta2); urgency=low - * Unreleased SVN version. Versioned to allow normal upgrades to released - versions. + * New upstream release 1.1.0-beta2 - -- Matthijs Kooijman <matthijs@stdin.nl> Fri, 24 Dec 2010 00:00:00 +0000 + -- Matthijs Kooijman <matthijs@stdin.nl> Fri, 31 Dec 2010 18:00:00 +0100 openttd (1.1.0~beta1); urgency=low diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index 064aef12b..0437eb18b 100644 --- a/os/os2/installer/make_installer.cmd +++ b/os/os2/installer/make_installer.cmd @@ -1,6 +1,6 @@ @echo off -set OPENTTD_VERSION=1.1.0-beta1 +set OPENTTD_VERSION=1.1.0-beta2 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index a47285927..7a87e01a4 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -26,6 +26,7 @@ Source: %{name}-%{version}-source.tar.bz2 Requires: fontconfig Requires: SDL Requires: zlib +Requires: xz-devel BuildRequires: gcc-c++ BuildRequires: fontconfig-devel BuildRequires: libpng-devel diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index 0686086e8..811431bbe 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 1 !define APPV_MAINT 0 -!define APPV_BUILD 0 -!define APPV_EXTRA "-beta1" +!define APPV_BUILD 1 +!define APPV_EXTRA "-beta2" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version |