From f2d858b2c089e9f39bf30cfa030a0ae2decf6812 Mon Sep 17 00:00:00 2001 From: Sarah Hobbs Date: Fri, 30 Nov 2007 14:49:19 +1100 Subject: [PATCH 01/30] xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5 --- livecd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd.sh b/livecd.sh index 074b0f0f..48604496 100755 --- a/livecd.sh +++ b/livecd.sh @@ -182,7 +182,7 @@ Flags: seen LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; xubuntu) - LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-4 xubuntu-desktop^" + LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-5 xubuntu-desktop^" LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; gobuntu) From d1a8f517faadea1c46f0ce49e56e03cc7677ff6f Mon Sep 17 00:00:00 2001 From: Sarah Hobbs Date: Fri, 30 Nov 2007 14:52:49 +1100 Subject: [PATCH 02/30] And let's actually modify the changelog too --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index fc2b6e1d..86fc5cc4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.44) hardy; urgency=low + + * xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5 + + -- Sarah Hobbs Fri, 30 Nov 2007 14:52:29 +1100 + livecd-rootfs (0.43) hardy; urgency=low * Add Gobuntu support. From f743014762b819ae20fe5d300d236a5ac464fd02 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Tue, 11 Dec 2007 15:54:26 +0000 Subject: [PATCH 03/30] * Vcs-Bzr is now an official field. Use an unauthenticated URL for it. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 86fc5cc4..7c09d7de 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.45) UNRELEASED; urgency=low + + * Vcs-Bzr is now an official field. Use an unauthenticated URL for it. + + -- Colin Watson Tue, 11 Dec 2007 15:53:51 +0000 + livecd-rootfs (0.44) hardy; urgency=low * xubuntu seed change - libgoffice-gtk-0-4 --> libgoffice-gtk-0-5 diff --git a/debian/control b/debian/control index 1e3ef726..780fdfe5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Build-Depends: debhelper (>=4) Maintainer: Adam Conrad Standards-Version: 3.6.1.0 -XS-Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all From a2db2b645b90fb4d74046beb74df34b2a1d58db1 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 19 Dec 2007 01:21:23 +0200 Subject: [PATCH 04/30] livecd.sh: Leave a token empty xorg.conf in place to let xserver-xorg postinst know it needs to regenerate it. (LP: #174537) --- debian/changelog | 7 ++++++- livecd.sh | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7c09d7de..0ecae7b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ livecd-rootfs (0.45) UNRELEASED; urgency=low + [ Colin Watson ] * Vcs-Bzr is now an official field. Use an unauthenticated URL for it. - -- Colin Watson Tue, 11 Dec 2007 15:53:51 +0000 + [ Bryce Harrington ] + * livecd.sh: Leave a token empty xorg.conf in place to let + xserver-xorg postinst know it needs to regenerate it. (LP: #174537) + + -- Timo Aaltonen Wed, 19 Dec 2007 01:20:53 +0200 livecd-rootfs (0.44) hardy; urgency=low diff --git a/livecd.sh b/livecd.sh index 48604496..59c4960c 100755 --- a/livecd.sh +++ b/livecd.sh @@ -358,6 +358,8 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} # get rid of the .debs - we don't need them. chroot ${ROOT} apt-get clean rm -f ${ROOT}etc/X11/xorg.conf + # Restore an empty xorg.conf, else xserver-xorg postinst will be confused + touch ${ROOT}etc/X11/xorg.conf rm -f ${ROOT}var/lib/apt/lists/*_* rm -f ${ROOT}var/spool/postfix/maildrop/* # Removing update-notifier notes is now considered harmful: From 0305b62062330dacf383b0b07668fee8ee950316 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 19 Dec 2007 01:24:08 +0200 Subject: [PATCH 05/30] release version 0.45 --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ecae7b6..2220e55d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ -livecd-rootfs (0.45) UNRELEASED; urgency=low +livecd-rootfs (0.45) hardy; urgency=low [ Colin Watson ] * Vcs-Bzr is now an official field. Use an unauthenticated URL for it. [ Bryce Harrington ] - * livecd.sh: Leave a token empty xorg.conf in place to let + * livecd.sh: Leave a token empty xorg.conf in place to let xserver-xorg postinst know it needs to regenerate it. (LP: #174537) - -- Timo Aaltonen Wed, 19 Dec 2007 01:20:53 +0200 + -- Timo Aaltonen Wed, 19 Dec 2007 01:23:32 +0200 livecd-rootfs (0.44) hardy; urgency=low From 8bcf2f653fc23756013156e2f267563fa89b6e92 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 20 Dec 2007 12:06:07 +0100 Subject: [PATCH 06/30] * Use -nolzma option of mksquashfs, since our current kernel squashfs module does not support it yet (see LP #177634). Bump dependency to squashfs-tools to ensure availability of that option. --- debian/changelog | 8 ++++++++ debian/control | 2 +- livecd.sh | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2220e55d..7b80139f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (0.46) UNRELEASED; urgency=low + + * Use -nolzma option of mksquashfs, since our current kernel squashfs module + does not support it yet (see LP #177634). Bump dependency to + squashfs-tools to ensure availability of that option. + + -- Martin Pitt Thu, 20 Dec 2007 12:03:41 +0100 + livecd-rootfs (0.45) hardy; urgency=low [ Colin Watson ] diff --git a/debian/control b/debian/control index 780fdfe5..131f3e80 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all -Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools, grep-dctrl, fdupes +Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3.1), grep-dctrl, fdupes Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem diff --git a/livecd.sh b/livecd.sh index 59c4960c..99663411 100755 --- a/livecd.sh +++ b/livecd.sh @@ -429,7 +429,7 @@ deb-src ${SECSRCMIRROR} ${STE}-security ${COMP} : > livecd.${FSS}.sort fi - mksquashfs ${ROOT} livecd.${FSS}.squashfs -sort livecd.${FSS}.sort + mksquashfs ${ROOT} livecd.${FSS}.squashfs -nolzma -sort livecd.${FSS}.sort chmod 644 livecd.${FSS}.squashfs } From 3a4f8438d8ddff37f568e96068895c6ff7fd4bd5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 20 Dec 2007 12:07:06 +0100 Subject: [PATCH 07/30] release as 0.46 to hardy --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7b80139f..57755b4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (0.46) UNRELEASED; urgency=low +livecd-rootfs (0.46) hardy; urgency=low * Use -nolzma option of mksquashfs, since our current kernel squashfs module does not support it yet (see LP #177634). Bump dependency to From 633fbb35408f88d26921b1472ae024b71b13d4f5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 20 Dec 2007 14:18:17 +0100 Subject: [PATCH 08/30] * Fix versioned dependency to squashfs-tools. "." != "-", silly me. --- debian/changelog | 6 ++++++ debian/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57755b4a..8b49a8fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.47) UNRELEASED; urgency=low + + * Fix versioned dependency to squashfs-tools. "." != "-", silly me. + + -- Martin Pitt Thu, 20 Dec 2007 14:17:47 +0100 + livecd-rootfs (0.46) hardy; urgency=low * Use -nolzma option of mksquashfs, since our current kernel squashfs module diff --git a/debian/control b/debian/control index 131f3e80..f33e7a18 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk Package: livecd-rootfs Architecture: all -Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3.1), grep-dctrl, fdupes +Depends: debootstrap, rsync, python-minimal | python, procps, squashfs-tools (>= 1:3.3-1), grep-dctrl, fdupes Suggests: partimage Description: construction script for the livecd rootfs livecd-rootfs provides the script used to create the root filesystem From 13e69c848889790d75977a5d2cba0846d0e12314 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 20 Dec 2007 14:18:30 +0100 Subject: [PATCH 09/30] release as 0.47 to hardy --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8b49a8fd..2a225408 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (0.47) UNRELEASED; urgency=low +livecd-rootfs (0.47) hardy; urgency=low * Fix versioned dependency to squashfs-tools. "." != "-", silly me. From bf8c2f17619847dcd1dc39fe2b1b9f01dff54ac8 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 21 Dec 2007 03:19:20 +0100 Subject: [PATCH 10/30] fix typo in getopts call --- debian/changelog | 6 ++++++ livecd.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2a225408..2c905991 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.48) hardy; urgency=low + + * fix typo in getopts call so the -m and -S options are recognized + + -- Oliver Grawert Fri, 21 Dec 2007 03:16:51 +0100 + livecd-rootfs (0.47) hardy; urgency=low * Fix versioned dependency to squashfs-tools. "." != "-", silly me. diff --git a/livecd.sh b/livecd.sh index 99663411..087d9670 100755 --- a/livecd.sh +++ b/livecd.sh @@ -115,7 +115,7 @@ EXCLUDE="" LIST="" SUBARCH="" -while getopts :d:e:i:I:mS::s: name; do case $name in +while getopts :d:e:i:I:m:S:s: name; do case $name in d) STE=$OPTARG;; e) EXCLUDE="$EXCLUDE $OPTARG";; i) LIST="$LIST $OPTARG";; From b4e3074b81780a594cdb356af07ff0fa84449fc3 Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 25 Jan 2008 17:38:31 +0100 Subject: [PATCH 11/30] drop non-existent sanitize command from option parser --- livecd.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/livecd.sh b/livecd.sh index 087d9670..e38e9643 100755 --- a/livecd.sh +++ b/livecd.sh @@ -119,9 +119,9 @@ while getopts :d:e:i:I:m:S:s: name; do case $name in d) STE=$OPTARG;; e) EXCLUDE="$EXCLUDE $OPTARG";; i) LIST="$LIST $OPTARG";; - I) UINUM=$(sanitize int "$OPTARG");; - m) OPTMIRROR=$(sanitize url "$OPTARG");; - S) USZ=$(sanitize int "$OPTARG");; + I) UINUM="$OPTARG";; + m) OPTMIRROR="$OPTARG";; + S) USZ="$OPTARG";; s) SUBARCH="$OPTARG";; \?) echo bad usage >&2; exit 2;; \:) echo missing argument >&2; exit 2;; From 2892b6ba74fba905dabd8ed937472c56f54a07eb Mon Sep 17 00:00:00 2001 From: Oliver Grawert Date: Fri, 25 Jan 2008 17:43:09 +0100 Subject: [PATCH 12/30] release option parser fixes as 0.48 package --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2c905991..fa5e1bcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ livecd-rootfs (0.48) hardy; urgency=low * fix typo in getopts call so the -m and -S options are recognized + * drop call to non-existent sanitize command (LP: #179130) - -- Oliver Grawert Fri, 21 Dec 2007 03:16:51 +0100 + -- Oliver Grawert Fri, 25 Jan 2008 17:40:57 +0100 livecd-rootfs (0.47) hardy; urgency=low From 5c5bd781a61c6e46ec982030aa82fb4d74f824d8 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 28 Jan 2008 16:32:29 +0000 Subject: [PATCH 13/30] * Allow Xubuntu to build against universe and multiverse. --- debian/changelog | 6 ++++++ livecd.sh | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index fa5e1bcb..9c4b7307 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.49) UNRELEASED; urgency=low + + * Allow Xubuntu to build against universe and multiverse. + + -- Colin Watson Mon, 28 Jan 2008 16:31:53 +0000 + livecd-rootfs (0.48) hardy; urgency=low * fix typo in getopts call so the -m and -S options are recognized diff --git a/livecd.sh b/livecd.sh index e38e9643..1fc2aa02 100755 --- a/livecd.sh +++ b/livecd.sh @@ -184,6 +184,7 @@ Flags: seen xubuntu) LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-5 xubuntu-desktop^" LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" + COMP="main restricted universe multiverse" ;; gobuntu) LIST="$LIST minimal^ standard^ gobuntu-desktop^" From 1777e19523e5960c665e35d0a73bc73ed56bc24b Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 28 Jan 2008 16:34:22 +0000 Subject: [PATCH 14/30] releasing version 0.49 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9c4b7307..57935e7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (0.49) UNRELEASED; urgency=low +livecd-rootfs (0.49) hardy; urgency=low * Allow Xubuntu to build against universe and multiverse. - -- Colin Watson Mon, 28 Jan 2008 16:31:53 +0000 + -- Colin Watson Mon, 28 Jan 2008 16:33:06 +0000 livecd-rootfs (0.48) hardy; urgency=low From cfb405d65ab0c9397b68b40b8b1fccb8baa59c5d Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 31 Jan 2008 17:22:01 +0000 Subject: [PATCH 15/30] * Switch Xubuntu to libgoffice-gtk-0-6. --- debian/changelog | 6 ++++++ livecd.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 57935e7e..a9197872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.49ubuntu1) UNRELEASED; urgency=low + + * Switch Xubuntu to libgoffice-gtk-0-6. + + -- Colin Watson Thu, 31 Jan 2008 17:21:20 +0000 + livecd-rootfs (0.49) hardy; urgency=low * Allow Xubuntu to build against universe and multiverse. diff --git a/livecd.sh b/livecd.sh index 1fc2aa02..90d1b0ad 100755 --- a/livecd.sh +++ b/livecd.sh @@ -182,7 +182,7 @@ Flags: seen LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; xubuntu) - LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-5 xubuntu-desktop^" + LIST="$LIST minimal^ standard^ xterm libgoffice-gtk-0-6 xubuntu-desktop^" LIVELIST="xubuntu-live^ xresprobe laptop-detect casper lupin-casper" COMP="main restricted universe multiverse" ;; From f27bfbc23c14c4173f8ad49a9fe3c910b2711375 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Thu, 31 Jan 2008 17:23:15 +0000 Subject: [PATCH 16/30] releasing version 0.50 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a9197872..3f0a40d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (0.49ubuntu1) UNRELEASED; urgency=low +livecd-rootfs (0.50) hardy; urgency=low * Switch Xubuntu to libgoffice-gtk-0-6. - -- Colin Watson Thu, 31 Jan 2008 17:21:20 +0000 + -- Colin Watson Thu, 31 Jan 2008 17:22:35 +0000 livecd-rootfs (0.49) hardy; urgency=low From 3b61dd944c66dca6769f331112a555c2142f0e25 Mon Sep 17 00:00:00 2001 From: jr Date: Wed, 13 Feb 2008 14:40:48 +0000 Subject: [PATCH 17/30] add kubuntu-kde4 --- BuildLiveCD | 4 ++-- livecd.sh | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/BuildLiveCD b/BuildLiveCD index 54462949..d4147f5c 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -55,9 +55,9 @@ if [ -z "$SUITES" ]; then echo "No valid suites to build for" >&2 && exit 1 fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu edubuntu xubuntu base + set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu base + set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu base fi fi diff --git a/livecd.sh b/livecd.sh index 90d1b0ad..58cf1afa 100755 --- a/livecd.sh +++ b/livecd.sh @@ -129,15 +129,15 @@ esac; done; shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then - set -- ubuntu kubuntu edubuntu xubuntu gobuntu base + set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu edubuntu xubuntu gobuntu base + set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base fi fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-lpia|edubuntu|kubuntu|xubuntu|gobuntu|base|tocd) + ubuntu|ubuntu-lpia|edubuntu|kubuntu|kubuntu-kde4|xubuntu|gobuntu|base|tocd) ;; *) echo bad name >&2; @@ -177,6 +177,10 @@ Flags: seen LIST="$LIST minimal^ standard^ kubuntu-desktop^" LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; + kubuntu-kde4) + LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^" + LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" + ;; edubuntu) LIST="$LIST minimal^ standard^ edubuntu-desktop^" LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" From 84a9ce7eddadbb289976948b03f224a731e0d56e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 13 Feb 2008 17:57:22 -0800 Subject: [PATCH 18/30] changelog entry for KDE changes --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3f0a40d6..6c8e3d78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.51) UNRELEASED; urgency=low + + [Jonathan Riddell] + * Add kubuntu-kde4 + + -- Steve Langasek Wed, 13 Feb 2008 14:08:35 -0800 + livecd-rootfs (0.50) hardy; urgency=low * Switch Xubuntu to libgoffice-gtk-0-6. From c070cb790d0bf0dd76e707063c26ce631815d037 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 13 Feb 2008 17:59:17 -0800 Subject: [PATCH 19/30] * Add new targets for {k,ed,}ubuntu-dvd --- debian/changelog | 5 ++++- livecd.sh | 15 ++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6c8e3d78..c4a75922 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,11 @@ livecd-rootfs (0.51) UNRELEASED; urgency=low - [Jonathan Riddell] + [ Jonathan Riddell ] * Add kubuntu-kde4 + [ Steve Langasek ] + * Add new targets for {k,ed,}ubuntu-dvd + -- Steve Langasek Wed, 13 Feb 2008 14:08:35 -0800 livecd-rootfs (0.50) hardy; urgency=low diff --git a/livecd.sh b/livecd.sh index 58cf1afa..9232ff66 100755 --- a/livecd.sh +++ b/livecd.sh @@ -131,13 +131,13 @@ shift $((OPTIND-1)) if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu gobuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu gobuntu base fi fi for arg in "$@"; do case "$arg" in - ubuntu|ubuntu-lpia|edubuntu|kubuntu|kubuntu-kde4|xubuntu|gobuntu|base|tocd) + ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|gobuntu|base|tocd) ;; *) echo bad name >&2; @@ -169,11 +169,11 @@ Flags: seen @@EOF case "$FS" in - ubuntu|ubuntu-lpia) + ubuntu|ubuntu-lpia|ubuntu-dvd) LIST="$LIST minimal^ standard^ ubuntu-desktop^" LIVELIST="ubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; - kubuntu) + kubuntu|kubuntu-dvd) LIST="$LIST minimal^ standard^ kubuntu-desktop^" LIVELIST="kubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; @@ -181,7 +181,7 @@ Flags: seen LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^" LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" ;; - edubuntu) + edubuntu|edubuntu-dvd) LIST="$LIST minimal^ standard^ edubuntu-desktop^" LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper" ;; @@ -223,6 +223,11 @@ Flags: seen LIST="$LIST $tocddesktop" LIVELIST="$tocdlive casper" esac + case "$FS" in + *-dvd) + LIVELIST="$LIVELIST ${FS}-live" + ;; + esac dpkg -l livecd-rootfs || true # get our version # in the log. if [ "$FS" != "ubuntu-lpia" ]; then From 3a99ea27037a8abe31f47ef3d81ccc5028687f89 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 14 Feb 2008 10:10:43 -0800 Subject: [PATCH 20/30] mark $foo-dvd-live as a task; thanks to Adam Conrad for the catch --- livecd.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livecd.sh b/livecd.sh index 9232ff66..f91006ed 100755 --- a/livecd.sh +++ b/livecd.sh @@ -225,7 +225,7 @@ Flags: seen esac case "$FS" in *-dvd) - LIVELIST="$LIVELIST ${FS}-live" + LIVELIST="$LIVELIST ${FS}-live^" ;; esac From 21a85b55a249d8aea7256e8f6b86f9df3287b578 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 14 Feb 2008 10:14:56 -0800 Subject: [PATCH 21/30] add the dvd flavors to BuildLiveCD's "all" target --- BuildLiveCD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index d4147f5c..7e8a790a 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -57,7 +57,7 @@ fi if (( $# == 0 )) || [ "X$1" = "Xall" ]; then set -- ubuntu kubuntu kubuntu-kde4 edubuntu xubuntu base if [ "$ARCH" = "i386" ]; then - set -- ubuntu ubuntu-lpia kubuntu kubuntu-kde4 edubuntu xubuntu base + set -- ubuntu ubuntu-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu base fi fi From e16758850afa2a6e5368b82be602c07a31a63b98 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 14 Feb 2008 10:15:53 -0800 Subject: [PATCH 22/30] release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c4a75922..1c94cccd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (0.51) UNRELEASED; urgency=low +livecd-rootfs (0.51) hardy; urgency=low [ Jonathan Riddell ] * Add kubuntu-kde4 @@ -6,7 +6,7 @@ livecd-rootfs (0.51) UNRELEASED; urgency=low [ Steve Langasek ] * Add new targets for {k,ed,}ubuntu-dvd - -- Steve Langasek Wed, 13 Feb 2008 14:08:35 -0800 + -- Steve Langasek Thu, 14 Feb 2008 10:15:33 -0800 livecd-rootfs (0.50) hardy; urgency=low From f4355158445652d6b10dd146e3fe27008e016f77 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 14 Feb 2008 15:57:12 -0800 Subject: [PATCH 23/30] * Enable *ubuntu-dvd and kubuntu-kde4 as known projects in BuildLiveCD --- BuildLiveCD | 2 +- debian/changelog | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/BuildLiveCD b/BuildLiveCD index 7e8a790a..4f5b61fa 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -68,7 +68,7 @@ esac for arg in "$@"; do case "$arg" in - *ubuntu|ubuntu-lpia|base|tocd) ;; + *ubuntu|*ubuntu-dvd|kubuntu-kde4|ubuntu-lpia|base|tocd) ;; *) echo "bad project: $arg" >&2 exit 2 diff --git a/debian/changelog b/debian/changelog index 1c94cccd..25e35e2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.51ubuntu1) UNRELEASED; urgency=low + + * Enable *ubuntu-dvd and kubuntu-kde4 as known projects in BuildLiveCD + + -- Steve Langasek Thu, 14 Feb 2008 15:56:32 -0800 + livecd-rootfs (0.51) hardy; urgency=low [ Jonathan Riddell ] From 7b7d2b79c80d543328d8e9eb71dcaa37a0fd3088 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Thu, 14 Feb 2008 15:58:54 -0800 Subject: [PATCH 24/30] release --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25e35e2c..09837490 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (0.51ubuntu1) UNRELEASED; urgency=low +livecd-rootfs (0.52) hardy; urgency=low * Enable *ubuntu-dvd and kubuntu-kde4 as known projects in BuildLiveCD - -- Steve Langasek Thu, 14 Feb 2008 15:56:32 -0800 + -- Steve Langasek Thu, 14 Feb 2008 15:58:31 -0800 livecd-rootfs (0.51) hardy; urgency=low From fa28c8fd159e555e8510236ac5b0951a357e29b9 Mon Sep 17 00:00:00 2001 From: jr Date: Wed, 20 Feb 2008 11:00:38 +0000 Subject: [PATCH 25/30] add universe to kubuntu-kde4 --- livecd.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/livecd.sh b/livecd.sh index f91006ed..bdba8024 100755 --- a/livecd.sh +++ b/livecd.sh @@ -180,6 +180,7 @@ Flags: seen kubuntu-kde4) LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^" LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper" + COMP="main restricted universe multiverse" ;; edubuntu|edubuntu-dvd) LIST="$LIST minimal^ standard^ edubuntu-desktop^" From 435abb94e26875b623e48f9618f4e3c668ad649a Mon Sep 17 00:00:00 2001 From: jr Date: Fri, 22 Feb 2008 09:43:42 +0000 Subject: [PATCH 26/30] add changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 09837490..bbdfcf4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.53) hardy; urgency=low + + * Set kubuntu-kde4 to universe + + -- Jonathan Riddell Fri, 22 Feb 2008 09:42:15 +0000 + livecd-rootfs (0.52) hardy; urgency=low * Enable *ubuntu-dvd and kubuntu-kde4 as known projects in BuildLiveCD From 4ba70bb502f17c5c12a9f7aece56bc896998dec5 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 27 Feb 2008 06:53:43 +0000 Subject: [PATCH 27/30] * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate. --- debian/changelog | 6 ++++++ livecd.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index bbdfcf4a..b673a643 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.54) UNRELEASED; urgency=low + + * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate. + + -- Colin Watson Wed, 27 Feb 2008 06:52:34 +0000 + livecd-rootfs (0.53) hardy; urgency=low * Set kubuntu-kde4 to universe diff --git a/livecd.sh b/livecd.sh index bdba8024..d7622bff 100755 --- a/livecd.sh +++ b/livecd.sh @@ -335,7 +335,7 @@ link_in_boot = $link_in_boot > livecd.${FSS}.manifest kill_users - chroot $ROOT /etc/cron.daily/slocate || true + chroot $ROOT /etc/cron.daily/mlocate || true chroot $ROOT /etc/cron.daily/man-db || true # remove our diversions From 6306f64f3bcb5036408ba538624fb57c5ed341a6 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 27 Feb 2008 06:58:25 +0000 Subject: [PATCH 28/30] releasing version 0.54 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b673a643..55310caa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -livecd-rootfs (0.54) UNRELEASED; urgency=low +livecd-rootfs (0.54) hardy; urgency=low * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate. - -- Colin Watson Wed, 27 Feb 2008 06:52:34 +0000 + -- Colin Watson Wed, 27 Feb 2008 06:54:12 +0000 livecd-rootfs (0.53) hardy; urgency=low From 8407fae7d907931fecb6910c5cb30bf635519a98 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 27 Feb 2008 20:19:05 +0000 Subject: [PATCH 29/30] * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels now. --- debian/changelog | 7 +++++++ livecd.sh | 6 +----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 55310caa..15284413 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (0.55) UNRELEASED; urgency=low + + * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels + now. + + -- Colin Watson Wed, 27 Feb 2008 20:18:27 +0000 + livecd-rootfs (0.54) hardy; urgency=low * Run /etc/cron.daily/mlocate rather than /etc/cron.daily/slocate. diff --git a/livecd.sh b/livecd.sh index d7622bff..2db2b45e 100755 --- a/livecd.sh +++ b/livecd.sh @@ -296,15 +296,11 @@ link_in_boot = $link_in_boot ubuntu-lpia) LIST="$LIST linux-lpia";; *) LIST="$LIST linux-generic";; esac;; - powerpc) - case $SUBARCH in - ps3) LIST="$LIST linux-cell";; - *) LIST="$LIST linux-powerpc linux-powerpc64-smp";; - esac;; # and the bastard stepchildren ia64) LIST="$LIST linux-itanium linux-mckinley";; hppa) LIST="$LIST linux-hppa32 linux-hppa64";; + powerpc) LIST="$LIST linux-powerpc linux-powerpc64-smp";; sparc*) LIST="$LIST linux-sparc64";; *) echo "Unknown architecture: no kernel."; exit 1;; esac From f70f9b33a417c677336b3495417b9e563a4acc84 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Wed, 27 Feb 2008 20:20:36 +0000 Subject: [PATCH 30/30] releasing version 0.55 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 15284413..eaee130f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -livecd-rootfs (0.55) UNRELEASED; urgency=low +livecd-rootfs (0.55) hardy; urgency=low * All powerpc builds (including ps3) use the powerpc/powerpc64-smp kernels now. - -- Colin Watson Wed, 27 Feb 2008 20:18:27 +0000 + -- Colin Watson Wed, 27 Feb 2008 20:19:16 +0000 livecd-rootfs (0.54) hardy; urgency=low