Preparing release 2.0.6

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 6d4abc60c4f0f8f48c94db013287824b667a645c..e229b21510b8ffbc0a89c4eeb7baebd3ad8e4c34 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.5</version> <!-- codename: maelstrom -->
-               <date>2014-04-10</date>
+               <version>2.0.6</version> <!-- codename: maelstrom -->
+               <date>2014-04-29</date>
        </packageinformation>
        
        <authorinformation>
@@ -43,32 +43,9 @@
                <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_update.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 1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+       <instructions type="update" fromversion="2.0.5">
                <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_update.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 20c8af2b54bea5983fcc4436baa6c0e62e7db312..f74d9179a92b3f964da4f5f6b5c9fdd7f7c2ef16 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.5 (Maelstrom)');
+define('WCF_VERSION', '2.0.6 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());