Don't run gettext_strings_test; this test is mainly useful as an upstream maintenance...

diff --git a/autogen.sh b/autogen.sh
index 25ded8d94a894d8f79de4b4048239b424f267a49..7424428d6b70e405c44cb33f2fb26235dc6f695d 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,7 +5,7 @@ set -e
 export LC_COLLATE=C
 unset LC_ALL
 
-find . -name .pc -prune -o -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' -print |sort > po/POTFILES.in
+find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
 find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
 
 echo "Importing unicode..."

diff --git a/debian/changelog b/debian/changelog
index b75562487abeb0d5ad38f87dd2d368cbe64a670e..1fe4a873120f86692f36d7dec4a7a6f4649e8b50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,8 @@ grub2 (2.02~beta1-1) UNRELEASED; urgency=low
     which is a better fix for the original problem (closes: #732245).
   * Fix mismerge of mkconfig_loopback.patch.
   * Build for ppc64el, using a powerpc cross-compiler at least for now.
-  * Don't add quilt files to po/POTFILES.in.
-  * Ignore untranslatable strings in grub-extras.
+  * Don't run gettext_strings_test; this test is mainly useful as an
+    upstream maintenance check.
 
  -- Colin Watson <cjwatson@debian.org>  Tue, 10 Dec 2013 17:39:47 +0000
 

diff --git a/debian/patches/gettext_test_ignore_extras.patch b/debian/patches/gettext_test_ignore_extras.patch
deleted file mode 100644 (file)
index be2c276..0000000
--- a/debian/patches/gettext_test_ignore_extras.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Ignore untranslatable strings in grub-extras
- Also config.h until 2.02~beta2 or newer.
-Author: Colin Watson <cjwatson@ubuntu.com>
-Forwarded: no
-Last-Update: 2013-12-23
-
-Index: b/tests/gettext_strings_test.in
-===================================================================
---- a/tests/gettext_strings_test.in
-+++ b/tests/gettext_strings_test.in
-@@ -11,7 +11,7 @@
- cat po/POTFILES.in | xargs grep -hE -o "(  |    ){\"[a-z0-9\-]*\",[[:space:]]*('.'|[0-9]|-[0-9])," |sed "s,[[:space:]]*{\",,g;s,\"\,[[:space:]]*\('.'\|[0-9]\|-[0-9]\)\,,,g" | awk '{ print "msgid \"" $0 "\"\nmsgstr \"\"" ; }' > "$tdir/"opts.pot
- cat po/POTFILES.in | xargs grep -hE -o "[[:space:]]*\.name[[:space:]]*=[[:space:]]*\"[a-zA-Z0-9 ()]*\"" |sed "s,[[:space:]]*\.name[[:space:]]*=[[:space:]]*\",,g;s,\",,g" | awk '{ print "msgid \"" $0 "\"\nmsgstr \"\"" ; }' > "$tdir/"name.pot
- 
--out="$(cat po/POTFILES.in | grep -v '\(colors.c\|lsefisystab.c\|lsefimmap.c\|lssal.c\|hdparm.c\|sendkey.c\|lsacpi.c\|lspci.c\|usbtest.c\|legacy_parse.c\|/libgcrypt/\|hfs.c\|/efi\.c$\|gnulib\|tests/\|util/ieee1275/ofpath.c\|minilzo.c\|terminfo.c\|setpci.c\|bin2h.c\|cb_timestamps.c\|grub-pe2elf.c\|getroot_[a-z]*.c\|getroot.c\|arc/init.c\|color.c\|grub-mklayout.c\|gentrigtables.c\|lzodefs.h\|lsefi.c\|cbls.c\|/zfs\.h$\|grub-macho2img.c\|syslinux_parse.c\|lvm.c\|efidisk.c\|grub-mkfont.c\|reiserfs.c\|LzmaEnc.c\)' | xgettext -f - -L C -o - -x po/grub.pot -x "$tdir/"skip.pot -x "$tdir/"skip2.pot -x "$tdir/"skip3.pot -x "$tdir/"opts.pot -x "$tdir/"name.pot -x po/exclude.pot -a --from-code=iso-8859-1)"
-+out="$(cat po/POTFILES.in | grep -v '\(colors.c\|lsefisystab.c\|lsefimmap.c\|lssal.c\|hdparm.c\|sendkey.c\|lsacpi.c\|lspci.c\|usbtest.c\|legacy_parse.c\|/libgcrypt/\|hfs.c\|/efi\.c$\|gnulib\|tests/\|util/ieee1275/ofpath.c\|minilzo.c\|terminfo.c\|setpci.c\|bin2h.c\|cb_timestamps.c\|grub-pe2elf.c\|getroot_[a-z]*.c\|getroot.c\|arc/init.c\|color.c\|grub-mklayout.c\|gentrigtables.c\|lzodefs.h\|lsefi.c\|cbls.c\|/zfs\.h$\|grub-macho2img.c\|syslinux_parse.c\|lvm.c\|efidisk.c\|grub-mkfont.c\|reiserfs.c\|LzmaEnc.c\|config\.h\|grub-extras\)' | xgettext -f - -L C -o - -x po/grub.pot -x "$tdir/"skip.pot -x "$tdir/"skip2.pot -x "$tdir/"skip3.pot -x "$tdir/"opts.pot -x "$tdir/"name.pot -x po/exclude.pot -a --from-code=iso-8859-1)"
- rm -rf "$tdir"
- if [ x"$out" != x ]; then
-     echo "$out"

diff --git a/debian/patches/potfiles-skip-pc.patch b/debian/patches/potfiles-skip-pc.patch
deleted file mode 100644 (file)
index 23a41a8..0000000
--- a/debian/patches/potfiles-skip-pc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Don't add quilt files to po/POTFILES.in
-Author: Colin Watson <cjwatson@ubuntu.com>
-Forwarded: no
-Last-Update: 2013-12-23
-
-Index: b/autogen.sh
-===================================================================
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -5,7 +5,7 @@
- export LC_COLLATE=C
- unset LC_ALL
- 
--find . -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' |sort > po/POTFILES.in
-+find . -name .pc -prune -o -iname '*.[ch]' ! -ipath './grub-core/lib/libgcrypt-grub/*' ! -ipath './build-aux/*' ! -ipath './grub-core/lib/libgcrypt/src/misc.c' ! -ipath './grub-core/lib/libgcrypt/src/global.c' ! -ipath './grub-core/lib/libgcrypt/src/secmem.c'  ! -ipath './util/grub-gen-widthspec.c' ! -ipath './util/grub-gen-asciih.c' -print |sort > po/POTFILES.in
- find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
- 
- echo "Importing unicode..."

diff --git a/debian/patches/series b/debian/patches/series
index d68a9ec1254eca95bd110b6c9ea8ee647ee30551..2a139a61de2a315b5581f988274b1725857e73b2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -38,5 +38,4 @@ vt_handoff.patch
 probe_fusionio.patch
 ignore_grub_func_test_failures.patch
 mkconfig_recovery_title.patch
-potfiles-skip-pc.patch
-gettext_test_ignore_extras.patch
+skip_gettext_strings_test.patch

diff --git a/debian/patches/skip_gettext_strings_test.patch b/debian/patches/skip_gettext_strings_test.patch
new file mode 100644 (file)
index 0000000..2ed0e80
--- /dev/null
+++ b/debian/patches/skip_gettext_strings_test.patch
@@ -0,0 +1,19 @@
+Description: Don't run gettext_strings_test
+ This test is mainly useful as an upstream maintenance check.
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: not-needed
+Last-Update: 2013-12-23
+
+Index: b/tests/gettext_strings_test.in
+===================================================================
+--- a/tests/gettext_strings_test.in
++++ b/tests/gettext_strings_test.in
+@@ -1,5 +1,8 @@
+ #!/bin/sh
+ 
++echo "Skipping upstream maintenance check."
++exit 77
++
+ cd '@srcdir@'
+ 
+ tdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")"

diff --git a/tests/gettext_strings_test.in b/tests/gettext_strings_test.in
index 21e767ebf232e09a4aa84a8a1313b3b32b592d9c..15405cfcd8e11f6d899fe8679fcbe86f2d59967b 100644 (file)
--- a/tests/gettext_strings_test.in
+++ b/tests/gettext_strings_test.in
@@ -1,5 +1,8 @@
 #!/bin/sh
 
+echo "Skipping upstream maintenance check."
+exit 77
+
 cd '@srcdir@'
 
 tdir="$(mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX")"
