mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 19:31:31 +00:00
Import patches-unapplied version 0.94 to ubuntu/karmic
Imported using git-ubuntu import. Changelog parent: 1709e1211b71749ec7c822b08b3c3607de458126 New changelog entries: [ Steve Kowalik ] * Add support for UMR. [ Loïc Minier ] * Use ubuntu-moblin-live in LIVELIST instead of a hardcoded list.
This commit is contained in:
Loïc Minier
usd-importer
parent
1709e1211b
commit
7b1ecdb571
@ -1,3 +0,0 @@
|
||||
This is a Bazaar control directory.
|
||||
Do not change any files in this directory.
|
||||
See http://bazaar-vcs.org/ for more information about Bazaar.
|
||||
@ -1 +0,0 @@
|
||||
Bazaar-NG meta directory, format 1
|
||||
@ -1,2 +0,0 @@
|
||||
parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
|
||||
push_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/
|
||||
@ -1 +0,0 @@
|
||||
Bazaar Branch Format 6 (bzr 0.15)
|
||||
@ -1 +0,0 @@
|
||||
278 ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e
|
||||
@ -1 +0,0 @@
|
||||
d4:0.6854:cjwatson@canonical.com-20080922105353-5g6nbd3z6auod9o84:0.6947:ogra@ubuntu.com-20080923105752-3is4oq7h0rvr7m1t4:0.7050:stevenk@ubuntu.com-20080926061032-4cmvys3uwn0urof64:0.7147:ogra@ubuntu.com-20080929212513-932wmh9jhu2254c84:0.7254:cjwatson@canonical.com-20081009012107-bcithv5mtfr13wdr4:0.7350:superm1@ubuntu.com-20081105013351-lgows8lwl8gynab14:0.7450:superm1@ubuntu.com-20081108155125-k9hgpa9dpccasza14:0.7550:stevenk@ubuntu.com-20090110000926-kti0aa3w3gm87tl64:0.7654:cjwatson@canonical.com-20090120234103-0oedx9z8fwfgebmg4:0.7754:cjwatson@canonical.com-20090129172302-12n6za4eg8ti5iqs4:0.7850:stevenk@ubuntu.com-20090323105302-bzrig75pk422ae8o4:0.7954:cjwatson@canonical.com-20090403000814-c0f4i899uyvq3le14:0.8050:stevenk@ubuntu.com-20090416104708-ytmlukba1r2qbok24:0.8154:cjwatson@canonical.com-20090508233530-xqdymqe6ii8eanbt4:0.8254:cjwatson@canonical.com-20090529072059-0303r4t3a2terv5u4:0.8354:cjwatson@canonical.com-20090529093922-h2qylvtfqgwqocs24:0.8460:steve.langasek@canonical.com-20090610202236-hzpkmw79nuly34iu4:0.8554:cjwatson@canonical.com-20090623163248-2e75g8ph1wr63bck4:0.8650:stevenk@ubuntu.com-20090630021433-f32fyu1qvauh1y5y4:0.8754:cjwatson@canonical.com-20090707120821-n7o4gmu5cgvs76314:0.8850:superm1@ubuntu.com-20090723080906-su6zimlrtqy6bmdj4:0.8950:stevenk@ubuntu.com-20090805132344-m6jy87gv6cmus3384:0.9047:ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim4:0.9150:superm1@ubuntu.com-20090814032033-i87zsm015fivhf494:0.9247:ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs394:0.9347:ogra@ubuntu.com-20090825163952-pxo05zcb6icy931ee
|
||||
@ -1 +0,0 @@
|
||||
BZR conflict list format 1
|
||||
Binary file not shown.
@ -1 +0,0 @@
|
||||
Bazaar Working Tree Format 4 (bzr 0.15)
|
||||
@ -1,6 +0,0 @@
|
||||
BZR merge-modified list format 1
|
||||
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
|
||||
hash: 64a8ca3d9f969fe6ccff917739be2dbaf85af2d3
|
||||
|
||||
file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
|
||||
hash: 723d11f776ba3507bac97fd386d7ffaa8a43de7c
|
||||
@ -1 +0,0 @@
|
||||
Bazaar pack repository format 1 (needs bzr 0.92)
|
||||
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
Bazaar Graph Index 1
|
||||
node_ref_lists=0
|
||||
key_elements=1
|
||||
len=0
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -85,7 +85,7 @@ esac
|
||||
|
||||
for arg in "$@"; do
|
||||
case "$arg" in
|
||||
*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|mythbuntu|base|tocd) ;;
|
||||
*ubuntu|*ubuntu-dvd|kubuntu-netbook|ubuntu-lpia|ubuntu-mid|ubuntu-umpc|ubuntu-mobile|ubuntu-netbook-remix|ubuntu-moblin-remix|mythbuntu|base|tocd) ;;
|
||||
*)
|
||||
echo "bad project: $arg" >&2
|
||||
exit 2
|
||||
|
||||
10
debian/changelog
vendored
10
debian/changelog
vendored
@ -1,3 +1,13 @@
|
||||
livecd-rootfs (0.94) karmic; urgency=low
|
||||
|
||||
[ Steve Kowalik ]
|
||||
* Add support for UMR.
|
||||
|
||||
[ Loïc Minier ]
|
||||
* Use ubuntu-moblin-live in LIVELIST instead of a hardcoded list.
|
||||
|
||||
-- Loïc Minier <loic.minier@ubuntu.com> Thu, 27 Aug 2009 12:36:10 +0200
|
||||
|
||||
livecd-rootfs (0.93) karmic; urgency=low
|
||||
|
||||
* remove temporary enablement of universe from the armel subarchitectures
|
||||
|
||||
16
livecd.sh
16
livecd.sh
@ -117,6 +117,7 @@ EXCLUDE=""
|
||||
LIST=""
|
||||
SUBARCH=""
|
||||
PROPOSED=""
|
||||
EXTRASOURCE=""
|
||||
|
||||
while getopts :d:e:i:I:m:S:s:a:p name; do case $name in
|
||||
d) STE=$OPTARG;;
|
||||
@ -142,7 +143,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-remix|base|tocd)
|
||||
ubuntu|ubuntu-dvd|ubuntu-lpia|edubuntu|edubuntu-dvd|kubuntu|kubuntu-dvd|kubuntu-netbook|xubuntu|mythbuntu|gobuntu|ubuntu-mid|ubuntu-netbook-remix|ubuntu-moblin-remix|base|tocd)
|
||||
;;
|
||||
*)
|
||||
echo bad name >&2;
|
||||
@ -216,6 +217,12 @@ Flags: seen
|
||||
LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper"
|
||||
COMP="main restricted universe multiverse"
|
||||
;;
|
||||
ubuntu-moblin-remix)
|
||||
LIST="$LIST minimal^ ubuntu-moblin-remix"
|
||||
LIVELIST="ubuntu-moblin-live"
|
||||
COMP="main restricted universe"
|
||||
EXTRASOURCE="http://ppa.launchpad.net/moblin/ppa/ubuntu/"
|
||||
;;
|
||||
base)
|
||||
LIST="$LIST minimal^ standard^"
|
||||
LIVELIST="casper lupin-casper"
|
||||
@ -362,7 +369,14 @@ Pin-Priority: 900
|
||||
if [ "$PROPOSED" = "yes" ]; then
|
||||
echo deb $MIRROR ${STE}-proposed ${COMP} >> ${ROOT}etc/apt/sources.list
|
||||
fi
|
||||
if [ -n "$EXTRASOURCE" ]; then
|
||||
echo deb $EXTRASOURCE $STE ${COMP} >> ${ROOT}etc/apt/sources.list
|
||||
fi
|
||||
chroot $ROOT apt-get update
|
||||
if [ "$FS" = "ubuntu-moblin-remix" ]; then
|
||||
chroot $ROOT apt-get -y --force-yes install ubuntu-moblin-ppa-keyring
|
||||
chroot $ROOT apt-get update
|
||||
fi
|
||||
chroot $ROOT apt-get -y --purge dist-upgrade </dev/null
|
||||
chroot $ROOT apt-get -y --purge install $LIST </dev/null
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user