[PATCH] POTFILES: Don't include gnulib in grub.pot

[PATCH] POTFILES: Don't include gnulib in grub.pot

[Vladimir 'phcoder' Serbinenko]

[-- Attachment #1: Type: text/plain, Size: 42 bytes --]

-- 
Regards
Vladimir 'phcoder' Serbinenko

[-- Attachment #2: 0001-POTFILES-Don-t-include-gnulib-in-grub.pot.patch --]
[-- Type: application/octet-stream, Size: 1355 bytes --]

From 9689b39a171657d8a5b3709bc322e85163914c0e Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Fri, 22 Mar 2019 16:06:18 +0100
Subject: [PATCH 1/2] POTFILES: Don't include gnulib in grub.pot

They're translated as a separate project, so we
don't want to submit them again.
---
 autogen.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autogen.sh b/autogen.sh
index d9df5f9be..93b128d50 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,7 +13,7 @@ fi
 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 . -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' ! -ipath './gnulib/*' |sort > po/POTFILES.in
 find util -iname '*.in' ! -name Makefile.in  |sort > po/POTFILES-shell.in
 
 echo "Importing unicode..."
-- 
2.11.0

Re: [PATCH] POTFILES: Don't include gnulib in grub.pot

[Colin Watson]

(Missing Signed-off-by.)

Reviewed-by: Colin Watson <cjwatson@ubuntu.com>

-- 
Colin Watson                                       [cjwatson@ubuntu.com]

Re: [PATCH] POTFILES: Don't include gnulib in grub.pot

[Daniel Kiper]

Sadly this patch does not look complete. ./grub-core/lib/gnulib is still
included. And as Colin pointed out missing SOB.

Could you send the patches in the email body instead of the attachments?
git send-email?

Daniel

Fwd: [PATCH] POTFILES: Don't include gnulib in grub.pot

[Vladimir 'phcoder' Serbinenko]

---------- Forwarded message ---------
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, Mar 25, 2019 at 3:22 PM
Subject: Re: [PATCH] POTFILES: Don't include gnulib in grub.pot
To: Daniel Kiper <dkiper@net-space.pl>


On Mon, Mar 25, 2019 at 12:58 PM Daniel Kiper <dkiper@net-space.pl> wrote:
>
> Sadly this patch does not look complete. ./grub-core/lib/gnulib is still
> included. And as Colin pointed out missing SOB.
This directory still exists, at least in my copy. I didn't spend any
time figuring out if this is intended or stale. In either case I don't
want those file to accidently end up in POTFILES


--
Regards
Vladimir 'phcoder' Serbinenko


-- 
Regards
Vladimir 'phcoder' Serbinenko

Re: Fwd: [PATCH] POTFILES: Don't include gnulib in grub.pot

[Colin Watson]

On Mon, Mar 25, 2019 at 03:24:25PM +0100, Vladimir 'phcoder' Serbinenko wrote:
> On Mon, Mar 25, 2019 at 12:58 PM Daniel Kiper <dkiper@net-space.pl> wrote:
> > Sadly this patch does not look complete. ./grub-core/lib/gnulib is still
> > included. And as Colin pointed out missing SOB.
> 
> This directory still exists, at least in my copy. I didn't spend any
> time figuring out if this is intended or stale. In either case I don't
> want those file to accidently end up in POTFILES

grub-core/lib/gnulib/ exists and is supposed to exist; it consists of
automatically-maintained copies of the bits of Gnulib that GRUB actually
uses, as opposed to the clone of all of Gnulib that lives in the gnulib/
directory.  It shouldn't end up in POTFILES; so I think Daniel's point
is that you should exclude both gnulib/ and grub-core/lib/gnulib/ in
your patch.

-- 
Colin Watson                                       [cjwatson@ubuntu.com]