Merge branch 'dead-ubuntu-rtm' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

debian/changelog

@@ -7,6 +7,7 @@ livecd-rootfs (2.590) UNRELEASED; urgency=medium
   * Drop ubuntu-desktop-next hooks
   * Drop ubuntu-touch configs
   * Drop ubuntu-touch hooks
+  * Drop ubuntu-rtm configs
 
  -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 30 May 2019 11:04:02 +0100
 

debian/tests/default-bootstraps

@@ -41,8 +41,6 @@ ALL_TRIPLETS="
  ubuntu-mate-live::
  ubuntu-netbook::
  ubuntu-server::
- ubuntu-server:ubuntu-rtm:
- ubuntu-server:ubuntu-rtm/foo:
  xubuntu::"
 
 if [ -z "$SELECTED_TRIPLETS" ]; then

live-build/auto/config

@@ -1194,22 +1194,6 @@ EOF
 	fi
 fi
 
-case ${SUBPROJECT:-} in
-    ubuntu-rtm|ubuntu-rtm/*)
-	# debootstrap doesn't know about ubuntu-rtm series directly.  Rather
-	# than having to teach it, we employ a few hacks to make it use the
-	# Ubuntu script instead.
-	mkdir -p config/fake_debootstrap_dir/scripts
-	ln -s /usr/share/debootstrap/devices.tar.gz \
-		config/fake_debootstrap_dir/
-	ln -s /usr/share/debootstrap/functions config/fake_debootstrap_dir/
-	ln -s /usr/share/debootstrap/scripts/gutsy \
-		"config/fake_debootstrap_dir/scripts/$SUITE"
-	echo 'export DEBOOTSTRAP_DIR="$PWD/config/fake_debootstrap_dir"' \
-		>> config/bootstrap
-	;;
-esac
-
 if [ "$PREINSTALLED" = "true" ]; then
 	if [ -n "$PREINSTALL_POOL_SEEDS" ]; then
 		UNWANTED_SEEDS="${LIVE_TASK:+$LIVE_TASK }boot installer required"