From 0dc9cf4ba8068fd0f83f74bbfb82f98db95a2023 Mon Sep 17 00:00:00 2001
From: Alexander Ebert <ebert@woltlab.com>
Date: Tue, 20 Aug 2024 17:26:25 +0200
Subject: [PATCH] Release 6.1.0 Alpha 2

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

diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index aeff9df89b..706a5ce766 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 Alpha 1</version>
-		<date>2024-08-14</date>
+		<version>6.1.0 Alpha 2</version>
+		<date>2024-08-20</date>
 	</packageinformation>
 
 	<authorinformation>
@@ -50,52 +50,10 @@
 		<instruction type="script">acp/install_com.woltlab.wcf_step2.php</instruction>
 	</instructions>
 
-	<instructions type="update" fromversion="6.0.*">
-		<!--
-tar cvf com.woltlab.wcf/files_pre_check.tar -C wcfsetup/install/files/ \
-	acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php \
-	acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php \
-	acp/update_com.woltlab.wcf_6.1_sharedTemplate.php \
-	acp/database/update_com.woltlab.wcf_6.1.php
-		-->
-		<instruction type="file">files_pre_check.tar</instruction>
-
-		<!-- Checks that need to happen before the upgrade starts. -->
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_checkSystemRequirements.php</instruction>
-
-		<!-- Required for the shared templates. -->
-		<instruction type="script">acp/update_com.woltlab.wcf_6.1_sharedTemplate.php</instruction>
-
-		<!-- Clean up any duplicate entries in the message embedded objects table. -->
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_messageEmbeddedObject.php</instruction>
-
-		<!-- Migrate the database as early as possible. -->
-		<instruction type="database">acp/database/update_com.woltlab.wcf_6.1.php</instruction>
-
-		<!-- Deploy the new application code. -->
-		<instruction type="file"/>
-		<instruction type="acpTemplate"/>
-		<instruction type="template"/>
-
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_spider_step1.php</instruction>
-		<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.1_spider_step2.php</instruction>
-
+	<instructions type="update" fromversion="6.1.0 Alpha 1">
+		<instruction type="acpTemplate">acptemplates_update.tar</instruction>
+		<instruction type="file">files_update.tar</instruction>
+		<instruction type="template">templates_update.tar</instruction>
 		<instruction type="language"/>
-		<instruction type="objectTypeDefinition"/>
-		<instruction type="objectType"/>
-		<instruction type="page"/>
-		<instruction type="userGroupOption"/>
-		<instruction type="userProfileMenu"/>
-		<instruction type="bbcode"/>
-		<instruction type="acpTemplateDelete"/>
-		<instruction type="fileDelete"/>
-		<instruction type="userMenu"/>
-		<instruction type="option"/>
-		<instruction type="templateDelete"/>
-		<instruction type="cronjob"/>
-		<instruction type="userOption"/>
-		<instruction type="userNotificationEvent"/>
-
-		<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.1_serviceWorker.php</instruction>
 	</instructions>
 </package>
diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index c50861e366..1514d6a910 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -79,7 +79,7 @@ if (\function_exists('mb_regex_encoding')) {
 \mb_language('uni');
 
 // define current woltlab suite version
-\define('WCF_VERSION', '6.1.0 Alpha 1');
+\define('WCF_VERSION', '6.1.0 Alpha 2');
 
 // define current unix timestamp
 \define('TIME_NOW', \time());
-- 
2.20.1