From 6d6175598857454dccc3ea3e461ce9cd6d0becfd Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 19 Jun 2013 00:57:05 +0200
Subject: [PATCH] Preparing update 2.0.0 Beta 4

---
 com.woltlab.wcf/package.xml                   | 24 ++++++++-----------
 .../install/files/lib/system/WCF.class.php    |  2 +-
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 351e624269..3aeac6b435 100644
--- 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 8cd63a2f36..7fd40406e6 100644
--- 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());
-- 
2.20.1