@@ -11,7 +14,7 @@ xgettext -f po/POTFILES.in -L C -o "$tdir/"skip3.pot -x po/grub.pot --keyword=vo
 cat po/POTFILES.in | xargs grep -hE -o "(  |    ){\"[a-z0-9\-]*\",[[:space:]]*('.'|[0-9]|-[0-9])," |sed "s,[[:space:]]*{\",,g;s,\"\,[[:space:]]*\('.'\|[0-9]\|-[0-9]\)\,,,g" | awk '{ print "msgid \"" $0 "\"\nmsgstr \"\"" ; }' > "$tdir/"opts.pot
 cat po/POTFILES.in | xargs grep -hE -o "[[:space:]]*\.name[[:space:]]*=[[:space:]]*\"[a-zA-Z0-9 ()]*\"" |sed "s,[[:space:]]*\.name[[:space:]]*=[[:space:]]*\",,g;s,\",,g" | awk '{ print "msgid \"" $0 "\"\nmsgstr \"\"" ; }' > "$tdir/"name.pot
 
-out="$(cat po/POTFILES.in | grep -v '\(colors.c\|lsefisystab.c\|lsefimmap.c\|lssal.c\|hdparm.c\|sendkey.c\|lsacpi.c\|lspci.c\|usbtest.c\|legacy_parse.c\|/libgcrypt/\|hfs.c\|/efi\.c$\|gnulib\|tests/\|util/ieee1275/ofpath.c\|minilzo.c\|terminfo.c\|setpci.c\|bin2h.c\|cb_timestamps.c\|grub-pe2elf.c\|getroot_[a-z]*.c\|getroot.c\|arc/init.c\|color.c\|grub-mklayout.c\|gentrigtables.c\|lzodefs.h\|lsefi.c\|cbls.c\|/zfs\.h$\|grub-macho2img.c\|syslinux_parse.c\|lvm.c\|efidisk.c\|grub-mkfont.c\|reiserfs.c\|LzmaEnc.c\|config\.h\|grub-extras\)' | xgettext -f - -L C -o - -x po/grub.pot -x "$tdir/"skip.pot -x "$tdir/"skip2.pot -x "$tdir/"skip3.pot -x "$tdir/"opts.pot -x "$tdir/"name.pot -x po/exclude.pot -a --from-code=iso-8859-1)"
+out="$(cat po/POTFILES.in | grep -v '\(colors.c\|lsefisystab.c\|lsefimmap.c\|lssal.c\|hdparm.c\|sendkey.c\|lsacpi.c\|lspci.c\|usbtest.c\|legacy_parse.c\|/libgcrypt/\|hfs.c\|/efi\.c$\|gnulib\|tests/\|util/ieee1275/ofpath.c\|minilzo.c\|terminfo.c\|setpci.c\|bin2h.c\|cb_timestamps.c\|grub-pe2elf.c\|getroot_[a-z]*.c\|getroot.c\|arc/init.c\|color.c\|grub-mklayout.c\|gentrigtables.c\|lzodefs.h\|lsefi.c\|cbls.c\|/zfs\.h$\|grub-macho2img.c\|syslinux_parse.c\|lvm.c\|efidisk.c\|grub-mkfont.c\|reiserfs.c\|LzmaEnc.c\)' | xgettext -f - -L C -o - -x po/grub.pot -x "$tdir/"skip.pot -x "$tdir/"skip2.pot -x "$tdir/"skip3.pot -x "$tdir/"opts.pot -x "$tdir/"name.pot -x po/exclude.pot -a --from-code=iso-8859-1)"
 rm -rf "$tdir"
 if [ x"$out" != x ]; then
     echo "$out"