Import patches-unapplied version 2.235 to ubuntu/utopic-proposed

Imported using git-ubuntu import.

Changelog parent: 5264712d26

New changelog entries:
  * Only add the ubuntu-core hooks for the system-image subproject.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.235) utopic; urgency=medium
+
+  * Only add the ubuntu-core hooks for the system-image subproject.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 05 Aug 2014 08:34:27 +0200
+
 livecd-rootfs (2.234) utopic; urgency=medium
 
   [ James Hunt ]

live-build/auto/config

@@ -545,8 +545,8 @@ EOF
 	      config/archives/proposed.list.binary
 fi
 
-case $PROJECT in
-	*-dvd)
+case $PROJECT:$SUBPROJECT in
+	*-dvd:*)
 		. config/bootstrap
 
 		cat > config/archives/dvd.list.binary << EOF
@@ -561,7 +561,7 @@ EOF
 		fi
 		;;
 
-	ubuntu-touch|ubuntu-core)
+	ubuntu-touch:*|ubuntu-core:system-image)
 		cp -af /usr/share/livecd-rootfs/live-build/${PROJECT}/* \
 			config/
 		;;