(svn r21676) -Prepare 1.1.0-beta2

8 files changed, 33 insertions, 12 deletions

diff --git a/changelog.txt b/changelog.txt
index 8165ebe6c..b1fa8da38 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,24 @@
+1.1.0-beta2 (2010-12-31)
+------------------------------------------------------------------------
+- Feature: Command logging using the admin interface (r21668)
+- Feature: Concept of automatic station orders; add stub orders for intermediate stations and remove them when not visiting them anymore. This allows you to see what trains visit a station without actually having to order a vehicle to stop at all stations (r21642)
+- Add: [NoAI] AIEventTownFounded (r21664)
+- Add: [NoAI] AIRail::GetName() to get the name of a railtype (r21663)
+- Add: [NoAI] AITown::IsCity() so AIs can find out which towns grow faster than others (r21654)
+- Change: Do not show price to build a bridge in the scenario editor as they are free to build there [FS#4358] (r21673)
+- Change: Do not highlight tile when selecting a vehicle to clone or an order to skip to (r21616)
+- Fix: Estonia introduced the Euro in 2011 (r21670)
+- Fix: Autofill timetable had side effects in test mode, possibly causing desyncs in MP [FS#4354] (r21660)
+- Fix: Cargo payment graph was not properly invalidated when payment rate changed [FS#4351] (r21658)
+- Fix: Use a bool instead of uint8 to store a bool and use the dedicated accessor function when reading boolean settings [FS#4345] (r21656)
+- Fix: Infinite loop in the road pathfinder due to bouncing around in an 'one way' trap; two one ways pointing towards eachother making it impossible to leave [FS#4338] (r21651)
+- Fix: Make '[centre|main] view' consistent, and make '[main|global] view' consistent [FS#4339] (r21650)
+- Fix: Newly created skip-to order was created at wrong place (r21633)
+- Fix: Ships with the old pathfinder would easily show up as lost, even when it would eventually find a path. Now also the distance from the 'end' of the pathfinding run to the destination is compared to the current distance to the destination; if the distance to the destination at the end of the pathfinder run is less than the current distance from the destination the ship will not be marked as lost. This means that the ships with the old pathfinder will less likely get marked as lost, but due to the design of the old ship pathfinder there 'lostness' is merely a best guess. When you still get a lost message you need to build buoys to guide the ship pathfinder [FS#4325] (r21631)
+- Fix: Version detection of subversion branches and tags got broken (r21630)
+- Fix: Crash under certain circumstances when using autorail [FS#4327] (r21619)
+
+
 1.1.0-beta1 (2010-12-24)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Variable 7B for accessing 60+x variables while taking the parameter from the accumulator (r21604)
diff --git a/docs/openttd.6 b/docs/openttd.6
index cb50d1fb1..d57c4de63 100644
--- a/docs/openttd.6
+++ b/docs/openttd.6
@@ -1,6 +1,6 @@
 .\"                                      Hey, EMACS: -*- nroff -*-
 .\" Please adjust this date whenever revising the manpage.
-.Dd Apr 01, 2010
+.Dd Dec 31, 2010
 .Dt OPENTTD 6
 .Sh NAME
 .Nm openttd
diff --git a/known-bugs.txt b/known-bugs.txt
index 145621f08..7da07d8da 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-12-24
-Release version: 1.1.0-beta1
+Last updated:    2010-12-31
+Release version: 1.1.0-beta2
 ------------------------------------------------------------------------
 
 
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
diff --git a/readme.txt b/readme.txt
index 7878c705e..dbe022922 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-12-24
-Release version: 1.1.0-beta1
+Last updated:    2010-12-31
+Release version: 1.1.0-beta2
 ------------------------------------------------------------------------