From 03cbdde1252945f93cb21fdce6f4665e9325bbe4 Mon Sep 17 00:00:00 2001 From: Hakuna Matata Date: Tue, 16 Feb 2016 22:28:58 +0100 Subject: [PATCH] Backport for 14.04.4 --- Makefile | 2 +- data/isolist.ini | 84 ++++++++++++++++++++++++------------------------ debian/changelog | 6 ++++ 3 files changed, 49 insertions(+), 43 deletions(-) diff --git a/Makefile b/Makefile index a0cb2320..e97754ab 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ export SHELL = sh PACKAGE = wubi ICON = data/images/Wubi.ico -VERSION = $(shell head -n 1 debian/changelog | sed -e "s/^$(PACKAGE) (\(.*\)).*/\1/g" | cut -d r -f 1) +VERSION = $(shell head -n 1 debian/changelog | sed -e "s/^$(PACKAGE) (\(.*\)).*/\1/g" | cut -d r -f 1) REVISION = $(shell head -n 1 debian/changelog | sed -e "s/^$(PACKAGE) (\(.*\)).*/\1/g" | cut -d r -f 2) COPYRIGHTYEAR = 2009 AUTHOR = Agostino Russo diff --git a/data/isolist.ini b/data/isolist.ini index 123773ab..3328d641 100644 --- a/data/isolist.ini +++ b/data/isolist.ini @@ -20,9 +20,9 @@ installation_dir=ubuntu arch=i386 name=Ubuntu packages=ubuntu-desktop -metalink=http://releases.ubuntu.com/14.04.3/ubuntu-14.04.3-desktop-i386.metalink -#metalink=http://releases.ubuntu.com/14.04.3/ubuntu-14.04.3-beta-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/daily-live/current/trusty-desktop-i386.metalink +metalink=http://releases.ubuntu.com/14.04.4/ubuntu-14.04.4-desktop-i386.metalink +#metalink=http://releases.ubuntu.com/14.04.4/ubuntu-14.04.4-beta-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.ubuntu.com ordering=1 @@ -31,9 +31,9 @@ arch=amd64 name=Ubuntu packages=ubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://releases.ubuntu.com/14.04.3/ubuntu-14.04.3-desktop-amd64.metalink -#metalink=http://releases.ubuntu.com/14.04.3/ubuntu-14.04.3-beta-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://releases.ubuntu.com/14.04.4/ubuntu-14.04.4-desktop-amd64.metalink +#metalink=http://releases.ubuntu.com/14.04.4/ubuntu-14.04.4-beta-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.ubuntu.com ordering=1 @@ -41,8 +41,8 @@ ordering=1 arch=i386 name=Ubuntu GNOME packages=ubuntu-gnome-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/14.04.3/release/ubuntu-gnome-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/14.04.4/release/ubuntu-gnome-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.ubuntugnome.org ordering=2 @@ -51,8 +51,8 @@ arch=amd64 name=Ubuntu GNOME packages=ubuntu-gnome-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/14.04.3/release/ubuntu-gnome-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-gnome/releases/14.04.4/release/ubuntu-gnome-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/ubuntu-gnome/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.ubuntugnome.org ordering=2 @@ -60,8 +60,8 @@ ordering=2 arch=i386 name=Kubuntu packages=kubuntu-desktop -metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.04.3/release/kubuntu-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.04.4/release/kubuntu-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/kubuntu/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.kubuntu.org ordering=3 @@ -70,8 +70,8 @@ arch=amd64 name=Kubuntu packages=kubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.04.3/release/kubuntu-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/kubuntu/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/kubuntu/releases/14.04.4/release/kubuntu-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/kubuntu/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.kubuntu.org ordering=3 @@ -79,8 +79,8 @@ ordering=3 arch=i386 name=Xubuntu packages=xubuntu-desktop -metalink=http://cdimage.ubuntu.com/xubuntu/releases/14.04.3/release/xubuntu-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/xubuntu/releases/14.04.4/release/xubuntu-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/xubuntu/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.xubuntu.org ordering=4 @@ -89,8 +89,8 @@ arch=amd64 name=Xubuntu packages=xubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/xubuntu/releases/14.04.3/release/xubuntu-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/xubuntu/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/xubuntu/releases/14.04.4/release/xubuntu-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/xubuntu/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.xubuntu.org ordering=4 @@ -98,8 +98,8 @@ ordering=4 arch=i386 name=Mythbuntu packages=ubuntu-standard -metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.04.3/release/mythbuntu-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.04.4/release/mythbuntu-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/mythbuntu/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.mythbuntu.org ordering=5 @@ -108,8 +108,8 @@ arch=amd64 name=Mythbuntu packages=ubuntu-standard kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.04.3/release/mythbuntu-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/mythbuntu/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/mythbuntu/releases/14.04.4/release/mythbuntu-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/mythbuntu/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.mythbuntu.org ordering=5 @@ -121,8 +121,8 @@ min_memory_mb=512 arch=i386 name=Edubuntu packages=edubuntu-desktop -metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.04.3/release/edubuntu-14.04.3-dvd-i386.metalink -metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/trusty-dvd-i386.metalink +metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.04.4/release/edubuntu-14.04.4-dvd-i386.metalink +metalink2=http://cdimage.ubuntu.com/edubuntu/trusty/dvd/current/trusty-dvd-i386.metalink website=http://www.edubuntu.org ordering=6 @@ -135,8 +135,8 @@ arch=amd64 name=Edubuntu packages=edubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.04.3/release/edubuntu-14.04.3-dvd-amd64.metalink -metalink2=http://cdimage.ubuntu.com/edubuntu/dvd/current/trusty-dvd-amd64.metalink +metalink=http://cdimage.ubuntu.com/edubuntu/releases/14.04.4/release/edubuntu-14.04.4-dvd-amd64.metalink +metalink2=http://cdimage.ubuntu.com/edubuntu/trusty/dvd/current/trusty-dvd-amd64.metalink website=http://www.edubuntu.org ordering=6 @@ -144,8 +144,8 @@ ordering=6 arch=i386 name=Lubuntu packages=lubuntu-desktop -metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.04.3/release/lubuntu-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.04.4/release/lubuntu-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/lubuntu/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://lubuntu.net ordering=7 @@ -154,8 +154,8 @@ arch=amd64 name=Lubuntu packages=lubuntu-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.04.3/release/lubuntu-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/lubuntu/releases/14.04.4/release/lubuntu-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/lubuntu/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://lubuntu.net ordering=7 @@ -167,8 +167,8 @@ min_memory_mb=512 arch=i386 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.04.3/release/ubuntustudio-14.04.3-dvd-i386.metalink -metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/trusty-dvd-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.04.4/release/ubuntustudio-14.04.4-dvd-i386.metalink +metalink2=http://cdimage.ubuntu.com/ubuntustudio/trusty/dvd/current/trusty-dvd-i386.metalink website=http://ubuntustudio.org ordering=8 @@ -180,8 +180,8 @@ min_memory_mb=512 arch=amd64 name=Ubuntu Studio packages=ubuntustudio-desktop -metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.04.3/release/ubuntustudio-14.04.3-dvd-amd64.metalink -metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/trusty-dvd-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/14.04.4/release/ubuntustudio-14.04.4-dvd-amd64.metalink +metalink2=http://cdimage.ubuntu.com/ubuntustudio/trusty/dvd/current/trusty-dvd-amd64.metalink website=http://ubuntustudio.org ordering=8 @@ -189,8 +189,8 @@ ordering=8 arch=i386 name=Ubuntu MATE packages=ubuntu-mate-desktop -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/14.04.3/release/ubuntu-mate-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/ubuntu-mate/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/14.04.4/release/ubuntu-mate-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/ubuntu-mate/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://ubuntu-mate.org/ ordering=9 @@ -199,8 +199,8 @@ arch=amd64 name=Ubuntu MATE packages=ubuntu-mate-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/14.04.3/release/ubuntu-mate-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/ubuntu-mate/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntu-mate/releases/14.04.4/release/ubuntu-mate-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/ubuntu-mate/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://ubuntu-mate.org ordering=9 @@ -208,8 +208,8 @@ ordering=9 arch=i386 name=Ubuntu Kylin packages=ubuntukylin-desktop -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/14.04.3/release/ubuntukylin-14.04.3-desktop-i386.metalink -metalink2=http://cdimage.ubuntu.com/ubuntukylin/daily-live/current/trusty-desktop-i386.metalink +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/14.04.4/release/ubuntukylin-14.04.4-desktop-i386.metalink +metalink2=http://cdimage.ubuntu.com/ubuntukylin/trusty/daily-live/current/trusty-desktop-i386.metalink website=http://www.ubuntukylin.com ordering=A @@ -218,7 +218,7 @@ arch=amd64 name=Ubuntu Kylin packages=ubuntukylin-desktop kernel=casper/vmlinuz.efi -metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/14.04.3/release/ubuntukylin-14.04.3-desktop-amd64.metalink -metalink2=http://cdimage.ubuntu.com/ubuntukylin/daily-live/current/trusty-desktop-amd64.metalink +metalink=http://cdimage.ubuntu.com/ubuntukylin/releases/14.04.4/release/ubuntukylin-14.04.4-desktop-amd64.metalink +metalink2=http://cdimage.ubuntu.com/ubuntukylin/trusty/daily-live/current/trusty-desktop-amd64.metalink website=http://www.ubuntukylin.com ordering=A diff --git a/debian/changelog b/debian/changelog index 5018edf8..334fa940 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +wubi (14.04.4r302) trusty; urgency=low + + [Hakuna Matata] + + backport for 14.04.4 + wubi (14.04.3r302) trusty; urgency=low [Hakuna Matata]