Remove "GNU/Linux" from default distributor string for Ubuntu.

debian/changelog

@@ -9,6 +9,7 @@ grub2 (2.00-13) UNRELEASED; urgency=low
     - source_grub2.py: Use attach_default_grub from apport's hookutils.
     - Output a menu entry for firmware setup on UEFI FastBoot systems.
     - Set a monochromatic theme and an appropriate background for Ubuntu.
+    - Remove "GNU/Linux" from default distributor string for Ubuntu.
 
  -- Colin Watson <cjwatson@debian.org>  Mon, 28 Jan 2013 11:08:07 +0000
 

debian/patches/mkconfig_ubuntu_distributor.patch

@@ -0,0 +1,24 @@
+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>
+Forwarded: not-needed
+Last-Update: 2013-01-29
+
+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 @@
+ if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
+   OS=GNU/Linux
+ else
+-  OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
++    OS="${GRUB_DISTRIBUTOR}"
++  else
++    OS="${GRUB_DISTRIBUTOR} GNU/Linux"
++  fi
+   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
+ fi
+ 

debian/patches/series

@@ -35,3 +35,4 @@ default_grub_d.patch
 blacklist_1440x900x32.patch
 kfreebsd_9.1.patch
 uefi_firmware_setup.patch
+mkconfig_ubuntu_distributor.patch

util/grub.d/10_linux.in

@@ -30,8 +30,12 @@ CLASS="--class gnu-linux --class gnu --class os"
 
 if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
   OS=GNU/Linux
+else
+  if [ "${GRUB_DISTRIBUTOR}" = "Ubuntu" ] ; then
+    OS="${GRUB_DISTRIBUTOR}"
   else
     OS="${GRUB_DISTRIBUTOR} GNU/Linux"
+  fi
   CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
 fi