diff --git a/Makefile b/Makefile index da50283..07c2d89 100644 --- a/Makefile +++ b/Makefile @@ -207,6 +207,7 @@ install-hooks: -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d trusty.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d utopic.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d vivid.d + -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d wily.d cp hooks/common.sh ${prefix}/usr/share/xen-tools cp -r hooks/common ${prefix}/usr/share/xen-tools diff --git a/README.markdown b/README.markdown index 44696eb..aa70751 100644 --- a/README.markdown +++ b/README.markdown @@ -62,7 +62,8 @@ known to work reliably, i.e.: * Saucy Salamander 13.10 * Trusty Tahr 14.04 (LTS) * Utopic Unicorn 14.10 -* Vivid Vervet 15.04 (under development) +* Vivid Vervet 15.04 +* Wily Werewolf 15.10 (under development) [1]: http://bugs.debian.org/659360 "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier" diff --git a/bin/xen-create-image b/bin/xen-create-image index d25a900..18a2c73 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1258,10 +1258,10 @@ sub setupDefaultOptions $CONFIG{ 'mirror_'.$debdist } = 'http://httpredir.debian.org/debian-archive/debian'; } # Initialize per distribution mirror defaults: Ubuntu - foreach my $ubuntudist (qw(lucid precise trusty utopic vivid)) { + foreach my $ubuntudist (qw(precise trusty utopic vivid wily)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } - foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric quantal raring saucy)) { + foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic lucid maverick natty oneiric quantal raring saucy)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu'; } $CONFIG{ 'apt_proxy' } = ''; @@ -1753,7 +1753,7 @@ sub checkArguments # # Lucid and probably all later Ubuntus, too, don't work without pygrub # - if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid/ ) + if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring|saucy|trusty|utopic|vivid|wily/ ) { $CONFIG{ 'pygrub' } = 1; } diff --git a/debian/changelog b/debian/changelog index 2a65411..9e8b356 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,9 @@ xen-tools (4.5+dev-1) UNRELEASED; urgency=medium + Fix usage of nonexistent variable in removeDebianPackage (Closes: #774936) Thanks Lukas Schwaighofer! + Change all occurrences of http.debian.net to httpredir.debian.org - + Preliminary support for Debian 9 Stretch. + + Ubuntu Lucid Lynx is now EoL + + Preliminary support for Debian 9 Stretch and Ubuntu 15.10 Wily + Werewolf. + Installs bash completion into /usr/share/bash-completion/ (fixes lintian warning package-install-into-obsolete-dir) + Allows # within configuration file comments. (Closes: #783060; diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index c9d343d..53e9d5c 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -286,7 +286,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_intrepid = http://old-releases.ubuntu.com/ubuntu # mirror_jaunty = http://old-releases.ubuntu.com/ubuntu # mirror_karmic = http://old-releases.ubuntu.com/ubuntu -# mirror_lucid = http://archive.ubuntu.com/ubuntu +# mirror_lucid = http://old-releases.ubuntu.com/ubuntu # mirror_maverick = http://old-releases.ubuntu.com/ubuntu # mirror_natty = http://old-releases.ubuntu.com/ubuntu # mirror_oneiric = http://archive.ubuntu.com/ubuntu @@ -297,6 +297,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_trusty = http://archive.ubuntu.com/ubuntu # mirror_utopic = http://archive.ubuntu.com/ubuntu # mirror_vivid = http://archive.ubuntu.com/ubuntu +# mirror_wily = http://archive.ubuntu.com/ubuntu # If this is defined it will be used by debootstrap, and configured as the # proxy for the guest