Imported 2.693

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.693) groovy; urgency=medium
+
+  * Build classic raspi server images by default from the 'classic' branch now.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 19 Oct 2020 12:58:15 +0200
+
 livecd-rootfs (2.692) groovy; urgency=medium
 
   * Create a 1GB swapfile for the raspi desktop images. 

live-build/auto/config

@@ -434,17 +434,13 @@ case $IMAGEFORMAT in
 			# classic images
 
 			# Certain models have different names but are built from the same source gadget tree
-			BRANCH=18
 			case $MODEL in
 				pi-arm64|pi3-arm64)
 					MODEL=pi
-					BRANCH=18-arm64
-					;;
-				pi)
-					BRANCH=18-armhf
 					;;
 			esac
 
+			BRANCH="classic"
 			if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then
 				BRANCH="desktop"
 			fi