* Merge from Ubuntu:

  - Prefer translations from language packs.  (No-op for Debian, but
    harmless.)

diff --git a/debian/changelog b/debian/changelog
index 0fc4749e91c15c5b5d446323a843f91626be5f9b..2bfa334ad7346242f1e6a042e30aed12202892cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ grub2 (2.00-7) UNRELEASED; urgency=low
   * Backport from upstream:
     - Fix stderr leakage from grub-probe in is_path_readable_by_grub.
     - Fix tftp endianness problem.
+  * Merge from Ubuntu:
+    - Prefer translations from language packs.  (No-op for Debian, but
+      harmless.)
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 26 Sep 2012 13:16:52 +0100
 

diff --git a/debian/patches/install_locale_langpack.patch b/debian/patches/install_locale_langpack.patch
new file mode 100644 (file)
index 0000000..9b71cad
--- /dev/null
+++ b/debian/patches/install_locale_langpack.patch
@@ -0,0 +1,19 @@
+Description: Prefer translations from language packs
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/537998
+Forwarded: not-needed
+Last-Update: 2012-09-26
+
+Index: b/util/grub-install.in
+===================================================================
+--- a/util/grub-install.in
++++ b/util/grub-install.in
+@@ -543,7 +543,7 @@
+ 
+ # Copy gettext files
+ mkdir -p "${grubdir}"/locale/
+-for dir in "${localedir}"/*; do
++for dir in "${localedir}"/* "${localedir}-langpack"/*; do
+     if test -f "$dir/LC_MESSAGES/grub.mo"; then
+         cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
+     fi

diff --git a/debian/patches/series b/debian/patches/series
index 8dc28074d48b618f4f4f441866c4f52d9cc631d7..ba5c86e32c6a1fd77b6bc9be9899aa390e175318 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ msdos_embed_off_by_one.patch
 emu_freebsd.patch
 mkconfig_stderr_handling.patch
 tftp_endianness.patch
+install_locale_langpack.patch

diff --git a/util/grub-install.in b/util/grub-install.in
index de03022e8af7ee3cb6463583020f85f5ecfbe478..00dc875ca402fdfef5fc7006e18812dacee8a056 100644 (file)
--- a/util/grub-install.in
+++ b/util/grub-install.in
@@ -543,7 +543,7 @@ fi
 
 # Copy gettext files
 mkdir -p "${grubdir}"/locale/
-for dir in "${localedir}"/*; do
+for dir in "${localedir}"/* "${localedir}-langpack"/*; do
     if test -f "$dir/LC_MESSAGES/grub.mo"; then
         cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo"
     fi