From c86284f83dcbd4a7081d854deea86a4673899eaa Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Fri, 29 Nov 2019 21:47:02 -0800 Subject: [PATCH] Also make the ubuntu-image dependency arch-conditional, since ubuntu-image pulls in snapd. --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 563498d6..81dc3028 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.628) UNRELEASED; urgency=medium + + * Also make the ubuntu-image dependency arch-conditional, since + ubuntu-image pulls in snapd. + + -- Steve Langasek Fri, 29 Nov 2019 21:46:45 -0800 + livecd-rootfs (2.627) focal; urgency=medium * Don't depend on snapd on i386, since i386 support in focal is only for diff --git a/debian/control b/debian/control index d83e22a6..b887f8d8 100644 --- a/debian/control +++ b/debian/control @@ -38,7 +38,7 @@ Depends: ${misc:Depends}, squashfs-tools (>= 1:3.3-1), sudo, u-boot-tools [armhf arm64], - ubuntu-image, + ubuntu-image [!i386], python3-vmdkstream [amd64 i386], xz-utils, zerofree