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 78ba329a..00000000 --- a/.bzr/branch/last-revision +++ /dev/null @@ -1 +0,0 @@ -278 ogra@ubuntu.com-20090825163952-pxo05zcb6icy931e diff --git a/.bzr/branch/tags b/.bzr/branch/tags deleted file mode 100644 index 433f3777..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-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/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 4c0d5260..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 841a5976..00000000 --- a/.bzr/checkout/merge-hashes +++ /dev/null @@ -1,6 +0,0 @@ -BZR merge-modified list format 1 -file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.1 -hash: 64a8ca3d9f969fe6ccff917739be2dbaf85af2d3 - -file_id: x_LaMont_Jones__Thu_Jan__6_23:41:24_2005_11810.5 -hash: 723d11f776ba3507bac97fd386d7ffaa8a43de7c 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/41a419b6a2c89cdad0fa3a8a69e40810.iix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.iix deleted file mode 100644 index 89e7807b..00000000 Binary files a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.iix and /dev/null differ diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix deleted file mode 100644 index b45f6a48..00000000 Binary files a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.rix and /dev/null differ diff --git a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.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/41a419b6a2c89cdad0fa3a8a69e40810.tix b/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.tix deleted file mode 100644 index 0aeca224..00000000 Binary files a/.bzr/repository/indices/41a419b6a2c89cdad0fa3a8a69e40810.tix and /dev/null differ 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/6792c6f201d789b0dd896142c3ce9985.iix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.iix deleted file mode 100644 index 336b1dd4..00000000 Binary files a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.iix and /dev/null differ diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix deleted file mode 100644 index 8c21353f..00000000 Binary files a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.rix and /dev/null differ diff --git a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.six b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.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/6792c6f201d789b0dd896142c3ce9985.tix b/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.tix deleted file mode 100644 index 33bca614..00000000 Binary files a/.bzr/repository/indices/6792c6f201d789b0dd896142c3ce9985.tix and /dev/null differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix deleted file mode 100644 index 6e8eaf59..00000000 Binary files a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.iix and /dev/null differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix deleted file mode 100644 index 22d9e329..00000000 Binary files a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.rix and /dev/null differ diff --git a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.six b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.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/76dc63f757894da0103ab0be8639de0e.tix b/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.tix deleted file mode 100644 index 835bfa36..00000000 Binary files a/.bzr/repository/indices/76dc63f757894da0103ab0be8639de0e.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/d6a03141bdc37b53e6da33b0c62f3eee.iix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.iix deleted file mode 100644 index c6b1c479..00000000 Binary files a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.iix and /dev/null differ diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix deleted file mode 100644 index aa8916e2..00000000 Binary files a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.rix and /dev/null differ diff --git a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.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/d6a03141bdc37b53e6da33b0c62f3eee.tix b/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.tix deleted file mode 100644 index 12d097cb..00000000 Binary files a/.bzr/repository/indices/d6a03141bdc37b53e6da33b0c62f3eee.tix and /dev/null differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix deleted file mode 100644 index 23729e8b..00000000 Binary files a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.iix and /dev/null differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix deleted file mode 100644 index f7c8861f..00000000 Binary files a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.rix and /dev/null differ diff --git a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.six deleted file mode 100644 index 1206f930..00000000 --- a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.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/e8bdb3981e054376d3ff1496e3e55f00.tix b/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.tix deleted file mode 100644 index 97e17999..00000000 Binary files a/.bzr/repository/indices/e8bdb3981e054376d3ff1496e3e55f00.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 e6215561..00000000 Binary files a/.bzr/repository/pack-names and /dev/null differ diff --git a/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack b/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack deleted file mode 100644 index 71fc5b4f..00000000 Binary files a/.bzr/repository/packs/41a419b6a2c89cdad0fa3a8a69e40810.pack 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/6792c6f201d789b0dd896142c3ce9985.pack b/.bzr/repository/packs/6792c6f201d789b0dd896142c3ce9985.pack deleted file mode 100644 index 167f24ec..00000000 Binary files a/.bzr/repository/packs/6792c6f201d789b0dd896142c3ce9985.pack and /dev/null differ diff --git a/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.pack b/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.pack deleted file mode 100644 index fbcbeae3..00000000 Binary files a/.bzr/repository/packs/76dc63f757894da0103ab0be8639de0e.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/d6a03141bdc37b53e6da33b0c62f3eee.pack b/.bzr/repository/packs/d6a03141bdc37b53e6da33b0c62f3eee.pack deleted file mode 100644 index e9b0b3d5..00000000 Binary files a/.bzr/repository/packs/d6a03141bdc37b53e6da33b0c62f3eee.pack and /dev/null differ diff --git a/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.pack b/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.pack deleted file mode 100644 index ec9d269d..00000000 Binary files a/.bzr/repository/packs/e8bdb3981e054376d3ff1496e3e55f00.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/BuildLiveCD b/BuildLiveCD index 4ef9048b..c318c048 100755 --- a/BuildLiveCD +++ b/BuildLiveCD @@ -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 diff --git a/debian/changelog b/debian/changelog index 74a7f013..26271170 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Thu, 27 Aug 2009 12:36:10 +0200 + livecd-rootfs (0.93) karmic; urgency=low * remove temporary enablement of universe from the armel subarchitectures diff --git a/livecd.sh b/livecd.sh index d5c88d0d..79461467 100755 --- a/livecd.sh +++ b/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