Preparing release 2.0.5

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index ecadf109b286489e454cece673bbcd85d85e44bb..648dc73b7ff5e0d59cb2c4c4dd819db72a25e839 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
                <packagedescription><![CDATA[Free web-framework, designed and developed for complex community applications.]]></packagedescription>
                <packagedescription language="de"><![CDATA[Freies Web-Framework, das für komplexe Community-Anwendungen entworfen und entwickelt wurde.]]></packagedescription>
                <isapplication>1</isapplication>
-               <version>2.0.4 pl 1</version> <!-- codename: maelstrom -->
-               <date>2014-03-20</date>
+               <version>2.0.5</version> <!-- codename: maelstrom -->
+               <date>2014-04-03</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,10 +43,32 @@
                <instruction type="script">acp/post_install.php</instruction>
        </instructions>
        
+       <!-- !!! WARNING: keep all three update sections below in sync !!! -->
+       
        <instructions type="update" fromversion="2.0.4">
+               <instruction type="acpTemplate">acptemplates.tar</instruction>
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="language">languages/*</instruction>
-               <instruction type="smiley">smiley.xml</instruction>
-               <instruction type="userOption">userOption.xml</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               <instruction type="language">language/*.xml</instruction>
+               
+               <instruction type="option">option.xml</instruction>
+       </instructions>
+       
+       <instructions type="update" fromversion="2.0.4 pl 1">
+               <instruction type="acpTemplate">acptemplates.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               <instruction type="language">language/*.xml</instruction>
+               
+               <instruction type="option">option.xml</instruction>
+       </instructions>
+       
+       <instructions type="update" fromversion="2.0.4 pl 2">
+               <instruction type="acpTemplate">acptemplates.tar</instruction>
+               <instruction type="file">files_update.tar</instruction>
+               <instruction type="template">templates_update.tar</instruction>
+               <instruction type="language">language/*.xml</instruction>
+               
+               <instruction type="option">option.xml</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 4862d374d48fe80060b163cb3253c2b305388899..20c8af2b54bea5983fcc4436baa6c0e62e7db312 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -37,7 +37,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.4 pl 1 (Maelstrom)');
+define('WCF_VERSION', '2.0.5 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());