From 85bd824e1a365b784051a2091af1b723eb1dcb20 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Mon, 5 Mar 2012 15:20:39 +0000
Subject: [PATCH] Fix incorrect identifiers in bash-completion (closes:
 #661415).

---
 debian/changelog                              |  1 +
 .../patches/bash-completion_identifiers.patch | 45 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 47 insertions(+)
 create mode 100644 debian/patches/bash-completion_identifiers.patch

diff --git a/debian/changelog b/debian/changelog
index a932909e9..69a317712 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ grub2 (1.99-15) UNRELEASED; urgency=low
     - Handle newer autotools, and add some missing quotes in the process.
       (Note that this moves grub-mkconfig_lib and update-grub_lib to
       /usr/share/grub; I added links in /usr/lib/grub for compatibility.)
+    - Fix incorrect identifiers in bash-completion (closes: #661415).
   * Build with GCC 4.6 (closes: #654727).
 
   [ Debconf translations ]
diff --git a/debian/patches/bash-completion_identifiers.patch b/debian/patches/bash-completion_identifiers.patch
new file mode 100644
index 000000000..814c10187
--- /dev/null
+++ b/debian/patches/bash-completion_identifiers.patch
@@ -0,0 +1,45 @@
+Description: Fix incorrect identifiers in bash-completion
+Author: Andreas Born <futur.andy@googlemail.com>
+Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/3426
+Last-Update: 2012-03-05
+
+Index: b/util/bash-completion.d/grub-completion.bash.in
+===================================================================
+--- a/util/bash-completion.d/grub-completion.bash.in
++++ b/util/bash-completion.d/grub-completion.bash.in
+@@ -402,7 +402,7 @@
+ #
+ # grub-mkpasswd-pbkdf2
+ #
+-_grub_mkpasswd-pbkdf2 () {
++_grub_mkpasswd_pbkdf2 () {
+     local cur
+ 
+     COMPREPLY=()
+@@ -417,7 +417,7 @@
+ }
+ __grub_mkpasswd_pbkdf2_program=$( echo grub-mkpasswd-pbkdf2 | sed "@program_transform_name@" )
+ have ${__grub_mkpasswd_pbkdf2_program} && \
+- complete -F _grub_mkpasswd-pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
++ complete -F _grub_mkpasswd_pbkdf2 -o filenames ${__grub_mkpasswd_pbkdf2_program}
+ unset __grub_mkpasswd_pbkdf2_program
+ 
+ 
+@@ -462,7 +462,7 @@
+ #
+ # grub-script-check
+ #
+-_grub_script-check () {
++_grub_script_check () {
+     local cur
+ 
+     COMPREPLY=()
+@@ -477,7 +477,7 @@
+ }
+ __grub_script_check_program=$( echo grub-script-check | sed "@program_transform_name@" )
+ have ${__grub_script_check_program} && \
+- complete -F _grub_script-check -o filenames ${__grub_script_check_program}
++ complete -F _grub_script_check -o filenames ${__grub_script_check_program}
+ 
+ 
+ # Local variables:
diff --git a/debian/patches/series b/debian/patches/series
index dd99b770c..3a5638fc7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,4 @@ no_libzfs.patch
 xfs_invalid_bmap.patch
 handle_new_autotools.patch
 efi_disk_cache.patch
+bash-completion_identifiers.patch