diff options
Diffstat (limited to 'sys-boot/grub/files/ubuntu-upstream-1.98/970_fix_locale_installation.diff')
-rw-r--r-- | sys-boot/grub/files/ubuntu-upstream-1.98/970_fix_locale_installation.diff | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/sys-boot/grub/files/ubuntu-upstream-1.98/970_fix_locale_installation.diff b/sys-boot/grub/files/ubuntu-upstream-1.98/970_fix_locale_installation.diff deleted file mode 100644 index ab202885..00000000 --- a/sys-boot/grub/files/ubuntu-upstream-1.98/970_fix_locale_installation.diff +++ /dev/null @@ -1,55 +0,0 @@ -Description: Copy .mo files from @datadir@/locale - This matches where 'make install' puts them. -Origin: upstream, http://bazaar.launchpad.net/~vcs-imports/grub/grub2-bzr/revision/2265 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/537998 -Forwarded: http://lists.gnu.org/archive/html/grub-devel/2010-03/msg00074.html -Last-Update: 2010-03-22 - -diff -Nur -x '*.orig' -x '*~' grub2/util/grub-install.in grub2.new/util/grub-install.in ---- grub2/util/grub-install.in 2010-03-22 15:49:32.000000000 +0000 -+++ grub2.new/util/grub-install.in 2010-03-22 15:54:31.000000000 +0000 -@@ -32,6 +32,7 @@ - host_os=@host_os@ - font=@datadir@/@PACKAGE_TARNAME@/ascii.pf2 - pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` -+localedir=@datadir@/locale - - grub_setup=${sbindir}/`echo grub-setup | sed ${transform}` - if [ "${target_cpu}-${platform}" = "i386-pc" ] || [ "${target_cpu}-${platform}" = "sparc64-ieee1275" ] || [ "${target_cpu}-${platform}" = "mips-yeeloong" ] ; then -@@ -245,9 +246,9 @@ - - # Copy gettext files - mkdir -p ${grubdir}/locale/ --for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do -- if test -f "$file"; then -- cp -f "$file" ${grubdir}/locale/ -+for dir in ${localedir}/*; do -+ if test -f "$dir/LC_MESSAGES/grub.mo"; then -+ cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo" - fi - done - -diff -Nur -x '*.orig' -x '*~' grub2/util/i386/efi/grub-install.in grub2.new/util/i386/efi/grub-install.in ---- grub2/util/i386/efi/grub-install.in 2010-03-09 16:14:00.000000000 +0000 -+++ grub2.new/util/i386/efi/grub-install.in 2010-03-22 15:54:31.000000000 +0000 -@@ -31,6 +31,7 @@ - platform=@platform@ - host_os=@host_os@ - pkglibdir=${libdir}/`echo ${PACKAGE_TARNAME}/${target_cpu}-${platform} | sed ${transform}` -+localedir=@datadir@/locale - - grub_mkimage=${bindir}/`echo grub-mkimage | sed ${transform}` - grub_mkdevicemap=${sbindir}/`echo grub-mkdevicemap | sed ${transform}` -@@ -182,9 +183,9 @@ - - # Copy gettext files - mkdir -p ${grubdir}/locale/ --for file in ${grubdir}/locale/*.mo ${pkglibdir}/locale/*.mo; do -- if test -f "$file"; then -- cp -f "$file" ${grubdir}/locale/ -+for dir in ${localedir}/*; do -+ if test -f "$dir/LC_MESSAGES/grub.mo"; then -+ cp -f "$dir/LC_MESSAGES/grub.mo" "${grubdir}/locale/${dir##*/}.mo" - fi - done - |