From: Alexander Ebert <ebert@woltlab.com>
Date: Thu, 3 Apr 2014 14:23:22 +0000 (+0200)
Subject: Preparing release 2.0.5
X-Git-Tag: 2.0.5~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5f7ed0ef66c44df9774df66dede9e583db202c54;p=GitHub%2FWoltLab%2FWCF.git

Preparing release 2.0.5
---

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index ecadf109b2..648dc73b7f 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.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 4862d374d4..20c8af2b54 100644
--- 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());