Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-11 05:07:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 1.147 to ubuntu/maverick

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 500009f34114c5dd221502b102d7cb1b19fe3a35

New changelog entries:
  * Add support for kubuntu-mobile
This commit is contained in:
Emmet Hikory 2010-08-26 13:29:12 +09:00 committed by usd-importer
parent 500009f341
commit 3684b9fa65
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BuildLiveCD
View File

@ -69,9 +69,9 @@ if [ "$new_suite" = "yes" ] && [ "$old_suite" = "yes" ]; then
exit 1
fi
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu base
set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu base
if [ "$ARCH" = "i386" ]; then
set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
set -- ubuntu ubuntu-dvd ubuntu-lpia ubuntu-netbook kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd xubuntu mythbuntu base
fi
fi
@ -82,7 +82,7 @@ esac
for arg in "$@"; do
case "$arg" in
*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd) ;;
*ubuntu|*ubuntu-dvd|kubuntu-mobile|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook|ubuntu-moblin-remix|mythbuntu|base|tocd) ;;
*)
echo "bad project: $arg" >&2
exit 2

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (1.147) maverick; urgency=low
* Add support for kubuntu-mobile
-- Emmet Hikory <persia@ubuntu.com> Thu, 26 Aug 2010 13:29:12 +0900
livecd-rootfs (1.146) maverick; urgency=low
* Add a series of checkpoints where the current time is logged.

14
livecd.sh
View File

@ -196,9 +196,9 @@ esac; done;
shift $((OPTIND-1))
if (( $# == 0 )) || [ "X$1" = "Xall" ]; then
set -- ubuntu kubuntu kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base
set -- ubuntu kubuntu kubuntu-mobile kubuntu-netbook edubuntu xubuntu mythbuntu gobuntu base
if [ "$ARCH" = "i386" ]; then
set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
set -- ubuntu ubuntu-dvd kubuntu kubuntu-dvd kubuntu-mobile kubuntu-netbook edubuntu edubuntu-dvd mythbuntu xubuntu gobuntu base
fi
fi
@ -210,7 +210,7 @@ fi
for arg in "$@"; do
case "$arg" in
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-mobile|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook|ubuntu-moblin-remix|base|tocd)
;;
*)
echo bad name >&2;
@ -258,6 +258,10 @@ Flags: seen
LIST="$LIST minimal^ standard^ kubuntu-desktop^"
LIVELIST="kubuntu-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
kubuntu-mobile)
LIST="$LIST minimal^ standard^ kubuntu-mobile^"
LIVELIST="language-support-en kubuntu-mobile-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
;;
kubuntu-netbook)
LIST="$LIST minimal^ standard^ kubuntu-netbook^"
LIVELIST="language-support-en kubuntu-netbook-live^ laptop-detect $LIVE_BOOT_SCRIPTS"
@ -686,7 +690,9 @@ Pin-Priority: 550
esac
# No point keeping Gnome icon cache around for Kubuntu
if [ "$FS" = "kubuntu" ] || [ "$FS" = "kubuntu-netbook" ]; then
if [ "$FS" = "kubuntu" ] || \
[ "$FS" = "kubuntu-netbook" ] || \
[ "$FS" = "kubuntu-mobile"] ; then
rm -f ${ROOT}/usr/share/icons/*/icon-theme.cache
fi