Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-06 07:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating from trunk and reversioning the changelog

Browse Source
This commit is contained in:
Sergio Schvezov 2013-07-17 15:47:56 -03:00
commit c0224c1e4f
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/changelog vendored
View File

@ -1,9 +1,21 @@
livecd-rootfs (2.160) UNRELEASED; urgency=low livecd-rootfs (2.162) UNRELEASED; urgency=low
* Ubuntu Touch click package install hook. * Ubuntu Touch click package install hook.
-- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 17 Jul 2013 00:05:49 -0300 -- Sergio Schvezov <sergio.schvezov@canonical.com> Wed, 17 Jul 2013 00:05:49 -0300
livecd-rootfs (2.161) saucy; urgency=low
* drop bashrc mangling from ubuntu-touch builds \o/
-- Oliver Grawert <ogra@ubuntu.com> Wed, 17 Jul 2013 16:30:12 +0200
livecd-rootfs (2.160) saucy; urgency=low
* Do the same trick as in 2.158 for kubuntu armhf+omap4 too.
-- Iain Lane <iain.lane@canonical.com> Wed, 17 Jul 2013 11:52:23 +0100
livecd-rootfs (2.159) saucy; urgency=low livecd-rootfs (2.159) saucy; urgency=low
* make touch images source the dbus session address from * make touch images source the dbus session address from

16
live-build/auto/config
View File

@ -191,7 +191,21 @@ case $PROJECT in
;; ;;
kubuntu|kubuntu-dvd) kubuntu|kubuntu-dvd)
add_task install minimal standard kubuntu-desktop add_task install minimal standard
case "$ARCH+$SUBARCH" in
armhf+omap4)
# Don't use the task as this drags in the regular X
# stack (the metapackage doesn't). We want the
# "reverted" one.
add_package install kubuntu-desktop \
xserver-xorg-core-omap-revert \
xserver-xorg-video-omap-revert \
xserver-xorg-input-evdev-omap-revert
;;
*)
add_task install kubuntu-desktop
;;
esac
LIVE_TASK='kubuntu-live' LIVE_TASK='kubuntu-live'
COMPONENTS='main restricted universe' COMPONENTS='main restricted universe'
add_chroot_hook remove-gnome-icon-cache add_chroot_hook remove-gnome-icon-cache

4
live-build/ubuntu-touch/hooks/48-setup-env.chroot
View File

@ -26,7 +26,3 @@ LANGUAGE=en_US:en
QT_IM_MODULE=maliitphablet QT_IM_MODULE=maliitphablet
HUD_NO_STORE_USAGE_DATA=1 HUD_NO_STORE_USAGE_DATA=1
INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment
echo -e "\n# export the phablet shell dbus session on normal login shells
source /home/phablet/.cache/upstart/dbus-session
export DBUS_SESSION_BUS_ADDRESS" >> /home/phablet/.bashrc