Bug#607867: grub-common: shouty "XEN" in menu items

[Ian Campbell]

Package: grub-common
Version: 1.98+20100804-11
Severity: minor
Tags: patch

update-grub currently produces menu items like:
	'Debian GNU/Linux, with Linux 2.6.32-5-xen-amd64 and XEN 4.0-amd64'

There is no reason to capitalise Xen in that way and IMHO it looks strange.

The attached patch switches to:
	'Debian GNU/Linux, with Xen 4.0-amd64 and Linux 2.6.32-5-xen-amd64'

I moved Xen first since I think it makes it clearer that a given menu item
launches Xen, which is useful information to put up front. Also I found that
with the long Linux version numbers Debian uses the Xen was very nearly off the
edge of the screen.

Although the string is processed with gettext_quoted it doesn't appear to be
translated anywhere (or at least I couldn't find where).
 
-- System Information:
Debian Release: 6.0
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-xen-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/bash

Versions of packages grub-common depends on:
ii  base-files              6.0              Debian base system miscellaneous f
ii  dpkg                    1.15.8.7         Debian package management system
ii  gettext-base            0.18.1.1-3       GNU Internationalization utilities
ii  install-info            4.13a.dfsg.1-6   Manage installed documentation in 
ii  libc6                   2.11.2-7         Embedded GNU C Library: Shared lib
ii  libdevmapper1.02.1      2:1.02.48-4      The Linux Kernel Device Mapper use
ii  libfreetype6            2.4.2-2.1        FreeType 2 font engine, shared lib
ii  zlib1g                  1:1.2.3.4.dfsg-3 compression library - runtime

Versions of packages grub-common recommends:
ii  os-prober                     1.41       utility to detect other OSes on a 

Versions of packages grub-common suggests:
pn  grub-emu                      <none>     (no description available)
pn  multiboot-doc                 <none>     (no description available)
pn  xorriso                       <none>     (no description available)

-- Configuration Files:
/etc/grub.d/10_linux changed [not included]
/etc/grub.d/20_linux_xen changed [not included]

-- no debconf information
-------------- next part --------------
=== modified file 'util/grub.d/20_linux_xen.in'
--- util/grub.d/20_linux_xen.in	2010-12-21 12:49:29 +0000
+++ util/grub.d/20_linux_xen.in	2010-12-23 09:14:38 +0000
@@ -60,11 +60,11 @@
   args="$5"
   xen_args="$6"
   if ${recovery} ; then
-    title="$(gettext_quoted "%s, with Linux %s and XEN %s (recovery mode)")"
+    title="$(gettext_quoted "%s, with Xen %s and Linux %s (recovery mode)")"
   else
-    title="$(gettext_quoted "%s, with Linux %s and XEN %s")"
+    title="$(gettext_quoted "%s, with Xen %s and Linux %s")"
   fi
-  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${version}" "${xen_version}"
+  printf "menuentry '${title}' ${CLASS} {\n" "${os}" "${xen_version}" "${version}"
   if ! ${recovery} ; then
       save_default_entry | sed -e "s/^/\t/"
   fi