diff --git a/debian/changelog b/debian/changelog index e06f5784..c258ddfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (1.110) UNRELEASED; 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:43:56 +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;;