Import patches-unapplied version 2.160 to ubuntu/saucy-proposed

Imported using git-ubuntu import.

Changelog parent: 07dab9cf2f

New changelog entries:
  * Do the same trick as in 2.158 for kubuntu armhf+omap4 too.

debian/changelog

@@ -1,3 +1,9 @@
+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
 
   * make touch images source the dbus session address from

live-build/auto/config

@@ -191,7 +191,21 @@ case $PROJECT in
 		;;
 
 	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'
 		COMPONENTS='main restricted universe'
 		add_chroot_hook remove-gnome-icon-cache