From 70b02315bdfad94fee06464ea5a9b3e74cd26191 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti de Araujo Date: Thu, 4 Jul 2013 13:44:08 -0300 Subject: [PATCH] Import patches-unapplied version 2.154 to ubuntu/saucy-proposed Imported using git-ubuntu import. Changelog parent: 71b93fe42776cbee99c683a4dfc31b856f54ee24 New changelog entries: [ Sergio Schvezov ] * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir. * Switching to using the maliit plugin provided by maliit-framework. --- debian/changelog | 8 ++++++++ .../archives/ubuntu-unity-next.key.chroot | 13 +++++++++++++ .../archives/ubuntu-unity-next.list.chroot | 2 ++ live-build/ubuntu-touch/hooks/48-setup-env.chroot | 2 +- 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot create mode 100644 live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot diff --git a/debian/changelog b/debian/changelog index 69848f5e..9321cf7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.154) saucy; urgency=low + + [ Sergio Schvezov ] + * Adding ppa:ubuntu-unity/next for Touch to obtain unity8 and Mir. + * Switching to using the maliit plugin provided by maliit-framework. + + -- Ricardo Salveti de Araujo Thu, 04 Jul 2013 13:44:08 -0300 + livecd-rootfs (2.153) saucy; urgency=low * we do better not try to create something outside of a chroot while we are diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot new file mode 100644 index 00000000..0ce716cb --- /dev/null +++ b/live-build/ubuntu-touch/archives/ubuntu-unity-next.key.chroot @@ -0,0 +1,13 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +mI0EUKJp4AEEANqa4yLubhYUWP6NFignwYDXfSQDxD1K5m06SyuTuqI37zRI+GaF +vaiNCwzK7Qfx4TikrpNIIIc3c1+rYSsSQQadWqJRvrbs7MixcDQGRb+SQ+bglIdD ++1hw9xSvMXGO/dOaZv6ZVlLxJiYWAKZuFXtugKQF2yyh0eug6/7wuRYxABEBAAG0 +MkxhdW5jaHBhZCBQUEEgZm9yIFVidW50dSBVbml0eSBQUyBpbnRlZ3JhdGlvbiB0 +ZWFtiLgEEwECACIFAlCiaeACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJ +EEVRQo5S1i9FdDMEAKL25MjyO+W7+MJRiEzaV/gda41lQsqLFXDWdYFaF1FqrLNa +6/E5Ph+oVV6tK8O/HSeXGVgDZeEL6iBX3SvwEgLyGr33z8IZ22JNS5UIXmwSKO5P +Ix8Qs6LjOaQtAlZRDwj/5wQo9IqNclSA/hrFNH7XuHeglqITgccPCPEZMByN +=VBVL +-----END PGP PUBLIC KEY BLOCK----- diff --git a/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot b/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot new file mode 100644 index 00000000..4917feb7 --- /dev/null +++ b/live-build/ubuntu-touch/archives/ubuntu-unity-next.list.chroot @@ -0,0 +1,2 @@ +deb http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main +# deb-src http://ppa.launchpad.net/ubuntu-unity/next/ubuntu @DISTRIBUTION@ main diff --git a/live-build/ubuntu-touch/hooks/48-setup-env.chroot b/live-build/ubuntu-touch/hooks/48-setup-env.chroot index 53b40866..5a007031 100755 --- a/live-build/ubuntu-touch/hooks/48-setup-env.chroot +++ b/live-build/ubuntu-touch/hooks/48-setup-env.chroot @@ -23,7 +23,7 @@ ANDROID_ROOT=/system EXTERNAL_STORAGE=/mnt/sdcard LANG=en_US.UTF-8 LANGUAGE=en_US:en -QT_IM_MODULE=maliit +QT_IM_MODULE=maliitphablet HUD_NO_STORE_USAGE_DATA=1 INDICATOR_ALLOW_NO_WATCHERS=1" > /etc/environment