Preparing release 2.1.2 pl 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 9678af5fc38fc7d8e58d3a16246c8f277a09923c..c52ac2c2876b67bb25873c6205f0a2b731732fab 100644 (file)
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,7 +5,7 @@
                <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.1.2</version> <!-- codename: typhoon -->
+               <version>2.1.2 pl 1</version> <!-- codename: typhoon -->
                <date>2015-03-28</date>
        </packageinformation>
        
@@ -89,14 +89,7 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.1">
-               <instruction type="acpTemplate">acptemplates_update.tar</instruction>
+       <instructions type="update" fromversion="2.1.2">
                <instruction type="file">files_update.tar</instruction>
-               <instruction type="template">templates_update.tar</instruction>
-               
-               <instruction type="language" run="standalone">language/*.xml</instruction>
-               <instruction type="option">option.xml</instruction>
-               
-               <instruction type="sql">update_212.sql</instruction>
        </instructions>
 </package>

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 984b90b79a4f535ed09e13ff4709dc0dafed6ea7..c1f936805096da7993de6ca15912cecd1ae18f09 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -38,7 +38,7 @@ if (!@ini_get('date.timezone')) {
 }
 
 // define current wcf version
-define('WCF_VERSION', '2.1.2 (Typhoon)');
+define('WCF_VERSION', '2.1.2 pl 1 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());