=== modified file 'debian/changelog'
--- debian/changelog	2011-09-05 15:43:46 +0000
+++ debian/changelog	2011-09-14 01:29:41 +0000
@@ -1,3 +1,11 @@
+grub2 (1.99-12ubuntu2) oneiric; urgency=low
+
+  * Add ubuntu_recovery_nosingle.patch:
+    - Replace "single" by "recovery" to trigger friendly-recovery (LP: #575469)
+  * Mark grub-common as breaking friendly-recovery << 0.2.13
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 07 Sep 2011 20:23:25 -0400
+
 grub2 (1.99-12ubuntu1) oneiric; urgency=low
 
   * Resynchronise with Debian.  Remaining changes:

=== modified file 'debian/control'
--- debian/control	2011-08-09 12:12:53 +0000
+++ debian/control	2011-09-14 01:29:41 +0000
@@ -73,7 +73,7 @@
 Suggests: multiboot-doc, grub-emu, xorriso (>= 0.5.6.pl00), desktop-base (>= 4.0.6)
 # See bugs #435983 and #455746
 Conflicts: mdadm (<< 2.6.7-2)
-Breaks: lupin-support (<< 0.30)
+Breaks: lupin-support (<< 0.30), friendly-recovery (<< 0.2.13)
 Multi-Arch: foreign
 Description: GRand Unified Bootloader (common files)
  This package contains common files shared by the distinct flavours of GRUB.

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-09-05 15:04:19 +0000
+++ debian/patches/series	2011-09-14 01:29:41 +0000
@@ -45,4 +45,5 @@
 ubuntu_vbe_autodetect.patch
 ubuntu_blacklist_1440x900x32.patch
 ubuntu_recovery_nomodeset.patch
+ubuntu_recovery_nosingle.patch
 ubuntu_wubi_no_windows.patch

=== added file 'debian/patches/ubuntu_recovery_nosingle.patch'
--- debian/patches/ubuntu_recovery_nosingle.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/ubuntu_recovery_nosingle.patch	2011-09-14 01:30:26 +0000
@@ -0,0 +1,26 @@
+Description: Replace single by recovery to trigger friendly-recovery
+Author: Stéphane Graber <stgraber@ubuntu.com>
+Forwarded: no
+Last-Update: 2011-09-13
+
+Index: b/util/grub.d/10_linux.in
+===================================================================
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -232,8 +232,13 @@
+       "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_EXTRA} ${GRUB_CMDLINE_LINUX_DEFAULT}" \
+       quiet
+   if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
+-    linux_entry "${OS}" "${version}" true \
+-	"single nomodeset ${GRUB_CMDLINE_LINUX}"
++    if [ -x /lib/recovery-mode/recovery-menu ]; then
++      linux_entry "${OS}" "${version}" true \
++        "recovery nomodeset ${GRUB_CMDLINE_LINUX}"
++    else
++      linux_entry "${OS}" "${version}" true \
++        "single nomodeset ${GRUB_CMDLINE_LINUX}"
++    fi
+   fi
+ 
+   list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '`
+