Import patches-unapplied version 0.75 to ubuntu/jaunty

Imported using git-ubuntu import.

Changelog parent: f1bc2409a6d4028c72350560a46c6b89895b974b

New changelog entries:
  [ Steve Langasek ]
  * BuildLiveCD: recognize 'mythbuntu' and 'ubuntu-mobile' as valid project
    names
  [ Colin Watson ]
  * BuildLiveCD: add ubuntu-umpc too.
  [ Steve Kowalik ]
  * BuildLiveCD: Add ubuntu-netbook-remix.
  * livecd.sh: Support ubuntu-netbook-remix.
This commit is contained in:
Steve Kowalik 2009-01-10 11:08:29 +11:00 committed by usd-importer
parent f1bc2409a6
commit 8da53945dd
3 changed files with 31 additions and 13 deletions

View File

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

18
debian/changelog vendored
View File

@ -1,3 +1,18 @@
livecd-rootfs (0.75) jaunty; urgency=low
[ Steve Langasek ]
* BuildLiveCD: recognize 'mythbuntu' and 'ubuntu-mobile' as valid project
names
[ Colin Watson ]
* BuildLiveCD: add ubuntu-umpc too.
[ Steve Kowalik ]
* BuildLiveCD: Add ubuntu-netbook-remix.
* livecd.sh: Support ubuntu-netbook-remix.
-- Steve Kowalik <stevenk@ubuntu.com> Sat, 10 Jan 2009 11:08:29 +1100
livecd-rootfs (0.74) jaunty; urgency=low livecd-rootfs (0.74) jaunty; urgency=low
* For mythbuntu livefs builds, we don't have tasks yet. They will be * For mythbuntu livefs builds, we don't have tasks yet. They will be
@ -8,7 +23,10 @@ livecd-rootfs (0.74) jaunty; urgency=low
livecd-rootfs (0.73) jaunty; urgency=low livecd-rootfs (0.73) jaunty; urgency=low
[ Colin Watson ]
* Add ubuntu-umpc support (equivalent to previous ubuntu-mobile). * Add ubuntu-umpc support (equivalent to previous ubuntu-mobile).
[ Mario Limonciello ]
* Add Mythbuntu support. * Add Mythbuntu support.
* BuildLiveCD: default to jaunty. * BuildLiveCD: default to jaunty.

View File

@ -141,7 +141,7 @@ fi
for arg in "$@"; do for arg in "$@"; do
case "$arg" in case "$arg" in
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-mobile|ubuntu-umpc|base|tocd) ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-kde4|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|base|tocd)
;; ;;
*) *)
echo bad name >&2; echo bad name >&2;
@ -200,12 +200,12 @@ Flags: seen
COMP="main" COMP="main"
;; ;;
ubuntu-mid) ubuntu-mid)
LIST="$LIST minimal^ ubuntu-mid" LIST="$LIST minimal^ mobile-mid^"
LIVELIST="casper ubiquity" LIVELIST="casper ubiquity"
COMP="main restricted universe multiverse" COMP="main restricted universe multiverse"
;; ;;
ubuntu-mobile|ubuntu-umpc) ubuntu-netbook-remix)
LIST="$LIST minimal^ mobile-mobile^" LIST="$LIST minimal^ mobile-netbook-remix^"
LIVELIST="casper ubiquity" LIVELIST="casper ubiquity"
COMP="main restricted universe multiverse" COMP="main restricted universe multiverse"
;; ;;