* Merge from Ubuntu:

- Treat Kubuntu as an alias for Ubuntu in GRUB_DISTRIBUTOR (Harald
    Sitter).

debian/changelog

@@ -5,6 +5,9 @@ grub2 (2.00-16) UNRELEASED; urgency=low
   * Backport from upstream:
     - Move @itemize after @subsection to satisfy texinfo-5.1.
     - grub-mkconfig: Fix detection of Emacs autosave files.
+  * Merge from Ubuntu:
+    - Treat Kubuntu as an alias for Ubuntu in GRUB_DISTRIBUTOR (Harald
+      Sitter).
 
  -- Colin Watson <cjwatson@debian.org>  Sun, 11 Aug 2013 12:12:54 +0100
 

debian/grub.d/05_debian_theme

@@ -28,7 +28,8 @@ test -d /boot/grub; cd /boot/grub
 BACKGROUND_CACHE=".background_cache"
 
 set_default_theme(){
-	if [ "$GRUB_DISTRIBUTOR" = Ubuntu ]; then
+	case $GRUB_DISTRIBUTOR in
+		Ubuntu|Kubuntu)
 			# Set a monochromatic theme for Ubuntu.
 			echo "${1}set menu_color_normal=white/black"
 			echo "${1}set menu_color_highlight=black/light-gray"
@@ -36,11 +37,13 @@ set_default_theme(){
 			if [ -e /lib/plymouth/themes/default.grub ]; then
 				sed "s/^/${1}/" /lib/plymouth/themes/default.grub
 			fi
-	else
+			;;
+		*)
 			# Set the traditional Debian blue theme.
 			echo "${1}set menu_color_normal=cyan/blue"
 			echo "${1}set menu_color_highlight=white/blue"
-	fi
+			;;
+	esac
 }
 
 module_available(){
@@ -170,10 +173,15 @@ if set_background_image "${WALLPAPER}" "${COLOR_NORMAL}" "${COLOR_HIGHLIGHT}"; t
 fi
 
 # If we haven't found a background image yet, use the default from desktop-base.
-if [ "$GRUB_DISTRIBUTOR" != Ubuntu ] && \
+case $GRUB_DISTRIBUTOR in
-   set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then
+	Ubuntu|Kubuntu)
+		;;
+	*)
+		if set_background_image "/usr/share/images/desktop-base/desktop-grub.png"; then
 			exit 0
-fi
+		fi
+		;;
+esac
 
 # Finally, if all of the above fails, use the default theme.
 set_default_theme

debian/patches/mkconfig_signed_kernel.patch

@@ -7,7 +7,7 @@ Index: b/util/grub.d/10_linux.in
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -140,8 +140,16 @@
+@@ -143,8 +143,16 @@
    message="$(gettext_printf "Loading Linux %s ..." ${version})"
    sed "s/^/$submenu_indentation/" << EOF
  	echo	'$(echo "$message" | grub_quote)'
@@ -24,7 +24,7 @@ Index: b/util/grub.d/10_linux.in
    if test -n "${initrd}" ; then
      # TRANSLATORS: ramdisk isn't identifier. Should be translated.
      message="$(gettext_printf "Loading initial ramdisk ...")"
-@@ -187,6 +195,13 @@
+@@ -190,6 +198,13 @@
  is_first_entry=true
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`

debian/patches/mkconfig_ubuntu_distributor.patch

@@ -2,23 +2,27 @@ Description: Remove GNU/Linux from default distributor string for Ubuntu
  Ubuntu is called "Ubuntu", not "Ubuntu GNU/Linux".
 Author: Mario Limonciello <Mario_Limonciello@dell.com>
 Author: Colin Watson <cjwatson@debian.org>
+Author: Harald Sitter <apachelogger@kubuntu.org>
 Forwarded: not-needed
-Last-Update: 2013-01-29
+Last-Update: 2013-08-12
 
 Index: b/util/grub.d/10_linux.in
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -31,7 +31,11 @@
+@@ -31,7 +31,14 @@
  if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
    OS=GNU/Linux
  else
 -  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
++  case ${GRUB_DISTRIBUTOR} in
++    Ubuntu|Kubuntu)
 +      OS="${GRUB_DISTRIBUTOR}"
-+  else
++      ;;
++    *)
 +      OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+  fi
++      ;;
++  esac
    CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
  fi
  

util/grub.d/10_linux.in

@@ -31,11 +31,14 @@ CLASS="--class gnu-linux --class gnu --class os"
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
 else
-  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
+  case ${GRUB_DISTRIBUTOR} in
+    Ubuntu|Kubuntu)
       OS="${GRUB_DISTRIBUTOR}"
-  else
+      ;;
+    *)
       OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-  fi
+      ;;
+  esac
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi