From 8a74170da03248587a89db0d019785d5dc45b389 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sun, 26 Mar 2006 18:49:31 +0000 Subject: [PATCH] (svn r4117) - Prepare 0.4 branch for release. Update readme's, bugs, installers and makefile, changelog, etc. to 0.4.7 --- Makefile | 2 +- changelog.txt | 10 +++++++++- docs/openttd.6 | 2 +- known-bugs.txt | 6 +++--- network.h | 2 +- os/debian/changelog | 2 +- os/linux/openttd.spec | 2 +- os/win32/installer/install.nsi | 6 +++--- ottdres.rc | 6 +++--- readme.txt | 4 ++-- 10 files changed, 25 insertions(+), 17 deletions(-) diff --git a/Makefile b/Makefile index bad6540aac..e84abad4ab 100644 --- a/Makefile +++ b/Makefile @@ -268,7 +268,7 @@ ENDIAN_CHECK=endian_check$(EXE) STRGEN=strgen/strgen$(EXE) OSXAPP="OpenTTD.app" -REV := 0.4.6-$(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi) +REV := 0.4.7-$(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi) # MorphOS needs builddate BUILDDATE=`date +%d.%m.%y` diff --git a/changelog.txt b/changelog.txt index d174b4bba4..218b3e6f6b 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,4 +1,12 @@ -t 0.4.6 (2006-03-22) +0.4.7 (2006-03-26) +------------------------------------------------------------------------ + +- Feature: [OSX] Add support for triple-binaries (PPC, PPC970, i386) (r4102) +- Fix: [OSX] crash when going to fullscreen (r4100) +- Fix: Allow unused wagons to have their first cache set. Fixes faulty cache-warning message and noticably speeds up depot operations (r4094) +- Fix: [NPF] Trains & busses were unable to find a route when leaving a depot or bus stop. (r4072) + +0.4.6 (2006-03-22) ------------------------------------------------------------------------ - Codechange: [win32] Show the revision in crash.txt and enable the button to show the crash text in the crash-window (r3965) diff --git a/docs/openttd.6 b/docs/openttd.6 index 4495bba768..e595316209 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 March 22, 2006 +.Dd March 26, 2006 .Dt OPENTTD 6 .Sh NAME .Nm openttd diff --git a/known-bugs.txt b/known-bugs.txt index 896d0966c8..746949a32e 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -15,7 +15,7 @@ or http://bugs.openttd.org. If the bug report is closed, it has been fixed, which then can be verified in the latest SVN version. -Bugs for 0.4.6 +Bugs for 0.4.7 ------------------------------------------------------------------------ URL: http://bugs.openttd.org @@ -42,10 +42,10 @@ URL: http://bugs.openttd.org ------------------------------------------------------------------------ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse +-1458368 Ships cannot be sent to depot when loading with NPF on, transfer not working -1454591 Street junctions not able to converted -1453676 crash in windowed mode when moving mouse back to openttd -1436419 Vehicles profits gone negitive.......bug --1438411 Game crash with NPF (r3663) -1434000 Error in Transfer-Function -1433315 non-existant crash reporting -1432871 Wrong signalstate when track over track @@ -77,7 +77,7 @@ URL: http://sourceforge.net/tracker/?atid=636365&group_id=103924&func=browse -1106356 re-offered prototypes -1085486 Subsidies: Only count when station is in right suburb -Minor Bugs for 0.4.5.1 +Minor Bugs for 0.4.7 ------------------------------------------------------------------------ URL: http://sourceforge.net/tracker/?atid=669662&group_id=103924&func=browse diff --git a/network.h b/network.h index 775f8cbf2e..cc7df59fda 100644 --- a/network.h +++ b/network.h @@ -3,7 +3,7 @@ #ifndef NETWORK_H #define NETWORK_H -#define NOREV_STRING "0.4.6-norev000" +#define NOREV_STRING "0.4.7-norev000" #ifdef ENABLE_NETWORK diff --git a/os/debian/changelog b/os/debian/changelog index 260d47173e..6fa31bb854 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,4 +1,4 @@ -openttd (0.4.6-1) unstable; urgency=low +openttd (0.4.7-1) unstable; urgency=low * Remove old terminal messages and make sure that debconf is always called. diff --git a/os/linux/openttd.spec b/os/linux/openttd.spec index 6d807b5be6..e3875b049d 100644 --- a/os/linux/openttd.spec +++ b/os/linux/openttd.spec @@ -5,7 +5,7 @@ #------------------------------------------------------------------------------ %define name openttd -%define version 0.4.6 +%define version 0.4.7 %define release 1mdk #------------------------------------------------------------------------------ diff --git a/os/win32/installer/install.nsi b/os/win32/installer/install.nsi index 7ec7299c9c..1261032888 100644 --- a/os/win32/installer/install.nsi +++ b/os/win32/installer/install.nsi @@ -1,8 +1,8 @@ ; Define your application name !define APPNAME "OpenTTD" -!define APPNAMEANDVERSION "OpenTTD 0.4.6.0" -!define APPVERSION "0.4.6.0" -!define INSTALLERVERSION 18 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!! +!define APPNAMEANDVERSION "OpenTTD 0.4.7.0" +!define APPVERSION "0.4.7.0" +!define INSTALLERVERSION 19 ;NEED TO UPDATE THIS FOR EVERY RELEASE!!! !define MUI_ICON "..\..\..\openttd.ico" !define MUI_UNICON "..\..\..\openttd.ico" !define MUI_WELCOMEFINISHPAGE_BITMAP "welcome.bmp" diff --git a/ottdres.rc b/ottdres.rc index 0a0342e6ba..a7d2eb055f 100644 --- a/ottdres.rc +++ b/ottdres.rc @@ -61,8 +61,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,4,6,0 - PRODUCTVERSION 0,4,6,0 + FILEVERSION 0,4,7,0 + PRODUCTVERSION 0,4,7,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -80,7 +80,7 @@ BEGIN VALUE "Comments", "This program is licensed under the GNU General Public License.\0" VALUE "CompanyName", "OpenTTD Development Team\0" VALUE "FileDescription", "OpenTTD\0" - VALUE "FileVersion", "0.4.6.0\0" + VALUE "FileVersion", "0.4.7.0\0" VALUE "InternalName", "openttd\0" VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2006. All Rights Reserved.\0" VALUE "LegalTrademarks", "\0" diff --git a/readme.txt b/readme.txt index 62f4508644..856a9e99c4 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD README -Last updated: 2006-03-22 -Release version: 0.4.6 +Last updated: 2006-03-26 +Release version: 0.4.7 ------------------------------------------------------------------------