mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-13 04:11:11 +00:00
Import patches-unapplied version 0.51 to ubuntu/hardy
Imported using git-ubuntu import. Changelog parent: 7bb17dadb64a96f21e5f4fe9346734088b39b7de New changelog entries: [ Jonathan Riddell ] * Add kubuntu-kde4 [ Steve Langasek ] * Add new targets for {k,ed,}ubuntu-dvd
This commit is contained in:
parent
7bb17dadb6
commit
577bdaf259
@ -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-dvd ubuntu-lpia kubuntu kubuntu-dvd kubuntu-kde4 edubuntu edubuntu-dvd xubuntu base
|
||||
fi
|
||||
fi
|
||||
|
||||
|
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,3 +1,13 @@
|
||||
livecd-rootfs (0.51) hardy; urgency=low
|
||||
|
||||
[ Jonathan Riddell ]
|
||||
* Add kubuntu-kde4
|
||||
|
||||
[ Steve Langasek ]
|
||||
* Add new targets for {k,ed,}ubuntu-dvd
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 14 Feb 2008 10:15:33 -0800
|
||||
|
||||
livecd-rootfs (0.50) hardy; urgency=low
|
||||
|
||||
* Switch Xubuntu to libgoffice-gtk-0-6.
|
||||
|
21
livecd.sh
21
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-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|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,15 +169,19 @@ 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"
|
||||
;;
|
||||
edubuntu)
|
||||
kubuntu-kde4)
|
||||
LIST="$LIST minimal^ standard^ kubuntu-kde4-desktop^"
|
||||
LIVELIST="kubuntu-kde4-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
;;
|
||||
edubuntu|edubuntu-dvd)
|
||||
LIST="$LIST minimal^ standard^ edubuntu-desktop^"
|
||||
LIVELIST="edubuntu-live^ xresprobe laptop-detect casper lupin-casper"
|
||||
;;
|
||||
@ -219,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user