(svn r21278) [1.0] -Prepare for 1.0.5

changelog.txt

@@ -1,6 +1,11 @@
+1.0.5 (2010-11-20)
+------------------------------------------------------------------------
+(None)
+
+
 1.0.5-RC2 (2010-11-14)
 ------------------------------------------------------------------------
-- Fix: Reading (very) recently freed memory (r21182)
+- Fix: Reading (very) recently freed memory [CVE-2010-4168] (r21182)
 - Fix: Default service interval for ships/aircraft got switched [FS#4222] (r21155)
 - Fix: Size of sort buttons for save/load and build vehicle list gui could be too small [FS#4221] (r21151)
 - Fix: [NewGRF] Crash when disabling static NewGRFs (when joining/starting a server) [FS#4208] (r21130, r21129, r21128)

config.lib

@@ -11,7 +11,7 @@ log() {
 }
 
 set_default() {
-	released_version="1.0.5-RC2"
+	released_version=""
 
 	ignore_extra_parameters="0"
 	# We set all kinds of defaults for params. Later on the user can override

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2010-11-14
-Release version: 1.0.5-RC2
+Last updated:    2010-11-20
+Release version: 1.0.5
 ------------------------------------------------------------------------
 
 
@@ -22,8 +22,8 @@ specifics, we welcome you to report them. React to the given bug indicated
 by the number below on http://bugs.openttd.org.
 
 
-2) Known bugs in the this stable release:
--- --------------------------------------
+2) Known bugs in this stable release:
+-- ----------------------------------
 The following bugs are known to exist in this stable release and
 we intend to fix them. Some bugs are known but are not fixable or
 fixing them would cause further problems. Those bugs can be found

os/debian/changelog

@@ -1,3 +1,9 @@
+openttd (1.0.5-0) unstable; urgency=low
+
+  * New upstream release 1.0.5
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sat, 20 Nov 2010 21:00:00 +0000
+
 openttd (1.0.5~rc2-0) unstable; urgency=low
 
   * New upstream release 1.0.5~rc2

os/windows/installer/install.nsi

@@ -2,8 +2,8 @@
 !define APPV_MAJOR 1
 !define APPV_MINOR 0
 !define APPV_MAINT 5
-!define APPV_BUILD 1
-!define APPV_EXTRA "-RC2"
+!define APPV_BUILD 2
+!define APPV_EXTRA ""
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version

projects/determineversion.vbs

@@ -39,7 +39,6 @@ Sub UpdateFiles(version)
 		modified = Mid(version, InStrRev(version, Chr(9)) + 1)
 		version  = Mid(version, 1, InStr(version, Chr(9)) - 1)
 	Else
-		version = "1.0.5-RC2"
 		revision = 0
 		modified = 1
 	End If

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2010-11-14
-Release version: 1.0.5-RC2
+Last updated:    2010-11-20
+Release version: 1.0.5
 ------------------------------------------------------------------------
 
 

src/os/windows/ottdres.rc.in

@@ -79,8 +79,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,5,21188
- PRODUCTVERSION 1,0,5,21188
+ FILEVERSION 1,0,0,!!REVISION!!
+ PRODUCTVERSION 1,0,0,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -98,14 +98,14 @@ BEGIN
             VALUE "Comments", "This program is licensed under the GNU General Public License version 2.\0"
             VALUE "CompanyName", "OpenTTD Development Team\0"
             VALUE "FileDescription", "OpenTTD\0"
-            VALUE "FileVersion", "1.0.5-RC2\0"
+            VALUE "FileVersion", "Development !!VERSION!!\0"
             VALUE "InternalName", "openttd\0"
             VALUE "LegalCopyright", "Copyright \xA9 OpenTTD Developers 2002-2010. All Rights Reserved.\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "openttd.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "OpenTTD\0"
-            VALUE "ProductVersion", "1.0.5-RC2\0"
+            VALUE "ProductVersion", "Development !!VERSION!!\0"
             VALUE "SpecialBuild", "-\0"
         END
     END

src/rev.cpp.in

@@ -27,7 +27,7 @@
  * norev000 is for non-releases that are made on systems without
  * subversion or sources that are not a checkout of subversion.
  */
-const char _openttd_revision[] = "1.0.5-RC2";
+const char _openttd_revision[] = "!!VERSION!!";
 
 /**
  * The text version of OpenTTD's build date.
@@ -60,11 +60,11 @@ const byte _openttd_revision_modified = !!MODIFIED!!;
  * final release will always have a lower version number than the released
  * version, thus making comparisions on specific revisions easy.
  */
-const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 5 << 20 | 0 << 19 | (21188 & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**
  * Variable used by MorphOS to show the version.
  */
-extern const char morphos_versions_tag[] = "$VER: OpenTTD 1.0.5-RC2 (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
+extern const char morphos_versions_tag[] = "$VER: OpenTTD !!VERSION!! (!!DATE!!) OpenTTD Team [MorphOS, PowerPC]";
 #endif