(svn r18622) -Merge: release changes

13 files changed, 213 insertions, 31 deletions

diff --git a/bin/ai/compat_0.8.nut b/bin/ai/compat_1.0.nut
index fe985b90d..fe985b90d 100644
--- a/bin/ai/compat_0.8.nut
+++ b/bin/ai/compat_1.0.nut
diff --git a/bin/ai/regression/regression_info.nut b/bin/ai/regression/regression_info.nut
index 8c870c571..0d70f0824 100644
--- a/bin/ai/regression/regression_info.nut
+++ b/bin/ai/regression/regression_info.nut
@@ -6,7 +6,7 @@ class Regression extends AIInfo {
 	function GetShortName()   { return "REGR"; }
 	function GetDescription() { return "This runs regression-tests on all commands. On the same map the result should always be the same."; }
 	function GetVersion()     { return 1; }
-	function GetAPIVersion()  { return "0.8"; }
+	function GetAPIVersion()  { return "1.0"; }
 	function GetDate()        { return "2007-03-18"; }
 	function CreateInstance() { return "Regression"; }
 }
diff --git a/changelog.txt b/changelog.txt
index f2ace5134..8190f10a1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,170 @@
+1.0.0-beta1 (2009-12-24)
+------------------------------------------------------------------------
+- Feature: Music replacement sets, like graphics and sound replacement sets (r18608)
+- Feature: Add shading and unshading of windows [FS#2943] (r18588)
+- Feature: Initially select the last joined server when going to the server list [FS#3311] (r18578)
+- Feature: Additional map variety option for TGP landscape generator (r18541)
+- Feature: Add the possibility to not make new tree tiles in-game (r18522)
+- Feature: Moving of AIs in the AI configuration window [FS#3359] (r18516)
+- Feature: Make maximum pathfinder penalties for finding depots customisable, also increase it slightly to 20 tiles worth of penalties (r18481)
+- Feature: [strgen] Allow G and P to 'select' substrings of STRINGn for getting their gender (r18444)
+- Feature: Make penalty for road stop occupancy user configurable (r18404)
+- Feature: Fully scalable, by font size and content, GUI and improved right-to-left language support [FS#1905] (r15800-r18350)
+- Feature: Set the start time of a timetable (r18294)
+- Feature: Show the expected arrival/departure dates in the timetable window (r18285)
+- Feature: [NewGRF] Add new price bases for removing industries, building/removing unmovables (new objects), building/removing rail-waypoints/buoys, interacting with town-authority, building foundations, funding primary industries (when not prospecting) and towns (r18283)
+- Feature: Founding towns in-game (r18281)
+- Feature: [NewGRF] Make price base multipliers related to vehicles only apply to the GRF locally, if it defines engines of that type itself (r18268)
+- Feature: [NewGRF] CB 36 for roadvehicle property 09 'running cost factor' (r18011)
+- Feature: Non-automatic screenshot name can be entered in console (r17938)
+- Feature: Make it possible to disable background saving, only via the config file/in game console though [FS#2633] (r17893)
+- Feature: Automatically select the railtype with the most engines for the autoreplace window/try to avoid showing an empty autoreplace list [FS#1760] (r17892)
+- Feature: Show maximum tractive effort in the 'exclusive test'/'early offer'/'engine preview' window [FS#1619] (r17891)
+- Feature: Double clicking on a NewGRF opens the parameters window (r17890)
+- Feature: Double click on a item in the refit list refits without the need to click on the refit button (r17889)
+- Feature: [NewGRF] Textstack support for CB 37 [FS#1862] (r17802)
+- Feature: [OSX] Implement automatic fallback font selection for OSX (r17794)
+- Feature: Translatable base sound/graphics set descriptions (r17790)
+- Feature: Show the nickname of the person you are PMing [FS#3116] (r17741)
+- Feature: [OSX] Add a MIDI driver using Cocoa/CoreAudio [FS#3223] (r17710)
+- Feature: [OSX] Implement clipboard support for OS X [FS#2053] (r17708)
+- Feature: Possibility to choose (randomise or enter custom) town name before its creation (r17612)
+- Feature: [NewGRF] Callbacks for houses to disable drawing foundations and to disable slope changes, like industry tile callbacks 30 and 3C (r17558)
+- Feature: [NewGRF] Implement callback 145 (custom station rating) (r17547)
+- Feature: Filtering in Add-NewGRF dialog (r17541)
+- Feature: Add the date to all logging in the (real, not in-game) console if show_date_in_console is set. For dedicated server binaries the default is 'on', for the rest it is 'off' [FS#2339] (r17488)
+- Feature: Reconnect console command (r17466)
+- Feature: Allow building rail stations over existing rail without signals but will upgrade normal rail to electrified rail if necessary (r17460)
+- Feature: Crash logger for all Unixy OSes in a similar way as the Windows crash logger (r17453)
+- Feature: Open the 'Rename group' dialog after creating new group (r17281)
+- Feature: [NoAI] Older API compatability wrappers, so one can get the 0.7 API in later versions while keeping the real API clean (r17214)
+- Feature: The Windows installer can now optionnaly download OpenGFX and OpenSFX (r17191)
+- Feature: Sort vehicle lists on (timetable) delay [FS#2945] (r17182)
+- Feature: Localised decimal separator (r17157)
+- Feature: Improved the sample rate conversion a bit (r17146)
+- Feature: Allow higher sample rate and higher quality samples (r17140)
+- Feature: Sound replacement sets, like graphics replacement sets (r17139)
+- Feature: Multi tile waypoints (r17002, r17000, r16993)
+- Feature: [NewGRF] Turn variable 0E/8E (vertical offset for trains in depot) and variable 1E/9E bit 3 (wagon width in depot) into grf-local variables (r16867)
+- Feature: Highlight whole articulated vehicles in traindepot instead of only the first part (r16818)
+- Feature: Ability to enter server and company password via command line when joining a server [FS#570] (r16555)
+- Feature: Give the town generator a slight tendency to build towns near water by not discarding watery random tiles but by searching for near land [FS#2635] (r16147)
+- Feature: Configurable digit group separator per language with user override (r16129)
+- Feature: Make the first 4 rail building tools behave more like autorail (r16095)
+- Feature: Allow sorting stations by the lowest cargo rating instead of only by the highest cargo rating [FS#597] (r16045)
+- Feature: Allow filtering of vehicle purchase lists by cargo [FS#1941] (r16042)
+- Feature: Allow (per order) to let a train stop at the near end, middle or far end of a platform from the point of view of the driver of the train that enters the station (r16037)
+- Feature: Listen on multiple IPs/sockets and register all IPs to the master server (r16014, r15975, r15973, r15971)
+- Feature: Full IPv6 support (r16000)
+- Feature: Allow train vehicles to be shorten to 1/8 length, even if not at the end of the train (r15793)
+- Add: [NoAI] AIOrder::AIOF_GOTO_NEAREST_DEPOT for goto nearest depot orders (r18518)
+- Add: [NoAI] Enable the squirrel standard math library (r17498)
+- Add: [NoAI] A vehicle list for all vehicle that are ordered to a specific depot (r17486)
+- Add: [NoAI] AISubsidy::SubsidyParticipantType, AISubsidy::GetSourceType, AISubsidy::GetSourceIndex, AISubsidy::GetDestinationType, AISubsidy::GetDestinationIndex for better subsidy management (r17115)
+- Change: Forbid industries to clear sea/river when leveling land (r18554)
+- Change: Make it visible when you are to pass the next signal on danger and possible to cancel it (r18515)
+- Change: Move the 'check online content' button from the AI list window to the AI configuration window. This makes it consistent with the NewGRF windows [FS#3340] (r18507)
+- Change: Use zł instead of zl for the Polish Zloty [FS#565] (r18434)
+- Change: Show different texts in town GUI when the town does not need food the whole year to grow (r18433)
+- Change: Make road vehicles behave more like trains 'around' stations and use pathfinder penalties to determine to which 'part' to go (r18382)
+- Change: Do not split up articulated vehicles in the train details view. If an articulated vehicle it too 'wide' draw the information on the next line and if there are multiple cargos split that over multiple lines too [FS#2923] (r18344)
+- Change: Make pause on join pause during the whole joining (including download) phase [FS#3287] (r18054)
+- Change: Prefer extmidi over allegro midi and allegro over null driver [FS#3272] (r17875)
+- Change: Several improvements to the performance of CargoPackets/CargoLists; time spent in those functions reduces by 55-85% (r17840, r17836, r17818, r17814, r17812, r17801, r17736, r17735, r17733, r17731, r17730)
+- Change: [SDL] make 'update the video card'-process asynchronious. Improvements of 2%-25% (real time) during fast forward on dual core/hyperthreading-enabled CPUs (r17776)
+- Change: [NoAI] Make AIEngine:CanRefitCargo() not report refittability to Mail by default for aircraft. It is not necessarily true, and the special case of carrying both passenger&mail is better handled by AIs themself than by the API (r17719)
+- Change: [OSX] Do not use deprecated methods/undocumented functions [FS#1411] (r17712, r17711)
+- Change: Make SDL's video driver more likely to be loaded than Allegro's video driver; SDL seems to perform better (r17583)
+- Change: Do not assume that there is always 'another' industry tile after two '0x18' industry tiles (r17521)
+- Change: Make the performance ratings harder to exploit; only count profitable vehicles and recently serviced stations [FS2459] (r17485)
+- Change: When removing a station or waypoint keep the rail unless Ctrl is pressed. This makes the behaviour consistent between the two (r17471)
+- Change: Show the client id in join messages at the server (r17467)
+- Change: NewGRF price modifiers now take effect everytime when loading NewGRFs instead of once on gamestart (r17433)
+- Change: Make a distinction between missing and corrupted data files. If (at least) one data file is missing do not consider the set to be useable. Do also no autodetect sets with missing files (r17241)
+- Change: Update MiniLZO to 2.0.3 (r17215)
+- Change: Update Squirrel to 2.2.3 (r17195)
+- Change: Remove UNICODE notice in windows installer (r17186)
+- Change: Apply the subsidy when subsidy's destination is in station's catchment area and cargo packets originate from subsidy's source [FS#265,FS#2094,FS#2589] (r17113)
+- Change: Subsidies are not bound to stations after awarding anymore, they still apply to town or industry, no matter what station is used for loading and unloading. Awarded subsidies from older savegames are lost [FS#1134] (r17113)
+- Change: [NoAI] Add AIBaseStation as a parentclass for AIStation and AIWaypoint, and move GetName, SetName and GetLocation to AIBaseStation (r17011)
+- Fix: Conditional orders were seen as 'valid' and as such aircraft with only conditional orders did not crash (r18615)
+- Fix: Pressing default for the starting year/snow line height edit boxes of the world generation windows did not work [FS#3398] (r18586)
+- Fix: [OSX] Try to get a generic RGB colour space if getting the system colour profile failed [FS#3198] (r18573)
+- Fix: [NewGRF] House property 15 did not work [FS#2613] (r18567)
+- Fix: Do not try to overtake a vehicle in a road station as overtaking in a station is not allowed [FS#3390] (r18561)
+- Fix: Make aircraft behave the same on autoreplace/autorenew as other vehicle types (r18553)
+- Fix: First do the time-since-last-service check and only then determine whether autoreplace needs to take place. This way they will not keep autoreplacing continuously on failure, but only after some timeout. Also check some minimal requirements (engine availability, refittability) and a heuristic for the needed money when sending vehicles for autoreplace [FS#1762] (r18551, r18549)
+- Fix: Do not account for path reservation costs when entering a signal block via a 'block' signal. This way you won't get double penalties, both red signals and reservation costs, for the block signalled tracks [FS#2722] (r18535)
+- Fix: [NewGRF] An industry NewGRF that defined a too small size for action0 prop 0A could cause a crash (r18527)
+- Fix: Allegro does not like to work with extmidi, so warn the user about that [FS#3272] (r18520)
+- Fix: When you pass a signal at danger, in a PBS controlled area, do not try to do the 'safe' thing and stop, but continue going; the user wanted the train to pass the signal at danger so (s)he has to suffer the consequences. Ofcourse one can always stop the train manually [FS#2891] (r18515)
+- Fix: No error message was created for the first fatal NewGRF error [FS#3368] (r18506)
+- Fix: Improve airport movement on several airports [FS#3169] (r18505)
+- Fix: Autoreplace and autorenew always reset their cargo sub type to 0. Now find a sub cargo type with the exact same name and use that, otherwise fallback to 0. So cargo sub types can be maintained via autoreplace *if* the new vehicle supports the same cargo sub type [FS#3159] (r18499)
+- Fix: Cloning of vehicles could create vehicles with invalid cargo sub types for the build year of the vehicle. Fall back to another cargo sub type with the exact same name, otherwise fallback to cargo sub type 0 [FS#2616] (r18498)
+- Fix: [NewGRF] Direction is accounted for long before motion counter is updated (r18479)
+- Fix: Moving vehicles around/selling vehicle in the train depot could create states that are not allowed by the NewGRF attach callback [FS#3146] (r18472, r18470)
+- Fix: Unselect an AI in the AI Settings window when it falls out of the range of active AIs [FS#3357] (r18436)
+- Fix: Road vehicles would not pick an empty drive through stop. Now they will *if* the penalty for driving around is less than the occupancy penalty [FS#1944] (r18404)
+- Fix: Long (articulated) road vehicles could block loading of others when the following road vehicle already got 'permission' to go to the next bay even when it could not reach it [FS#1495] (r18404)
+- Fix: The tree 'which one to draw' hash wasn't anywhere near random and thus showed a very visible repeated pattern when only one tree type was used [FS#3343] (r18398)
+- Fix: [NoAI] Make AIIndustryType::GetConstructionCost() return -1, if the industry is neither buildable nor prospectable (r18276)
+- Fix: Use free type ascender/descender metrics to position font offset correctly (r18096)
+- Fix: Make the 'pause' chat message when actually executing the pause command. This to prevent showing paused and especially unpaused to be shown when the state does not change. Output now mentions whether pause changes keep the game paused and what reasons for pausing there 'currently' are (r18052)
+- Fix: [NoAI] Improve behaviour of (AIEngine|AIEventEnginePreview)::GetCargoType() and AIEngine::CanRefitCargo() wrt. articulated vehicles (r17898)
+- Fix: [NewGRF] CB15 and CB36 (capacity) were not always called when they should [FS#3255] (r17897)
+- Fix: Invalidate cache of vehicle vars 40-43 after testruns of certain commands, that change them temporarily (r17894)
+- Fix: [OSX] The splash image was not displayed if the Quartz video driver was used (r17793)
+- Fix: Do not let aircraft drive a while over the grass when landing at high altitude airports [FS#3259] (r17762
+- Fix: Make the -c <config file> location relative to the current directory instead of the directory of the binary [FS#3247] (r17686)
+- Fix: Some semaphore signals fell outside of the signal GUI. Now the signals are properly centered which should make that problem go away [FS#3242] (r17657)
+- Fix: Some inconsistencies with the difficulty settings in the scenario editor. Also re-enable changing some difficulty settings (e.g. max loan) in the scenario editor [FS#3219] (r17644)
+- Fix: Do not accept cargo produced in the same industry; generalise and improve the check used only for valuables (r17437)
+- Fix: Pay only for cargo actually delivered, not for all cargo unloaded at station; can differ with 'stockpiling' industries (r17436)
+- Fix: Improve movement of aircraft; do not make turns bigger then 45 degrees while in flight, do not move while turning on the ground (r17415, r17405)
+- Fix: Crash in order GUI when changing some orders with both the mouse and keyboard at the exact same time [FS#2859] (r17384)
+- Fix: Trains would not show smoke if the load/unload counter was not 0, though there does not seem to be a reason to check that variable anyhow anymore [FS#3162] (r17352)
+- Fix: One was not offered to take over bankrupt companies anymore; caused by the introduction NoAI, although NewAI had the same problem too [FS#2769] (r17345)
+- Fix: Minor improvements of the airport state machines (r17338, r17337, r17334)
+- Fix: Road vehicles forgetting their servicing order when the path takes them away (in bird distance) from their destination first [FS#3057] (r17333)
+- Fix: Mention of Ctrl modifier was missing from some tooltips [FS#3120] (r17300, r17297)
+- Fix: Keep vehicle news and viewports following vehicles, when autoreplacing/renewing them [FS#3048] (r17147)
+- Fix: Inconsistency between signs of stations and waypoints [FS#3081] (r17040)
+- Fix: NewGRF stations would be triggering assertions for waypoints all over the place when using the more advanced station types [FS#2996] (r16909)
+- Fix: Skipping a 'nearest depot order' because none could be found could cause multiple orders to get skipped [FS#2925] (r16457)
+- Fix: Makedepend cannot handle the amount of files we have and it also miss some dependencies. So use our custom implementation of makedepend (r16307)
+- Fix: Autopause and manual pausing conflict with eachother, new game + pause on new game + autopause make the game not unpause on the first join [FS#2864] (r16242)
+- Remove: [NoAI] AIVehicle::SkipToVehicleOrder as it was a duplicate of AIOrder.SkipToOrder (r18504)
+- Remove: OPF for RVs and NTP for trains; both the oldest path finders (r18362)
+- Remove: Support for gcc2. It has not been able to compile OTTD for months. All attempts to do another workaround failed (r16492)
+
+
+0.7.5 (2009-12-23)
+------------------------------------------------------------------------
+(None)
+
+
+0.7.5-RC1 (2009-12-14)
+------------------------------------------------------------------------
+- Add: Some missing latin-ish characters from the OpenGFX set (r18431)
+- Change: Recolour the bubble generator just like any other industry [FS#3349] (r18409)
+- Fix: Read after free in case no network connection could be made with the content server (r18493)
+- Fix: [NewGRF] Initialisation of cargo payment was broken for NewGRF cargos [FS#3344] (r18475)
+- Fix: [NoAI] AIOrder::SkipToOrder did not properly resolve ORDER_CURRENT (r18471)
+- Fix: When moving a wagon and only the last part of a dual headed engine you could split the dual headed engine over two vehicles. This could be used to crash servers [CVE-2009-4007] (r18462)
+- Fix: [Windows] Forgot to load the symbol from SDL.dll (r18439)
+- Fix: Do not run the 'jam protection' for vehicles in a depot [FS#3360] (r18428)
+- Fix: [Windows] the help window would be too large in some cases [FS#3327] (r18424)
+- Fix: Under some circumstances a pointer could be left untouched and then freed. Make sure this does not happen by ensuring it starts out as NULL instead of 'garbage' [FS#3298] (r18418)
+- Fix: On slopes the original and better road layouts did not check their minimum distance requirements [FS#3332] (r18415)
+- Fix: Aqueducts were not influenced by the 'long bridges' setting [FS#3338] (r18407)
+- Fix: Drive through road stops did not get flooded (r18401)
+- Fix: [YAPP] Trains on bridges were not found, when searching for the origin of a reservation [FS#3345] (r18392)
+- Fix: (Invalid) GRFs could trigger invalid reads (r18391)
+- Fix: One could not share orders between buses carrying different cargos (r18380)
+- Fix: Off-by-one in the preconfigured music lists [FS#3339] (r18369)
+
+
 0.7.4 (2009-12-01)
 ------------------------------------------------------------------------
 - Fix: Endianness issue with saving the zoom level [FS#3333] (r18351)
@@ -626,7 +793,7 @@
 - Fix: In some cases the sprite cache could be filled with unremovable items [FS#2153] (r13869)
 - Fix: Return of wrong parent scope of (NewGRF) industry variables (r13868)
 - Fix: Loading of TTD(Patch) savegames from the command line did not work (r13859)
-- Fix: Buffer overflow for too long filename supplied as '-g' parameter (r13858)
+- Fix: Buffer overflow for too long filename supplied as '-g' parameter [CVE-2008-3577] (r13858)
 - Fix: Cargo type lookup was incorrect for NewGRF version 7 files without a translation table [FS#2157] (r13855)
 - Fix: GetTownByTile() is only valid for houses and roads (r13851)
 - Fix: Power, running cost and capacity of multiheaded engines were (too often) doubled in newspaper resp. offer window (r13844)
@@ -647,13 +814,13 @@
 - Fix: Possible desync on the autorenew settings 20+ game years (i.e. 4.5+ hours) after a company was started (r13718)
 - Fix: Any player could construct new companies [FS#2144] (r13716)
 - Fix: Remove the unique_id from the message that a client has joined as it is only exposes the unique_id more than needed (r13714)
-- Fix: Possible crash on creating a network packet (r13713)
+- Fix: Possible crash on creating a network packet [CVE-2008-3547] (r13713)
 - Fix: Enforce the length restrictions of company and president name in the commands too (r13712)
 
 
 0.6.2-RC1 (2008-07-16)
 ------------------------------------------------------------------------
-- Fix: Possible buffer overflow in string truncation code (r13700)
+- Fix: Possible buffer overflow in string truncation code [CVE-2008-3576] (r13700)
 - Fix: Handle SETX(Y) properly when truncating a string instead of ignoring it and returning a too long string (r13699)
 - Fix: In some cases the (sound) mixer could overflow causing artefacts in the sound [FS#2120] (r13695)
 - Fix: Do not rely on .tar files always ending with a block of zeros (r13693)
@@ -1712,7 +1879,7 @@
 - Fix: Danish town names were saved/loaded as Swiss
 - Fix: Removing roads on crossings was done without a check for ownership
 - Fix: [Autoreplace] Fix drawing of train list for outdated engines
-- Fix: Malicious clients/servers could crash the game
+- Fix: Malicious clients/servers could crash the game [CVE-2006-1999, CVE-2006-1998]
 - Fix: [Autoreplace] allow replacement of wagons even when the engine fails to be replaced
 - Fix: Certain operations involving trains inside a depot could cause a crash
 - Fix: [Autoreplace] cost for refitting a new vehicle is added to the cost animation (player always paid for it, it just was not shown)
@@ -1862,7 +2029,7 @@
 - Fix: On OS/2 show the trailing \ if the current directory is a root directory (r2860)
 - Fix: Return a proper version number, when testing the TTDPatch version in the SkipIf action (r2862)
 - Fix: Change the way NewGRFs are loaded, this saves quite some sprite slots - about 2000 for DBSetXL for example (r2868)
-- Fix: Several format string vulnerabilities and buffer overflows in the network code (r2899)
+- Fix: Several format string vulnerabilities and buffer overflows in the network code [CVE-2005-2764, CVE-2005-2763] (r2899)
 - Fix: fixed issue where autorenewed vehicles did not get all stats updated (r2912)
 - Fix: Exit the child of the extmidi backend with _exit() instead of exit(), because we do not want any atexit handlers - especially flushing output streams - to run, if exec() fails (r2938)
 - Fix: Server crash with 'say'-command (r2950)
diff --git a/known-bugs.txt b/known-bugs.txt
index bb37ffa4f..6410b55bc 100644
--- a/known-bugs.txt
+++ b/known-bugs.txt
@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2009-12-10
-Release version: 0.8.0
+Last updated:    2009-12-24
+Release version: 1.0.0-beta1
 ------------------------------------------------------------------------
 
 
@@ -34,17 +34,10 @@ that you can find at: http://bugs.openttd.org
 If the bugs are closed but still listed here it means that the bug is fixed
 and that the nightlies and next major release will not have that bug.
 
-- 3198	[OSX] "Could not get system colour space" error on some Mac OS X 10.6
-- 3194	[OSX] Full screen 'strobing' on some Mac OS X 10.6
-- 3190	[OSX] Compiling fails on some Mac OS X 10.6
-- 3159	[NewGRF] Autoreplace resets (or does not keep) value of variable F2
-- 2955	With path signals depots are less likely to be visited
-- 2891	Ignore signal does not keep the train running when in path signalled block till the next signal
-- 2616	[NewGRF] Cloning creates vehicles with invalid subcargos
-- 2613	[NewGRF] House property 15 does not work
+- 3194	[OSX] Full screen strobing/flickering
+- 2782	[OSX] Port hopelessly outdated
 - 2585	[OSX] OS' mouse pointer showing
 - 2484	[OSX] Cannot enter CJK characters
-- 1762	Strange Autoreplace behaviour
 - 1140	[OSX] Not smooth moving map with touchpad
 
 
diff --git a/os/debian/changelog b/os/debian/changelog
index b75b7f93b..611bdcf53 100644
--- a/os/debian/changelog
+++ b/os/debian/changelog
@@ -1,9 +1,27 @@
-openttd (0.8~svn-1) UNRELEASED; urgency=low
+openttd (1.0~svn-1) UNRELEASED; urgency=low
 
   * Unreleased SVN version. Versioned to allow normal upgrades to released
     versions.
 
- -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 03 Sep 2008 18:56:04 +0200
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:02:03 +0100
+
+openttd (1.0~beta1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 24 Dec 2009 01:01:01 +0100
+
+openttd (0.7.5) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 23 Dec 2009 20:52:34 +0100
+
+openttd (0.7.5~RC1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Mon, 14 Dec 2009 19:28:37 +0100
 
 openttd (0.7.4) unstable; urgency=low
 
diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec
index 6628e8ae5..997d81289 100644
--- a/os/rpm/openttd.spec
+++ b/os/rpm/openttd.spec
@@ -13,7 +13,7 @@
 #-------------------------------------------------------------------------------
 
 Name:          openttd
-Version:       0.7.4
+Version:       1.0.0
 Release:       1%{?dist}
 
 Group:         Amusements/Games
diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi
index 36ac5fd12..3e7210a6a 100644
--- a/os/windows/installer/install.nsi
+++ b/os/windows/installer/install.nsi
@@ -1,6 +1,6 @@
 # Version numbers to update
-!define APPV_MAJOR 0
-!define APPV_MINOR 8
+!define APPV_MAJOR 1
+!define APPV_MINOR 0
 !define APPV_MAINT 0
 !define APPV_BUILD 0
 !define APPV_EXTRA ""
diff --git a/readme.txt b/readme.txt
index 29adcc15d..51d27621f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 OpenTTD README
-Last updated:    2009-12-01
-Release version: 0.7.4
+Last updated:    2009-12-24
+Release version: 1.0.0
 ------------------------------------------------------------------------
 
 
diff --git a/src/ai/ai_info.cpp b/src/ai/ai_info.cpp
index be16a4966..b753424e1 100644
--- a/src/ai/ai_info.cpp
+++ b/src/ai/ai_info.cpp
@@ -53,7 +53,7 @@ AILibrary::~AILibrary()
 
 static bool CheckAPIVersion(const char *api_version)
 {
-	return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "0.8") == 0;
+	return strcmp(api_version, "0.7") == 0 || strcmp(api_version, "1.0") == 0;
 }
 
 /* static */ SQInteger AIInfo::Constructor(HSQUIRRELVM vm)
diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp
index 78721ed0c..0ff70f9b1 100644
--- a/src/ai/api/ai_changelog.hpp
+++ b/src/ai/api/ai_changelog.hpp
@@ -14,9 +14,9 @@
  * functions may still be available if you return an older API version
  * in GetAPIVersion() in info.nut.
  *
- * \b 0.8.0
+ * \b 1.0.0
  *
- * 0.8.0 is not yet released. The following changes are not set in stone yet.
+ * 1.0.0 is not yet released. The following changes are not set in stone yet.
  *
  * API additions:
  * \li AIBaseStation
@@ -82,6 +82,10 @@
  * \li AIIndustryType::GetConstructionCost() now returns -1 if the industry is
  *     neither buildable nor prospectable.
  *
+ * \b 0.7.5
+ *
+ * No changes
+ *
  * \b 0.7.4
  *
  * No changes
diff --git a/src/ai/api/ai_info_docs.hpp b/src/ai/api/ai_info_docs.hpp
index 3774c005e..e93ef1e94 100644
--- a/src/ai/api/ai_info_docs.hpp
+++ b/src/ai/api/ai_info_docs.hpp
@@ -148,7 +148,7 @@ public:
 	 *
 	 * Valid return values are:
 	 * - "0.7"
-	 * - "0.8"
+	 * - "1.0"
 	 *
 	 * @return The version this AI is compatible with.
 	 * @note This function is optional.
diff --git a/src/os/windows/ottdres.rc.in b/src/os/windows/ottdres.rc.in
index b67270454..48c2e97a9 100644
--- a/src/os/windows/ottdres.rc.in
+++ b/src/os/windows/ottdres.rc.in
@@ -79,8 +79,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,0,!!REVISION!!
- PRODUCTVERSION 0,8,0,!!REVISION!!
+ FILEVERSION 1,0,0,!!REVISION!!
+ PRODUCTVERSION 1,0,0,!!REVISION!!
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/rev.cpp.in b/src/rev.cpp.in
index 21e084709..6e33a64f3 100644
--- a/src/rev.cpp.in
+++ b/src/rev.cpp.in
@@ -60,7 +60,7 @@ 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 = 0 << 28 | 8 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
+const uint32 _openttd_newgrf_version = 1 << 28 | 0 << 24 | 0 << 20 | 0 << 19 | (!!REVISION!! & ((1 << 19) - 1));
 
 #ifdef __MORPHOS__
 /**