Merge branch 'dead-jasper' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

This commit is contained in:
Dimitri John Ledkov 2019-06-04 23:38:32 +01:00
commit b0312baeb7
2 changed files with 1 additions and 13 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (2.590) UNRELEASED; urgency=medium
* Drop dead wubi subproject.
* Drop dead jasper subproject.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 30 May 2019 11:04:02 +0100

View File

@ -302,19 +302,6 @@ case $IMAGEFORMAT in
ext2|ext3|ext4)
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
PREINSTALLED=true
case ${SUBPROJECT:-} in
*)
case $PROJECT in
ubuntu-cpc)
;;
*)
add_package live jasper
;;
esac
;;
esac
;;
plain)
case $PROJECT:${SUBPROJECT:-} in
ubuntu-server:live)