Import patches-unapplied version 1.105 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 60d3d00ae6

New changelog entries:
  * Edubuntu is allowed to pull from universe; update livecd.sh accordingly

.bzr/README

@@ -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.

.bzr/branch-format

@@ -1 +0,0 @@
-Bazaar-NG meta directory, format 1

.bzr/branch/branch.conf

@@ -1,3 +0,0 @@
-bound_location = sftp://stevenk@bazaar.launchpad.net/%7Eubuntu-core-dev/livecd-rootfs/trunk/
-bound = True
-submit_branch = bzr+ssh://bazaar.launchpad.net/%7Emcasadevall/livecd-rootfs/armel-subarchs/

.bzr/branch/format

@@ -1 +0,0 @@
-Bazaar Branch Format 6 (bzr 0.15)

.bzr/branch/last-revision

@@ -1 +0,0 @@
-312 ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bk

.bzr/branch/tags

@@ -1 +0,0 @@
-d5:0.10045:lool@dooz.org-20091022120946-ude4k00wrup5zi1u5:0.10158:evan.dandrea@canonical.com-20091118182236-wjse47vyhq4331c34: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-pxo05zcb6icy931e4:0.9445:lool@dooz.org-20090827103704-ces9mmhqskcdzxgm4:0.9550:stevenk@ubuntu.com-20090901073549-hyto6dxcpijmyb1u4:0.9654:cjwatson@canonical.com-20090915121422-j8ycjw2o2xsk2fim4:0.9745:lool@dooz.org-20090915225223-bkp0tzqk3dllogno4:0.9840:lool@bee-20090923074648-95yic2eel4ietxl34:0.9945:lool@dooz.org-20091004115344-a657lipup0e45we65:1.10258:evan.dandrea@canonical.com-20091119211317-msuqwz83h8lrtnf45:1.10347:ogra@ubuntu.com-20091207104326-192mmbzylr7gz8bke

.bzr/checkout/conflicts

@@ -1,19 +0,0 @@
-BZR conflict list format 1
-path: debian/changelog
-type: text conflict
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.1
-
-path: debian/changelog.BASE.moved
-type: duplicate
-action: Moved existing file to
-conflict_path: debian/changelog.BASE
-
-path: debian/changelog.OTHER.moved
-type: duplicate
-action: Moved existing file to
-conflict_path: debian/changelog.OTHER
-
-path: debian/changelog.THIS.moved
-type: duplicate
-action: Moved existing file to
-conflict_path: debian/changelog.THIS

.bzr/checkout/format

@@ -1 +0,0 @@
-Bazaar Working Tree Format 4 (bzr 0.15)

.bzr/checkout/merge-hashes

@@ -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: be4c9247502209f1e471e0c0ff66871cf0f75841
-
-file_id: x_LaMont_Jones_<lamont.jones@canonical.com>_Thu_Jan__6_23:41:24_2005_11810.5
-hash: af6a52024eda0978b30f6442b936b80cb640a256

.bzr/repository/format

@@ -1 +0,0 @@
-Bazaar pack repository format 1 (needs bzr 0.92)

.bzr/repository/indices/1c52b9333bf6a33c08d0b58f6277f8dd.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/indices/89c24db89495df252a7d543786eaac74.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/indices/a4e27862ddd207f0941b8728e5528217.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/01ef4ef7573d3e8742c185049591f376.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/234ad8f4414361ac31d6fc6e647fedee.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/4bcaf57cd3c6d0ff01e05e716b36904a.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/54cbd1260987ee7b8023317f7119f4cd.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/beb95ca9e3fca05b5f3e818fec6c2bfc.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/d8d397b5da67feec723b6b07b8712337.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/da781774fd1275cba84b0845e5242c22.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzr/repository/obsolete_packs/da85d9389d43f71a3bd5593c143afaa6.six

@@ -1,5 +0,0 @@
-Bazaar Graph Index 1
-node_ref_lists=0
-key_elements=1
-len=0
-

.bzrignore

@@ -1,4 +0,0 @@
-debian/*.debhelper*
-debian/*.substvars
-debian/files
-debian/livecd-rootfs

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (1.105) lucid; urgency=low
+
+  * Edubuntu is allowed to pull from universe; update livecd.sh accordingly
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 26 Jan 2010 17:17:35 -0800
+
 livecd-rootfs (1.104) lucid; urgency=low
 
   * Rename Ubuntu Netbook Remix to Ubuntu Netbook.

livecd.sh

@@ -195,6 +195,7 @@ Flags: seen
 	edubuntu|edubuntu-dvd)
 	    LIST="$LIST minimal^ standard^ edubuntu-desktop-gnome^"
 	    LIVELIST="edubuntu-live^ laptop-detect casper lupin-casper"
+	    COMP="main restricted universe"
 	    ;;
 	xubuntu)
 	    LIST="$LIST minimal^ standard^ xterm xubuntu-desktop^"