From 305d5cef5076524ae143867e869539dda4c11947 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Fri, 1 Feb 2019 18:07:58 +0000
Subject: [PATCH] Drop code to handle buildd images for <disco

We'll deal with those in stable updates instead.
---
 debian/changelog       |  2 ++
 live-build/auto/config | 31 ++-----------------------------
 2 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71c1f96d..4c7eba5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 livecd-rootfs (2.560) UNRELEASED; urgency=medium
 
   * Disable merged /usr in buildd images.
+  * Drop code to handle building buildd images for series earlier than
+    disco; we'll deal with those in stable updates instead.
 
  -- Colin Watson <cjwatson@ubuntu.com>  Fri, 01 Feb 2019 18:01:56 +0000
 
diff --git a/live-build/auto/config b/live-build/auto/config
index b36977be..bb0bf8ca 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -859,35 +859,8 @@ case $SUBPROJECT in
 		add_package install policyrcd-script-zg2
 		add_package install pkgbinarymangler
 		add_package install ca-certificates
-		case $SUITE in
-			precise|trusty|xenial)
-				;;
-			*)
-				# only needed in >= bionic
-				add_package install gpg
-				add_package install gpg-agent
-				;;
-		esac
-		case $SUITE in
-			precise|trusty|xenial)
-				# no longer needed in >= artful
-				add_package install pkg-create-dbgsym
-				# no longer needed in >= bionic
-				add_package install apt-transport-https
-				# no longer needed in >= cosmic
-				add_package install tzdata
-				;;
-			artful)
-				# no longer needed in >= bionic
-				add_package install apt-transport-https
-				# no longer needed in >= cosmic
-				add_package install tzdata
-				;;
-			bionic)
-				# no longer needed in >= cosmic
-				add_package install tzdata
-				;;
-		esac
+		add_package install gpg
+		add_package install gpg-agent
 		add_package install fakeroot
 		add_package install build-essential
 		# Needed for LXD-based builds.