From 3a123b489ffff25ab94078dba9d239bc7ece5c66 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 27 Sep 2024 16:13:48 +0200
Subject: [PATCH] Release 6.1.0 Beta 2

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

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index 14153a89d1..f071c0195c 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -5,8 +5,8 @@
 		<packagedescription>Free CMS and web-framework, designed for awesome websites and communities.</packagedescription>
 		<packagedescription language="de">Freies CMS und Web-Framework, das eindrucksvolle Websites und Communities ermöglicht.</packagedescription>
 		<isapplication>1</isapplication>
-		<version>6.1.0 Beta 1</version>
-		<date>2024-08-30</date>
+		<version>6.1.0 Beta 2</version>
+		<date>2024-09-27</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,14 +50,21 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.1.0 Alpha 3">
-		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
-		<instruction type="file">files_update.tar</instruction>
-		<instruction type="template">templates_update.tar</instruction>
-	</instructions>
-
 	<instructions type="update" fromversion="6.1.0 Beta 1">
 		<!-- https://github.com/WoltLab/WCF/issues/5996 -->
 		<instruction type="acpTemplate"/>
+
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
+
+		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1.0_beta_2_migrateStaticFiles.php</instruction>
+		
+		<instruction type="language"/>
+		<instruction type="page"/>
+		<instruction type="menuItem"/>
+		<instruction type="acpTemplateDelete"/>
+		<instruction type="box"/>
+		<instruction type="fileDelete"/>
+		<instruction type="option"/>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index e1d85bb64e..19d3497cfd 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -79,7 +79,7 @@
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.0 Beta 1');
+\define('WCF_VERSION', '6.1.0 Beta 2');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());