diff --git a/debian/changelog b/debian/changelog index 924dc2b0..f08d6a8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.590) UNRELEASED; urgency=medium + + * Drop dead wubi subproject. + + -- Dimitri John Ledkov Thu, 30 May 2019 11:04:02 +0100 + livecd-rootfs (2.589) eoan; urgency=medium * Add support for the 'kassel' subflavor of UC18 images. diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps index 752d6404..6f447618 100755 --- a/debian/tests/default-bootstraps +++ b/debian/tests/default-bootstraps @@ -45,7 +45,6 @@ ALL_TRIPLETS=" ubuntu-server:: ubuntu-server:ubuntu-rtm: ubuntu-server:ubuntu-rtm/foo: - ubuntu-server:wubi: ubuntu-touch-custom::ubuntu-touch-custom ubuntu-touch::ubuntu-touch xubuntu::" diff --git a/live-build/auto/config b/live-build/auto/config index 70b4a420..350cf84c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -303,10 +303,6 @@ case $IMAGEFORMAT in OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT" PREINSTALLED=true case ${SUBPROJECT:-} in - wubi) - add_package install lupin-support - COMPONENTS='main restricted universe multiverse' - ;; *) case $PROJECT in ubuntu-cpc) @@ -1030,12 +1026,6 @@ case $PROJECT in ;; esac -case ${SUBPROJECT:-} in - wubi) - add_binary_hook build-wubildr - ;; -esac - lb config noauto \ --mode ubuntu \ --distribution "$SUITE" \