diff --git a/.bzr/branch/last-revision b/.bzr/branch/last-revision index 8a6d559a..78ba329a 100644 --- a/.bzr/branch/last-revision +++ b/.bzr/branch/last-revision @@ -1 +1 @@ -276 ogra@ubuntu.com-20090821173859-y8ixof4s2zb3vs39 +278 ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e diff --git a/.bzr/branch/tags b/.bzr/branch/tags index 9e9092b6..433f3777 100644 --- a/.bzr/branch/tags +++ b/.bzr/branch/tags @@ -1 +1 @@ -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-y8ixof4s2zb3vs39e \ No newline at end of file +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 \ No newline at end of file diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate index 8ebbc86f..4c0d5260 100644 Binary files a/.bzr/checkout/dirstate and b/.bzr/checkout/dirstate differ diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.iix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.iix new file mode 100644 index 00000000..336b1dd4 Binary files /dev/null and b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.iix differ diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix new file mode 100644 index 00000000..8c21353f Binary files /dev/null and b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix differ diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.six b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.tix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.tix new file mode 100644 index 00000000..33bca614 Binary files /dev/null and b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.tix differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix new file mode 100644 index 00000000..6e8eaf59 Binary files /dev/null and b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix new file mode 100644 index 00000000..22d9e329 Binary files /dev/null and b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.six b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.six new file mode 100644 index 00000000..1206f930 --- /dev/null +++ b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.six @@ -0,0 +1,5 @@ +Bazaar Graph Index 1 +node_ref_lists=0 +key_elements=1 +len=0 + diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.tix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.tix new file mode 100644 index 00000000..835bfa36 Binary files /dev/null and b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.tix differ diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names index 7f78828d..e6215561 100644 Binary files a/.bzr/repository/pack-names and b/.bzr/repository/pack-names differ diff --git a/.bzr/repository/packs/6792c6f201d789b0dd896142c3ce9985.pack b/.bzr/repository/packs/6792c6f201d789b0dd896142c3ce9985.pack new file mode 100644 index 00000000..167f24ec Binary files /dev/null and b/.bzr/repository/packs/6792c6f201d789b0dd896142c3ce9985.pack differ diff --git a/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.pack b/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.pack new file mode 100644 index 00000000..fbcbeae3 Binary files /dev/null and b/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.pack differ diff --git a/debian/changelog b/debian/changelog index 17eacc50..74a7f013 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (0.93) karmic; urgency=low + + * remove temporary enablement of universe from the armel subarchitectures + + -- Oliver Grawert Tue, 25 Aug 2009 18:38:07 +0200 + livecd-rootfs (0.92) karmic; urgency=low * change armel+imx51 back to the proper metapackage name diff --git a/livecd.sh b/livecd.sh index 62fe22f4..d5c88d0d 100755 --- a/livecd.sh +++ b/livecd.sh @@ -330,12 +330,10 @@ link_in_boot = $link_in_boot imx51) LIST="$LIST linux-imx51" # temporarily enable universe until kernel is in main - COMP="main restricted universe" ;; dove) LIST="$LIST linux-dove" # temporarily enable universe until kernel is in main - COMP="main restricted universe" ;; esac;; *) echo "Unknown architecture: no kernel."; exit 1;;