Preparing release 2.1.0 Beta 3

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index f2ca76e645de3445c5bf3c7dc35c6d93293d7d31..9cc76f323e57eed674ce84ed17d5712742f7f7fd 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 2</version> <!-- codename: typhoon -->
-               <date>2014-12-18</date>
+               <version>2.1.0 Beta 3</version> <!-- codename: typhoon -->
+               <date>2015-01-13</date>
        </packageinformation>
        
        <authorinformation>
@@ -89,13 +89,13 @@
        </instructions>
        -->
        
-       <instructions type="update" fromversion="2.1.0 Beta 1">
+       <instructions type="update" fromversion="2.1.0 Beta 2">
                <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="option">option.xml</instruction>
+               <instruction type="sql">update_2.1.0_beta_2.sql</instruction>
        </instructions>
 </package>

diff --git a/com.woltlab.wcf/update_2.1.0_beta_2.sql b/com.woltlab.wcf/update_2.1.0_beta_2.sql
new file mode 100644 (file)
index 0000000..6d0ffaf
--- /dev/null
+++ b/com.woltlab.wcf/update_2.1.0_beta_2.sql
@@ -0,0 +1,2 @@
+ALTER TABLE wcf1_package_update_server ADD apiVersion ENUM('2.0', '2.1') NOT NULL DEFAULT '2.0';
+ALTER TABLE wcf1_package_update_server ADD metaData TEXT;
\ No newline at end of file

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index d4a96db086a72b1e783386e5dd77f81df4200cc6..9cb8038dfd6e69e4e2794c1e5372e74968ce7e92 100644 (file)
--- 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.1.0 Beta 2 (Typhoon)');
+define('WCF_VERSION', '2.1.0 Beta 3 (Typhoon)');
 
 // define current unix timestamp
 define('TIME_NOW', time());