Preparing internal release 2.1.0 RC 1

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index c3a065e99fc156ef092b8c32c5549cd7251a1bac..7338797b9565bb6259491036548df20d8bc5d611 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.1.0 Beta 4</version> <!-- codename: typhoon -->
-               <date>2015-02-03</date>
+               <version>2.1.0 RC 1</version> <!-- codename: typhoon -->
+               <date>2015-02-13</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,17 +89,14 @@
                <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
        </instructions>
        
-       <instructions type="update" fromversion="2.1.0 Beta 3">
+       <instructions type="update" fromversion="2.1.0 Beta 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" run="standalone">language/*.xml</instruction>
                
-               <instruction type="sql">update_2.1.0_beta_4.sql</instruction>
                <instruction type="option">option.xml</instruction>
-               <instruction type="userMenu">userMenu.xml</instruction>
-               
-               <instruction type="script" run="standalone">acp/rebuild_comments_com.woltlab.wcf_2.1.php</instruction>
+               <instruction type="userGroupOption">userGroupOption.xml</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_2.1.0_beta_4.sql b/com.woltlab.wcf/update_2.1.0_beta_4.sql
deleted file mode 100644 (file)
index 5fcd77b..0000000
--- a/com.woltlab.wcf/update_2.1.0_beta_4.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE wcf1_user_menu_item ADD iconClassName VARCHAR(255) NOT NULL DEFAULT '';

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index be92dca46e7a8981b1d32cde9bd59c3293f9b38d..6bd98e09b039970c9f2f87279140ac4337cb3867 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.0 Beta 4 (Typhoon)');
+define('WCF_VERSION', '2.1.0 RC 1 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());
@@ -53,7 +53,7 @@ if (!defined('NO_IMPORTS')) {
  * It holds the database connection, access to template and language engine.
  * 
  * @author     Marcel Werk
- * @copyright  2001-2014 WoltLab GmbH
+ * @copyright  2001-2015 WoltLab GmbH
  * @license    GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @package    com.woltlab.wcf
  * @subpackage system