Remove crufty files after minimize-manual

minimize-manual would be creating those files again, and other
parts may be creating them, so best to do the cleanup at the
very end.

LP: #1826377

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.525.21) UNRELEASED; urgency=medium
+
+  * Remove crufty files after minimize-manual (LP: #1826377)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 26 Apr 2019 10:39:49 +0200
+
 livecd-rootfs (2.525.20) bionic; urgency=medium
 
   [ Steve Langasek ]

live-build/auto/build

@@ -254,10 +254,6 @@ EOF
 			apt-get -y --purge autoremove"
 	fi
 
-	# remove crufty files that shouldn't be left in an image
-	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
-	Chroot chroot apt clean
-
 	if [ -f config/universe-enabled ]; then
 
 # This is cargo-culted almost verbatim (with some syntax changes for
@@ -437,6 +433,10 @@ EOF
 
 	/usr/share/livecd-rootfs/minimize-manual chroot
 
+	# remove crufty files that shouldn't be left in an image
+	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
+	Chroot chroot apt clean
+
 	lb binary "$@"
 	touch binary.success
 ) 2>&1 | tee binary.log