Preparing update 2.0.0 Beta 4

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 351e6242690be115c01e692b95bf2df6c013aa4e..3aeac6b4354729b92fa6cffc00636d8a0425270c 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.0 Beta 3</version> <!-- codename: maelstrom -->
-               <date>2013-06-04</date>
+               <version>2.0.0 Beta 4</version> <!-- codename: maelstrom -->
+               <date>2013-06-19</date>
        </packageinformation>
        
        <authorinformation>
@@ -42,21 +42,17 @@
                <instruction type="script">acp/post_install.php</instruction> 
        </instructions>
        
-       <instructions type="update" fromversion="2.0.0 Beta 1">
+       <instructions type="update" fromversion="2.0.0 Beta 3">
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="language">language/*.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="sql">update_b2.sql</instruction>
-               <instruction type="sql">update_b3.sql</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-       </instructions>
-       
-       <instructions type="update" fromversion="2.0.0 Beta 2">
                <instruction type="acpTemplate">acptemplates_update.tar</instruction>
-               <instruction type="file">files_update.tar</instruction>
                <instruction type="language">language/*.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               <instruction type="sql">update_b3.sql</instruction>
                <instruction type="template">templates_update.tar</instruction>
+               <instruction type="script">acp/update_b4.php</instruction>
+               
+               <instruction type="objectTypeDefinition">objectTypeDefinition.xml</instruction>
+               <instruction type="option">option.xml</instruction>
+               <instruction type="pageMenu">pageMenu.xml</instruction>
+               <instruction type="userGroupOption">userGroupOption.xml</instruction>
+               <instruction type="userOption">userOption.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 8cd63a2f368f92d0f018b9b31972a679d7474cee..7fd40406e680e920fc0f39c20a532e7942d3e1cb 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -35,7 +35,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.0.0 Beta 2 (Maelstrom)');
+define('WCF_VERSION', '2.0.0 Beta 4 (Maelstrom)');
 
 // define current unix timestamp
 define('TIME_NOW', time());