From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fCnHB-0007Np-EK for guix-patches@gnu.org; Sun, 29 Apr 2018 10:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fCnH8-0005dr-98 for guix-patches@gnu.org; Sun, 29 Apr 2018 10:26:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:35098) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fCnH8-0005dn-3S for guix-patches@gnu.org; Sun, 29 Apr 2018 10:26:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fCnH7-0006Wh-Qr for guix-patches@gnu.org; Sun, 29 Apr 2018 10:26:01 -0400 Subject: [bug#31310] [PATCH] Fix make dist Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fCnGE-0007Dp-OS for guix-patches@gnu.org; Sun, 29 Apr 2018 10:25:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fCnGB-0005M7-4s for guix-patches@gnu.org; Sun, 29 Apr 2018 10:25:06 -0400 Received: from lepiller.eu ([89.234.186.109]:46936) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fCnGA-0005LC-Pe for guix-patches@gnu.org; Sun, 29 Apr 2018 10:25:03 -0400 Received: from localhost (static-176-182-42-79.ncc.abo.bbox.fr [176.182.42.79]) by lepiller.eu (OpenSMTPD) with ESMTPSA id 3813fd3e (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO) for ; Sun, 29 Apr 2018 14:26:05 +0000 (UTC) Date: Sun, 29 Apr 2018 16:24:52 +0200 From: Julien Lepiller Message-ID: <20180429162452.4181beb9@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Qcg7C+=a1R1jNZVccWnA1Iz" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 31310@debbugs.gnu.org --MP_/Qcg7C+=a1R1jNZVccWnA1Iz Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline Hi, these patches add the documentation pot files to the distribution and exclude them from being checked for store references. That's because they contain example store paths. The second one renames them so they have a more meaningful name for the TP. --MP_/Qcg7C+=a1R1jNZVccWnA1Iz Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=0001-nls-Distribute-doc-pot-files.patch >From d36b9eeb7ee8811e51f82c41ae17ebca863acad5 Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 29 Apr 2018 14:00:13 +0200 Subject: [PATCH 1/2] nls: Distribute doc pot files. * po/doc/local.mk (EXTRA_DIST): Add guix.pot and contributing.pot. * Makefile.am (assert-no-store-file-names): exclude them and documentation po files. --- Makefile.am | 1 + po/doc/local.mk | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9f134c970..b9950a24b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -741,6 +741,7 @@ assert-no-store-file-names: $(distdir)/ChangeLog --exclude=*.info-[0-9] --exclude=*.dot \ --exclude=*.eps --exclude-dir=bootstrap \ --exclude=guix-prettify.el \ + --exclude=guix.pot --exclude=guix.*.po \ --exclude=ChangeLog \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ diff --git a/po/doc/local.mk b/po/doc/local.mk index 4e1c28307..d104bfcbe 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -17,6 +17,8 @@ # along with GNU Guix. If not, see . EXTRA_DIST = \ + %D%/contributing.pot \ + %D%/guix.pot \ %D%/contributing.fr.po \ %D%/guix.fr.po -- 2.17.0 --MP_/Qcg7C+=a1R1jNZVccWnA1Iz Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0002-nls-Rename-documentation-pot-files-for-the-translati.patch =46rom 4a786d03f5810e06fafaa9ce01116dd079f7dfbd Mon Sep 17 00:00:00 2001 From: Julien Lepiller Date: Sun, 29 Apr 2018 14:10:23 +0200 Subject: [PATCH 2/2] nls: Rename documentation pot files for the translation project. * po/doc/guix.pot: Rename to... * po/doc/guix-doc.pot: ...this. * po/doc/contributing.pot: Rename to... * po/doc/guix-contributing-doc.pot: ...this. * po/doc/local.mk: Rename them. * Makefile.am: Rename them. --- Makefile.am | 2 +- ...ontributing.pot =3D> guix-contributing-doc.pot} | 0 po/doc/{guix.pot =3D> guix-doc.pot} | 0 po/doc/local.mk | 16 ++++++++-------- 4 files changed, 9 insertions(+), 9 deletions(-) rename po/doc/{contributing.pot =3D> guix-contributing-doc.pot} (100%) rename po/doc/{guix.pot =3D> guix-doc.pot} (100%) diff --git a/Makefile.am b/Makefile.am index b9950a24b..251bd320d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -741,7 +741,7 @@ assert-no-store-file-names: $(distdir)/ChangeLog --exclude=3D*.info-[0-9] --exclude=3D*.dot \ --exclude=3D*.eps --exclude-dir=3Dbootstrap \ --exclude=3Dguix-prettify.el \ - --exclude=3Dguix.pot --exclude=3Dguix.*.po \ + --exclude=3Dguix-doc.pot --exclude=3Dguix.*.po \ --exclude=3DChangeLog \ -E "$(storedir)/[a-z0-9]{32}-" $(distdir) ; \ then \ diff --git a/po/doc/contributing.pot b/po/doc/guix-contributing-doc.pot similarity index 100% rename from po/doc/contributing.pot rename to po/doc/guix-contributing-doc.pot diff --git a/po/doc/guix.pot b/po/doc/guix-doc.pot similarity index 100% rename from po/doc/guix.pot rename to po/doc/guix-doc.pot diff --git a/po/doc/local.mk b/po/doc/local.mk index d104bfcbe..f0c158e08 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -17,8 +17,8 @@ # along with GNU Guix. If not, see . =20 EXTRA_DIST =3D \ - %D%/contributing.pot \ - %D%/guix.pot \ + %D%/guix-contributing-doc.pot \ + %D%/guix-doc.pot \ %D%/contributing.fr.po \ %D%/guix.fr.po =20 @@ -26,7 +26,7 @@ POT_OPTIONS =3D --package-name "guix" --package-version "= $(VERSION)" \ --copyright-holder "Ludovic Court=C3=A8s" \ --msgid-bugs-address "ludo@gnu.org" =20 -$(srcdir)/po/doc/guix.%.po: $(srcdir)/po/doc/guix.pot +$(srcdir)/po/doc/guix.%.po: $(srcdir)/po/doc/guix-doc.pot @lang=3D`echo $$(basename "$@") | sed -e 's|^guix.||' -e 's|.po$$||'` ;\ if test -f "$@"; then \ test "$(srcdir)" =3D . && cdcmd=3D"" || cdcmd=3D"cd $(srcdir) && "; \ @@ -45,7 +45,7 @@ $(srcdir)/po/doc/guix.%.po: $(srcdir)/po/doc/guix.pot exit 1; \ fi =20 -$(srcdir)/po/doc/contributing.%.po: $(srcdir)/po/doc/contributing.pot +$(srcdir)/po/doc/contributing.%.po: $(srcdir)/po/doc/guix-contributing-doc= .pot @lang=3D`echo $$(basename "$@") | sed -e 's|^contributing.||' -e 's|.po$$= ||'` ;\ if test -f "$@"; then \ test "$(srcdir)" =3D . && cdcmd=3D"" || cdcmd=3D"cd $(srcdir) && "; \ @@ -64,16 +64,16 @@ $(srcdir)/po/doc/contributing.%.po: $(srcdir)/po/doc/co= ntributing.pot exit 1; \ fi =20 -$(srcdir)/po/doc/contributing.pot-update: doc/contributing.texi +$(srcdir)/po/doc/guix-contributing-doc.pot-update: doc/contributing.texi $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ -p "$$(echo $@ | sed 's|-update||')" $(POT_OPTIONS) @touch "$$(echo $@ | sed 's|-update||')" =20 -$(srcdir)/po/doc/guix.pot-update: doc/guix.texi +$(srcdir)/po/doc/guix-doc.pot-update: doc/guix.texi $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ -p "$$(echo $@ | sed 's|-update||')" $(POT_OPTIONS) @touch "$$(echo $@ | sed 's|-update||')" =20 doc-pot-update: - $(MAKE) $(srcdir)/po/doc/guix.pot-update - $(MAKE) $(srcdir)/po/doc/contributing.pot-update + $(MAKE) $(srcdir)/po/doc/guix-doc.pot-update + $(MAKE) $(srcdir)/po/doc/guix-contributing-doc.pot-update --=20 2.17.0 --MP_/Qcg7C+=a1R1jNZVccWnA1Iz--