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 786c3fb1..00000000 --- a/.bzr/branch/branch.conf +++ /dev/null @@ -1,8 +0,0 @@ -parent_location = bzr+ssh://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk/ -gtk_global_commit_message = ''' build ltsp image as part of edubuntu-dvd/i386, depends ltsp-server. LP: #531546 - use mksquashfs directly, instead of ltsp-update-image - fix typo checking for kubuntu-ish releases vs icon-theme.cache - Make me the maintainer. -''' -gtk_file_commit_messages = de -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 dc392f44..00000000 --- a/.bzr/branch/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Branch Format 7 (needs bzr 1.6) diff --git a/.bzr/branch/last-revision b/.bzr/branch/last-revision deleted file mode 100644 index 3887f5d8..00000000 --- a/.bzr/branch/last-revision +++ /dev/null @@ -1 +0,0 @@ -319 lamont@debian.org-20100324133047-5k5cb0qkr4w4r41m diff --git a/.bzr/branch/tags b/.bzr/branch/tags deleted file mode 100644 index 1925520a..00000000 --- a/.bzr/branch/tags +++ /dev/null @@ -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-192mmbzylr7gz8bk5:1.10450:stevenk@ubuntu.com-20091218032148-0127dc53ulzxt15h5:1.10560:steve.langasek@canonical.com-20100127011800-utoua1rehbsdyiqi5:1.10654:jriddell@canonical.com-20100308114808-2z6cywa7itr3u46m5:1.10949:lamont@debian.org-20100324133047-5k5cb0qkr4w4r41me \ 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 2197dd96..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 e0261c79..00000000 --- a/.bzr/checkout/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar Working Tree Format 6 (bzr 1.14) diff --git a/.bzr/checkout/views b/.bzr/checkout/views deleted file mode 100644 index e69de29b..00000000 diff --git a/.bzr/repository/format b/.bzr/repository/format deleted file mode 100644 index b200528b..00000000 --- a/.bzr/repository/format +++ /dev/null @@ -1 +0,0 @@ -Bazaar repository format 2a (needs bzr 1.16 or later) diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix deleted file mode 100644 index 0095681d..00000000 --- a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.cix +++ /dev/null @@ -1,6 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=1 -row_lengths=1 -x 1 PfN5088 y/NSXm':Q[TZ%!<<g  r?f8 \ No newline at end of file diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix deleted file mode 100644 index 7f8f0698..00000000 Binary files a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.iix and /dev/null differ diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix deleted file mode 100644 index 41af8ea3..00000000 Binary files a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.rix and /dev/null differ diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six deleted file mode 100644 index a2afde6b..00000000 --- a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.six +++ /dev/null @@ -1,5 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=0 -row_lengths= diff --git a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix b/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix deleted file mode 100644 index c3cf18ab..00000000 Binary files a/.bzr/repository/indices/431432956c92936d1f6c3f76290d09d5.tix and /dev/null differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix deleted file mode 100644 index ad61fe34..00000000 Binary files a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.cix and /dev/null differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix deleted file mode 100644 index 72ab7f12..00000000 Binary files a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.iix and /dev/null differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix deleted file mode 100644 index f72d17f6..00000000 Binary files a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.rix and /dev/null differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six deleted file mode 100644 index f921fd7e..00000000 Binary files a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.six and /dev/null differ diff --git a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix b/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix deleted file mode 100644 index 1054657f..00000000 Binary files a/.bzr/repository/indices/5185d0af88fc5856747e257bd598e49a.tix and /dev/null differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix deleted file mode 100644 index 296d0f5b..00000000 --- a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.cix +++ /dev/null @@ -1,6 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=1 -row_lengths=1 -x PLRL5<}n/uU.*@[\ D` nsʩE \ No newline at end of file diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix deleted file mode 100644 index f382626d..00000000 Binary files a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.iix and /dev/null differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix deleted file mode 100644 index 1f1a13cd..00000000 Binary files a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.rix and /dev/null differ diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six deleted file mode 100644 index a2afde6b..00000000 --- a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.six +++ /dev/null @@ -1,5 +0,0 @@ -B+Tree Graph Index 2 -node_ref_lists=0 -key_elements=1 -len=0 -row_lengths= diff --git a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix b/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix deleted file mode 100644 index 9a0fdb2a..00000000 Binary files a/.bzr/repository/indices/b31336f44699d1d57514355f2fe74838.tix and /dev/null differ diff --git a/.bzr/repository/pack-names b/.bzr/repository/pack-names deleted file mode 100644 index 37930e7c..00000000 Binary files a/.bzr/repository/pack-names and /dev/null differ diff --git a/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack b/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack deleted file mode 100644 index b6214c7c..00000000 Binary files a/.bzr/repository/packs/431432956c92936d1f6c3f76290d09d5.pack and /dev/null differ diff --git a/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack b/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack deleted file mode 100644 index facb84b5..00000000 Binary files a/.bzr/repository/packs/5185d0af88fc5856747e257bd598e49a.pack and /dev/null differ diff --git a/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack b/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack deleted file mode 100644 index bd40ef34..00000000 Binary files a/.bzr/repository/packs/b31336f44699d1d57514355f2fe74838.pack and /dev/null differ diff --git a/.bzrignore b/.bzrignore deleted file mode 100644 index 0c673e57..00000000 --- a/.bzrignore +++ /dev/null @@ -1,4 +0,0 @@ -debian/*.debhelper* -debian/*.substvars -debian/files -debian/livecd-rootfs diff --git a/debian/changelog b/debian/changelog index e06f5784..c920071b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.110) lucid; urgency=low + + * Add support for armel+omap, and remove incorrect comments from the armel + kernel installation block. + * Really update the maintainer field. + + -- Steve Kowalik Thu, 25 Mar 2010 00:49:17 +1100 + livecd-rootfs (1.109) lucid; urgency=low * if the ltsp squashfs image build fails, fail the build. diff --git a/debian/control b/debian/control index 3e3f0728..c2abecf7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: livecd-rootfs Section: devel Priority: optional Build-Depends: debhelper (>= 7) -Maintainer: Adam Conrad +Maintainer: LaMont Jones Standards-Version: 3.6.1.0 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/livecd-rootfs/trunk diff --git a/livecd.sh b/livecd.sh index 27c30487..89f99fc0 100755 --- a/livecd.sh +++ b/livecd.sh @@ -335,11 +335,12 @@ link_in_boot = $link_in_boot case "$SUBARCH" in imx51) LIST="$LIST linux-imx51" - # temporarily enable universe until kernel is in main ;; dove) LIST="$LIST linux-dove" - # temporarily enable universe until kernel is in main + ;; + omap) + LIST="$LIST linux-omap" ;; esac;; *) echo "Unknown architecture: no kernel."; exit 1;;