[Adduser-devel] Bug#331392: marked as done (adduser: incorrect po/Makefile)

Debian Bug Tracking System owner at bugs.debian.org
Mon Oct 3 21:03:18 UTC 2005


Your message dated Mon, 3 Oct 2005 22:54:23 +0200
with message-id <20051003205423.GA8905 at torres.l21.ma.zugschlus.de>
and subject line Fixed in upload of adduser 3.70 to experimental
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 3 Oct 2005 08:37:30 +0000
>From thomas.huriaux at kti.ae.poznan.pl Mon Oct 03 01:37:30 2005
Return-path: <thomas.huriaux at kti.ae.poznan.pl>
Received: from octopus.kti.ae.poznan.pl [150.254.204.7] 
	by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
	id 1EMLpB-0001Yx-00; Mon, 03 Oct 2005 01:37:29 -0700
Received: from localhost ([127.0.0.1] helo=amavis)
	by octopus.kti.ae.poznan.pl with esmtp (Exim 3.35 #1 (Debian))
	id 1EMLob-0002ZB-00
	for <submit at bugs.debian.org>; Mon, 03 Oct 2005 10:36:53 +0200
Received: from octopus.kti.ae.poznan.pl ([127.0.0.1])
	by amavis (octopus.kti.ae.poznan.pl [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 09804-02 for <submit at bugs.debian.org>;
	Mon, 3 Oct 2005 10:36:53 +0200 (CEST)
Received: from random.kti.ae.poznan.pl ([150.254.204.56] helo=localhost)
	by octopus.kti.ae.poznan.pl with esmtp (Exim 3.35 #1 (Debian))
	id 1EMLob-0002Z2-00; Mon, 03 Oct 2005 10:36:53 +0200
Date: Mon, 3 Oct 2005 10:36:51 +0200
From: Thomas Huriaux <thomas.huriaux at kti.ae.poznan.pl>
To: Debian Bug Tracking System <submit at bugs.debian.org>
Subject: adduser: incorrect po/Makefile
Message-ID: <20051003083651.GA26627 at random.kti.ae.poznan.pl>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="vGgW1X5XWziG23Ko"
Content-Disposition: inline
X-Reportbug-Version: 3.17
Organization: KTI - Akademia Ekonomiczna w Poznaniu
User-Agent: Mutt/1.5.11
X-Virus-Scanned: by amavisd-new-20030616-p10 (Debian) at kti.ae.poznan.pl
Delivered-To: submit at bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2005_01_02


--vGgW1X5XWziG23Ko
Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP"
Content-Disposition: inline


--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Package: adduser
Version: 3.67.1
Severity: normal
Tags: patch l10n

Hi,

The translations in adduser are currently out of date:
$ msgfmt --statistics fr.po=20
80 translated messages.
$ msgfmt --statistics adduser.pot
0 translated messages, 93 untranslated messages.

It is due to the following situation:
day 0: a translator start a new translation based on the current .pot
       file
day 1: .pot file is updated
day 2: translation of the previous .pot is included, but seems to be
       newer than the updated .pot file (based on timestamps). With the
       current makefile, the po file is not merged with the new .pot.

The attached patch for po/Makefile do the following things:
* Fix this problem
* Use a wildcard for the LANG variable to be sure to include every
  language (for example, eu.po has been forgotten)
* remove "rm adduser.pot" from the clean rule. Even if this file is
  automatically generated, it is very useful for the l10n infrastructure
  to have it included in the source package (most of l10n scripts parse
  the content of the source package and extract the .pot files to know
  what must be translated).

If you want more explanation about what this diff does, do not hesitate
to ask me.

Regards,

--=20
Thomas Huriaux

--5mCyUwZo2JvN/JJP
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="Makefile.diff"
Content-Transfer-Encoding: quoted-printable

--- Makefile.orig	2005-10-02 19:47:06.000000000 +0200
+++ Makefile	2005-10-03 10:23:23.000000000 +0200
@@ -9,15 +9,16 @@
 %.mo: %.po
 	$(MSGFMT) -o $@ $<
=20
-%.pox: %.po adduser.pot
-	$(MSGMERGE) -o $@ $^
-
-LANG =3D ca cs da de es fr ja ko nb nl pl pt_BR ru uk zh_CN
+PO =3D $(wildcard *.po)
+LANG =3D $(basename $(PO))
 MO =3D $(addsuffix .mo,$(LANG))
-POX =3D $(addsuffix .pox,$(LANG))
=20
-all: $(MO)
-update: $(POX)
+all: update $(MO)
+update: adduser.pot
+	- at for po in $(PO); do \
+	echo -n "Updating $$po"; \
+	$(MSGMERGE) -U $$po adduser.pot; \
+	done;
=20
 adduser.pot: ../adduser ../deluser ../AdduserCommon.pm
 	$(XGETTEXT) -L Perl -k_ -o $@ $?
@@ -30,4 +31,6 @@
 	done
=20
 clean:
-	$(RM) $(MO) *~ adduser.pot *.pox
+	$(RM) $(MO) *~
+
+.PHONY: update

--5mCyUwZo2JvN/JJP--

--vGgW1X5XWziG23Ko
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)

iD8DBQFDQO2jb8LyHhAYItIRApSeAJ98tJjxgaBv3N0JLYkQYFFCDRR+4ACgkMa7
T6SoTr+iya6gICycG6mHDLo=
=+bKK
-----END PGP SIGNATURE-----

--vGgW1X5XWziG23Ko--

---------------------------------------
Received: (at 331392-done) by bugs.debian.org; 3 Oct 2005 20:54:25 +0000
>From mh+debian-packages at zugschlus.de Mon Oct 03 13:54:25 2005
Return-path: <mh+debian-packages at zugschlus.de>
Received: from 5301d.unt0.torres.l21.ma.zugschlus.de (torres.zugschlus.de) [217.151.83.1] (Debian-exim)
	by spohr.debian.org with esmtp (Exim 3.36 1 (Debian))
	id 1EMXKL-0005rK-00; Mon, 03 Oct 2005 13:54:25 -0700
Received: from mh by torres.zugschlus.de with local (Exim 4.53)
	id 1EMXKJ-0002Rm-Ad; Mon, 03 Oct 2005 22:54:23 +0200
Date: Mon, 3 Oct 2005 22:54:23 +0200
From: Marc Haber <mh+debian-packages at zugschlus.de>
To: Marc Haber <mh+debian-packages at zugschlus.de>
Cc: 326192-done at bugs.debian.org, 327804-done at bugs.debian.org,
	330258-done at bugs.debian.org, 331392-done at bugs.debian.org
Subject: Re: Fixed in upload of adduser 3.70 to experimental
Message-ID: <20051003205423.GA8905 at torres.l21.ma.zugschlus.de>
References: <E1EMWkG-0008Mh-00 at spohr.debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1EMWkG-0008Mh-00 at spohr.debian.org>
User-Agent: Mutt/1.5.9i
Delivered-To: 331392-done at bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 
	(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Level: 
X-Spam-Status: No, hits=-3.0 required=4.0 tests=BAYES_00 autolearn=no 
	version=2.60-bugs.debian.org_2005_01_02
X-CrossAssassin-Score: 4

Version: 3.70

tagging for the BTS version tracking.

Greetings
Marc

-- 
-----------------------------------------------------------------------------
Marc Haber         | "I don't trust Computers. They | Mailadresse im Header
Mannheim, Germany  |  lose things."    Winona Ryder | Fon: *49 621 72739834
Nordisch by Nature |  How to make an American Quilt | Fax: *49 621 72739835



More information about the Adduser-devel mailing list