Remove mention of desktop choice from yaboot boot messages

Backport of fix for #783569

data/jessie/yaboot/boot.msg

@@ -15,14 +15,5 @@ Press TAB for a full list of options.
 If the system fails to boot with a white screen
 which doesn't go away, add 'video=ofonly'.
 
-The following desktop environments are available:
-gnome, kde, xfce and lxde.  The default on this ${MEDIA_TYPE}
-is ${DEFAULT_DESKTOP}.
-If you prefer a different desktop, append
-    "desktop=<your choice>"
-e.g. to do an expert install with the xfce desktop
-environment, type
-    "expert desktop=xfce"
-at the "boot:" prompt.
 
 

data/jessie/yaboot/boot32.msg

@@ -12,13 +12,3 @@ If the system fails to boot with a white screen
 which doesn't go away, try: 
 
 install video=ofonly 
-
-The following desktop environments are available:
-gnome, kde, xfce and lxde.  The default on this ${MEDIA_TYPE}
-is ${DEFAULT_DESKTOP}.
-If you prefer a different desktop, append
-    "desktop=<your choice>"
-e.g. to do an expert install with the xfce desktop
-environment, type
-    "expert desktop=xfce"
-at the "boot:" prompt.

debian/changelog

@@ -1,3 +1,10 @@
+debian-cd (3.1.17-jessie) UNRELEASED; urgency=medium
+
+  * Backports of fixes from debian-cd in unstable:
+    + Remove mention of desktop choice from yaboot boot messages
+      (Closes: #783569)
+
+
 debian-cd (3.1.17) unstable; urgency=medium
 
   [ Steve McIntyre ]