From unknown Wed Jun 18 23:04:06 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#31310 <31310@debbugs.gnu.org> To: bug#31310 <31310@debbugs.gnu.org> Subject: Status: [PATCH] Fix make dist Reply-To: bug#31310 <31310@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:04:06 +0000 retitle 31310 [PATCH] Fix make dist reassign 31310 guix-patches submitter 31310 Julien Lepiller severity 31310 normal tag 31310 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 29 10:25:22 2018 Received: (at submit) by debbugs.gnu.org; 29 Apr 2018 14:25:22 +0000 Received: from localhost ([127.0.0.1]:42995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCnGT-0006Vl-VZ for submit@debbugs.gnu.org; Sun, 29 Apr 2018 10:25:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51819) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCnGO-0006VS-1t for submit@debbugs.gnu.org; Sun, 29 Apr 2018 10:25:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fCnGH-0005Pr-3W for submit@debbugs.gnu.org; Sun, 29 Apr 2018 10:25:10 -0400 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:54006) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fCnGG-0005Pi-Uo for submit@debbugs.gnu.org; Sun, 29 Apr 2018 10:25:09 -0400 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 To: guix-patches@gnu.org Subject: [PATCH] Fix make dist Message-ID: <20180429162452.4181beb9@lepiller.eu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/Qcg7C+=a1R1jNZVccWnA1Iz" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -6.0 (------) --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-- From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 29 17:20:35 2018 Received: (at 31310-done) by debbugs.gnu.org; 29 Apr 2018 21:20:35 +0000 Received: from localhost ([127.0.0.1]:43218 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCtkJ-000187-Hz for submit@debbugs.gnu.org; Sun, 29 Apr 2018 17:20:35 -0400 Received: from lepiller.eu ([89.234.186.109]:34326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fCtkH-00017y-Nx for 31310-done@debbugs.gnu.org; Sun, 29 Apr 2018 17:20:34 -0400 Received: from localhost (static-176-182-42-79.ncc.abo.bbox.fr [176.182.42.79]) by lepiller.eu (OpenSMTPD) with ESMTPSA id aa0568a8 (TLSv1.2:ECDHE-RSA-CHACHA20-POLY1305:256:NO) for <31310-done@debbugs.gnu.org>; Sun, 29 Apr 2018 21:21:40 +0000 (UTC) Date: Sun, 29 Apr 2018 23:20:28 +0200 From: Julien Lepiller To: 31310-done@debbugs.gnu.org Subject: Re: [bug#31310] [PATCH] Fix make dist Message-ID: <20180429231911.0bccc921@lepiller.eu> In-Reply-To: <20180429162452.4181beb9@lepiller.eu> References: <20180429162452.4181beb9@lepiller.eu> X-Mailer: Claws Mail 3.16.0 (GTK+ 2.24.32; x86_64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 31310-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Le Sun, 29 Apr 2018 16:24:52 +0200, Julien Lepiller a =C3=A9crit : > Hi, >=20 > 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. I pushed a different version of that patch that creates only one pot file for guix-manual, and adds it to the distribution as 39764ef893b7b65a8ce55e13746fed8fd0bad6e0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 30 17:02:14 2018 Received: (at 31310) by debbugs.gnu.org; 30 Apr 2018 21:02:14 +0000 Received: from localhost ([127.0.0.1]:44374 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDFw6-0000XT-9b for submit@debbugs.gnu.org; Mon, 30 Apr 2018 17:02:14 -0400 Received: from hera.aquilenet.fr ([185.233.100.1]:40954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fDFw2-0000XJ-OA for 31310@debbugs.gnu.org; Mon, 30 Apr 2018 17:02:11 -0400 Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 41513130BC; Mon, 30 Apr 2018 23:02:10 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cwYqaGIeQq9i; Mon, 30 Apr 2018 23:02:08 +0200 (CEST) Received: from ribbon (unknown [IPv6:2a01:e0a:1d:7270:af76:b9b:ca24:c465]) by hera.aquilenet.fr (Postfix) with ESMTPSA id A09F511FB1; Mon, 30 Apr 2018 23:02:08 +0200 (CEST) From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) To: 31310@debbugs.gnu.org Subject: Re: bug#31310: [PATCH] Fix make dist References: <20180429162452.4181beb9@lepiller.eu> <20180429231911.0bccc921@lepiller.eu> X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 11 =?utf-8?Q?Flor=C3=A9al?= an 226 de la =?utf-8?Q?R?= =?utf-8?Q?=C3=A9volution?= X-PGP-Key-ID: 0x090B11993D9AEBB5 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 3CE4 6455 8A84 FDC6 9DB4 0CFB 090B 1199 3D9A EBB5 X-OS: x86_64-pc-linux-gnu Date: Mon, 30 Apr 2018 23:02:07 +0200 In-Reply-To: <20180429231911.0bccc921@lepiller.eu> (Julien Lepiller's message of "Sun, 29 Apr 2018 23:20:28 +0200") Message-ID: <87y3h4tnlc.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: 31310 Cc: julien@lepiller.eu X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Julien Lepiller skribis: > Le Sun, 29 Apr 2018 16:24:52 +0200, > Julien Lepiller a =C3=A9crit : > >> Hi, >>=20 >> 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. > > I pushed a different version of that patch that creates only one pot > file for guix-manual, and adds it to the distribution as > 39764ef893b7b65a8ce55e13746fed8fd0bad6e0 Perfect, thanks a lot! Ludo'. From unknown Wed Jun 18 23:04:06 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Tue, 29 May 2018 11:24:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator