From 626dced7a28a54fad5758e94939099f472a61b74 Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Sun, 12 May 2024 11:23:46 +0200
Subject: [PATCH] Replace 'ubuntustudio-dvd' project with an almost identical
 'ubuntustudio' project.

---
 debian/changelog                              |  7 +++++
 live-build/auto/config                        | 26 +++----------------
 .../hooks/020-ubuntu-live.chroot_early        |  0
 3 files changed, 11 insertions(+), 22 deletions(-)
 rename live-build/{ubuntustudio-dvd => ubuntustudio}/hooks/020-ubuntu-live.chroot_early (100%)

diff --git a/debian/changelog b/debian/changelog
index 31a0ae7c..65ca53e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (24.10.2) UNRELEASED; urgency=medium
+
+  * Replace 'ubuntustudio-dvd' project with an almost identical 'ubuntustudio'
+    project.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 09 May 2024 08:54:33 +0200
+
 livecd-rootfs (24.10.1) oracular; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 5b0512e5..ac639945 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -634,7 +634,7 @@ case $PROJECT in
 	edubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
 		COMPONENTS='main restricted universe'
 		;;
-	lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
+	lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio|xubuntu)
 		COMPONENTS='main restricted universe multiverse'
 		;;
 esac
@@ -947,11 +947,10 @@ case $PROJECT in
 		do_layered_desktop_image
 		;;
 
-	ubuntustudio-dvd)
+	ubuntustudio)
 		# By default Ubuntu Studio now ships the new installer.
 		UCFLAVOUR="Ubuntu Studio"
 		STANDARD_TASKS="ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography"
-		LIVE_TASK=ubuntustudio-dvd-live
 		KERNEL_FLAVOURS=lowlatency
 		do_layered_desktop_image
 		;;
@@ -1417,27 +1416,10 @@ Pin-Priority: 500
 EOF
 fi
 
-case $PROJECT:${SUBPROJECT:-} in
-	*-dvd:*)
-		. config/bootstrap
-
-		cat > config/archives/dvd.list.binary << EOF
-deb $LB_PARENT_MIRROR_BINARY $SUITE universe multiverse
-deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-updates universe multiverse
-deb $LB_PARENT_MIRROR_BINARY_SECURITY $SUITE-security universe multiverse
-EOF
-		if [ "$PROPOSED" ]; then
-			cat >> config/archives/dvd.list.binary << EOF
-deb $LB_PARENT_MIRROR_BINARY_VOLATILE $SUITE-proposed universe multiverse
-EOF
-		fi
-		;;
-esac
-
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
 		ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
-		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
+		ubuntustudio:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*| \
 	        ubuntukylin:*|ubuntu-mate:*|ubuntu-core-desktop:*)
 		# Ensure that most things e.g. includes.chroot are copied as is
 		for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
@@ -1473,7 +1455,7 @@ case $PROJECT:${SUBPROJECT:-} in
 esac
 
 case $PROJECT in
-	ubuntu-oem|ubuntustudio-dvd|edubuntu|ubuntu-budgie|ubuntucinnamon| \
+	ubuntu-oem|ubuntustudio|edubuntu|ubuntu-budgie|ubuntucinnamon| \
 	xubuntu|ubuntukylin|ubuntu-mate)
 		cp -af /usr/share/livecd-rootfs/live-build/ubuntu/includes.chroot \
 			config/includes.chroot
diff --git a/live-build/ubuntustudio-dvd/hooks/020-ubuntu-live.chroot_early b/live-build/ubuntustudio/hooks/020-ubuntu-live.chroot_early
similarity index 100%
rename from live-build/ubuntustudio-dvd/hooks/020-ubuntu-live.chroot_early
rename to live-build/ubuntustudio/hooks/020-ubuntu-live.chroot_early