diff --git a/.bzr/README b/.bzr/README deleted file mode 100644 index 4f8e767e..00000000 --- a/.bzr/README +++ /dev/null @@ -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. diff --git a/.bzr/branch-format b/.bzr/branch-format deleted file mode 100644 index 9eb09b73..00000000 --- a/.bzr/branch-format +++ /dev/null @@ -1 +0,0 @@ -Bazaar-NG meta directory, format 1 diff --git a/.bzr/branch/branch.conf b/.bzr/branch/branch.conf deleted file mode 100644 index 0ff52035..00000000 --- a/.bzr/branch/branch.conf +++ /dev/null @@ -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/ diff --git a/.bzr/branch/format b/.bzr/branch/format deleted file mode 100644 index 1fc6b88e..00000000 --- a/.bzr/branch/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Branch Format 6 (bzr 0.15) diff --git a/.bzr/branch/last-revision b/.bzr/branch/last-revision deleted file mode 100644 index 575ad71b..00000000 --- a/.bzr/branch/last-revision +++ /dev/null @@ -1 +0,0 @@ -271 ogra@ubuntu.com-20090811090144-eek0pgpf01i0zjim diff --git a/.bzr/branch/tags b/.bzr/branch/tags deleted file mode 100644 index 42215c33..00000000 --- a/.bzr/branch/tags +++ /dev/null @@ -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-eek0pgpf01i0zjime \ No newline at end of file diff --git a/.bzr/checkout/conflicts b/.bzr/checkout/conflicts deleted file mode 100644 index 0dc2d3a0..00000000 --- a/.bzr/checkout/conflicts +++ /dev/null @@ -1 +0,0 @@ -BZR conflict list format 1 diff --git a/.bzr/checkout/dirstate b/.bzr/checkout/dirstate deleted file mode 100644 index 43014ee6..00000000 Binary files a/.bzr/checkout/dirstate and /dev/null differ diff --git a/.bzr/checkout/format b/.bzr/checkout/format deleted file mode 100644 index 9ffb5e44..00000000 --- a/.bzr/checkout/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Working Tree Format 4 (bzr 0.15) diff --git a/.bzr/checkout/merge-hashes b/.bzr/checkout/merge-hashes deleted file mode 100644 index 906fb24e..00000000 --- a/.bzr/checkout/merge-hashes +++ /dev/null @@ -1 +0,0 @@ -BZR merge-modified list format 1 diff --git a/.bzr/repository/format b/.bzr/repository/format deleted file mode 100644 index 520349da..00000000 --- a/.bzr/repository/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar pack repository format 1 (needs bzr 0.92) diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix deleted file mode 100644 index 42508863..00000000 Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.iix and /dev/null differ diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix deleted file mode 100644 index b0681231..00000000 Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.rix and /dev/null differ diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.six +++ /dev/null @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - diff --git a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix b/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix deleted file mode 100644 index b19da696..00000000 Binary files a/.bzr/repository/indices/585aae83282152e62ec90749692bd0a7.tix and /dev/null differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix deleted file mode 100644 index 80f0b18e..00000000 Binary files a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.iix and /dev/null differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix deleted file mode 100644 index edca13de..00000000 Binary files a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.rix and /dev/null differ diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.six +++ /dev/null @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - diff --git a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix b/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix deleted file mode 100644 index 9054e0a3..00000000 Binary files a/.bzr/repository/indices/826cb7622cd5715bc0efed9618a21810.tix and /dev/null differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix deleted file mode 100644 index 56291fd1..00000000 Binary files a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.iix and /dev/null differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix deleted file mode 100644 index 000b1aca..00000000 Binary files a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.rix and /dev/null differ diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.six +++ /dev/null @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - diff --git a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix b/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix deleted file mode 100644 index 349ec794..00000000 Binary files a/.bzr/repository/indices/a61e6e5a2a28b476892ff5601e954c22.tix and /dev/null differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix deleted file mode 100644 index 25fd7b83..00000000 Binary files a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.iix and /dev/null differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix deleted file mode 100644 index 53436570..00000000 Binary files a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.rix and /dev/null differ diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.six +++ /dev/null @@ -1,5 +0,0 @@ -Bazaar Graph Index 1 -node_ref_lists=0 -key_elements=1 -len=0 - diff --git a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix b/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix deleted file mode 100644 index 25406fe9..00000000 Binary files a/.bzr/repository/indices/c2bce168d3ce0969c0a31c7914f73f7e.tix and /dev/null differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix deleted file mode 100644 index 0ac9f859..00000000 Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.iix and /dev/null differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix deleted file mode 100644 index 9d4797a6..00000000 Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.rix and /dev/null differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six deleted file mode 100644 index 957bd400..00000000 Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.six and /dev/null differ diff --git a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix b/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix deleted file mode 100644 index 6fa31ef2..00000000 Binary files a/.bzr/repository/indices/fcfa609e6770bb697bbea1202ae42de4.tix and /dev/null differ diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names deleted file mode 100644 index 78c9d156..00000000 Binary files a/.bzr/repository/pack-names and /dev/null differ diff --git a/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack b/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack deleted file mode 100644 index 4657950e..00000000 Binary files a/.bzr/repository/packs/585aae83282152e62ec90749692bd0a7.pack and /dev/null differ diff --git a/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack b/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack deleted file mode 100644 index c11800a0..00000000 Binary files a/.bzr/repository/packs/826cb7622cd5715bc0efed9618a21810.pack and /dev/null differ diff --git a/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack b/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack deleted file mode 100644 index 5899558c..00000000 Binary files a/.bzr/repository/packs/a61e6e5a2a28b476892ff5601e954c22.pack and /dev/null differ diff --git a/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack b/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack deleted file mode 100644 index fe2fed20..00000000 Binary files a/.bzr/repository/packs/c2bce168d3ce0969c0a31c7914f73f7e.pack and /dev/null differ diff --git a/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack b/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack deleted file mode 100644 index f20adbb3..00000000 Binary files a/.bzr/repository/packs/fcfa609e6770bb697bbea1202ae42de4.pack and /dev/null differ diff --git a/debian/changelog b/debian/changelog index 6fe9e920..ed764638 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +livecd-rootfs (0.91) karmic; urgency=low + + [ Steve Kowalik ] + * Remove subarch hack for ubuntu-mid, it was never used. + + [ Mario Limonciello ] + * Remove metapackage hack for mythbuntu. Now that tasks are published for + multiverse, it's no longer necessary. + + -- Mario Limonciello Thu, 13 Aug 2009 22:19:26 -0500 + livecd-rootfs (0.90) karmic; urgency=low * make armel imx51 build from universe for alpha4 until our kernel package diff --git a/livecd.sh b/livecd.sh index 1457128e..be441658 100755 --- a/livecd.sh +++ b/livecd.sh @@ -212,7 +212,7 @@ Flags: seen LIVELIST="unr-live^ casper ubiquity" ;; mythbuntu) - LIST="$LIST minimal^ standard^ mythbuntu-desktop^ mythbuntu-desktop" + LIST="$LIST minimal^ standard^ mythbuntu-desktop^" LIVELIST="mythbuntu-live^ laptop-detect casper lupin-casper" COMP="main restricted universe multiverse" ;; @@ -338,19 +338,6 @@ link_in_boot = $link_in_boot *) echo "Unknown architecture: no kernel."; exit 1;; esac - if [ $FS = "ubuntu-mid" ]; then - case "$SUBARCH" in - *proprietary*) - case "$SUBARCH" in - menlow*) - LIST="$LIST marvell-8686-firmware-9 psb-video libgl1-mesa-dri-psb xorg-modules-xpsb" - ;; - esac - LIST="$LIST mobile-usb-client-utils mobile-usb-host-utils" - ;; - esac - fi - for x in $EXCLUDE; do LIST="$(without_package "$x" "$LIST")" done