Adduser devel - Oct 2005 - Bug#331392: adduser: incorrect po/Makefile

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 
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,

-- 
Thomas Huriaux



_______________________________________________
Adduser-devel mailing list
Adduser-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/adduser-devel

tags #331392 confirmed
thanks

On Mon, Oct 03, 2005 at 10:36:51AM +0200, Thomas Huriaux
wrote:
> The attached patch for po/Makefile
Applied in svn to the experimental branch of adduser, which will be
uploaded to unstable once
(1) current unstable adduser has finally migrated to testing and
(2) the problems of experimental adduser caused by the big refactoring
    of code have been sorted out.

Thanks for your help, I _really_ appreciate that.

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

Processing commands for control@bugs.debian.org:
> tags #331392 confirmed
Bug#331392: adduser: incorrect po/Makefile
Tags were: l10n patch
Tags added: confirmed
> thanks
Stopping processing here.

Please contact me if you need assistance.

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

Your message dated Mon, 3 Oct 2005 22:54:23 +0200
with message-id <20051003205423.GA8905@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@kti.ae.poznan.pl Mon Oct 03 01:37:30 2005
Return-path: <thomas.huriaux@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@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@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@kti.ae.poznan.pl>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: adduser: incorrect po/Makefile
Message-ID: <20051003083651.GA26627@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@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
+	-@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@zugschlus.de Mon Oct 03 13:54:25 2005
Return-path: <mh+debian-packages@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@zugschlus.de>
To: Marc Haber <mh+debian-packages@zugschlus.de>
Cc: 326192-done@bugs.debian.org, 327804-done@bugs.debian.org,
	330258-done@bugs.debian.org, 331392-done@bugs.debian.org
Subject: Re: Fixed in upload of adduser 3.70 to experimental
Message-ID: <20051003205423.GA8905@torres.l21.ma.zugschlus.de>
References: <E1EMWkG-0008Mh-00@spohr.debian.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <E1EMWkG-0008Mh-00@spohr.debian.org>
User-Agent: Mutt/1.5.9i
Delivered-To: 331392-done@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

Hi again,

Marc Haber <mh+debian-packages@zugschlus.de>
(03/10/2005):
> On Mon, Oct 03, 2005 at 10:36:51AM +0200, Thomas Huriaux wrote:
> > The attached patch for po/Makefile
> 
> Applied in svn to the experimental branch of adduser, which will be
> uploaded to unstable once
> (1) current unstable adduser has finally migrated to testing and
> (2) the problems of experimental adduser caused by the big refactoring
>     of code have been sorted out.
> 
> Thanks for your help, I _really_ appreciate that.
While I was working on another package with the same problem, I realized
that there is still a small problem. You should change the following
line in the Makefile as following:
  -install: $(MO)
  +install: all 
in order to run "update:" by calling "install:" (for example
during the
package building process).

Cheers,

-- 
Thomas Huriaux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051004/7444017a/attachment.pgp

On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux
wrote:
> While I was working on another package with the same problem, I realized
> that there is still a small problem. You should change the following
> line in the Makefile as following:
>   -install: $(MO)
>   +install: all 
> in order to run "update:" by calling "install:" (for
example during the
> package building process).
Applied as well.

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

On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux
wrote:
> While I was working on another package with the same problem, I realized
> that there is still a small problem. You should change the following
> line in the Makefile as following:
>   -install: $(MO)
>   +install: all 
> in order to run "update:" by calling "install:" (for
example during the
> package building process).
That one seems to make all Files in debian/po change on every package
build, which is not good for the svn repository. Any chance to work
around this?

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

On Sat, Oct 08, 2005 at 08:42:09PM +0200, Marc Haber
wrote:
> On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux wrote:
> > While I was working on another package with the same problem, I
realized
> > that there is still a small problem. You should change the following
> > line in the Makefile as following:
> >   -install: $(MO)
> >   +install: all 
> > in order to run "update:" by calling "install:"
(for example during the
> > package building process).
> 
> That one seems to make all Files in debian/po change on every package
> build, which is not good for the svn repository. Any chance to work
> around this?
You know "svn propset svn:ignore $pattern"?

Joerg

-- 
Was denen einen ihr Watergate, ist den anderen ihr Firstgate.
- Thomas Bliessner, <slrnd1hklm.g53.nospam@melix.com.mx>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051008/5000c059/attachment.pgp

On Sat, Oct 08, 2005 at 08:59:45PM +0200, Joerg Hoh
wrote:
> You know "svn propset svn:ignore $pattern"?
No, but doesn''t that take a file out of version control entirely? How
does svn automatically detect whether a change was intended
(translation update) or uninteintonal?

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

On Sat, Oct 08, 2005 at 09:01:27PM +0200, Marc Haber
wrote:
> On Sat, Oct 08, 2005 at 08:59:45PM +0200, Joerg Hoh wrote:
> > You know "svn propset svn:ignore $pattern"?
> 
> No, but doesn''t that take a file out of version control entirely?
How
> does svn automatically detect whether a change was intended
> (translation update) or uninteintonal?
Hm.

You can compare the property svn:ignore to the .cvsignore-Feature of CVS.
It only "beautifies" the output of ''svn status''.

J?rg

-- 
Was denen einen ihr Watergate, ist den anderen ihr Firstgate.
- Thomas Bliessner, <slrnd1hklm.g53.nospam@melix.com.mx>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051008/205e2dd1/attachment-0001.pgp

On Sat, Oct 08, 2005 at 09:16:36PM +0200, Joerg Hoh
wrote:
> On Sat, Oct 08, 2005 at 09:01:27PM +0200, Marc Haber wrote:
> > On Sat, Oct 08, 2005 at 08:59:45PM +0200, Joerg Hoh wrote:
> > > You know "svn propset svn:ignore $pattern"?
> > 
> > No, but doesn''t that take a file out of version control
entirely? How
> > does svn automatically detect whether a change was intended
> > (translation update) or uninteintonal?
> 
> You can compare the property svn:ignore to the .cvsignore-Feature of CVS.
> It only "beautifies" the output of ''svn
status''.
But I''ll still have to commit a bunch of new templates after each
package build. That sucks.

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

On Sun, Oct 09, 2005 at 12:37:55PM +0200, Thomas Huriaux
wrote:
> Marc Haber <mh+debian-packages@zugschlus.de> (08/10/2005):
> > On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux wrote:
> > > While I was working on another package with the same problem, I
realized
> > > that there is still a small problem. You should change the
following
> > > line in the Makefile as following:
> > >   -install: $(MO)
> > >   +install: all 
> > > in order to run "update:" by calling
"install:" (for example during the
> > > package building process).
> > 
> > That one seems to make all Files in debian/po change on every package
> > build, which is not good for the svn repository. Any chance to work
> > around this?
> 
> Normally these files do not change unless your .pot file has changed.
> This is one of the reason not to remove adduser.pot.
make -C po all adduser.pot => updates all po files
make -C po all adduser.pot => leaves po files untouched
make -C po clean => seems to do something
make -C po all adduser.pot => updates all po files _AGAIN_

Can you please re-check your original patch?

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

Marc Haber <mh+debian-packages@zugschlus.de>
(08/10/2005):
> On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux wrote:
> > While I was working on another package with the same problem, I
realized
> > that there is still a small problem. You should change the following
> > line in the Makefile as following:
> >   -install: $(MO)
> >   +install: all 
> > in order to run "update:" by calling "install:"
(for example during the
> > package building process).
> 
> That one seems to make all Files in debian/po change on every package
> build, which is not good for the svn repository. Any chance to work
> around this?
Normally these files do not change unless your .pot file has changed.
This is one of the reason not to remove adduser.pot.

-- 
Thomas Huriaux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051009/4987c5e4/attachment.pgp

Marc Haber <mh+debian-packages@zugschlus.de>
(09/10/2005):
> On Sun, Oct 09, 2005 at 12:37:55PM +0200, Thomas Huriaux wrote:
> > Marc Haber <mh+debian-packages@zugschlus.de> (08/10/2005):
> > > On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux wrote:
> > > > While I was working on another package with the same
problem, I realized
> > > > that there is still a small problem. You should change the
following
> > > > line in the Makefile as following:
> > > >   -install: $(MO)
> > > >   +install: all 
> > > > in order to run "update:" by calling
"install:" (for example during the
> > > > package building process).
> > > 
> > > That one seems to make all Files in debian/po change on every
package
> > > build, which is not good for the svn repository. Any chance to
work
> > > around this?
> > 
> > Normally these files do not change unless your .pot file has changed.
> > This is one of the reason not to remove adduser.pot.
> 
> make -C po all adduser.pot => updates all po files
> make -C po all adduser.pot => leaves po files untouched
> make -C po clean => seems to do something
> make -C po all adduser.pot => updates all po files _AGAIN_
What do you mean by "update"?
Is it because msgmerge is writing
  Updating **.po.......... done.
or are the timestamps modified?

I have:
make -C po all adduser.pot => updates all po files and .pot and creates
                              the mo files
make -C po all adduser.pot => leaves po and mo files untouched,
make -C po clean => remove the mo files
make -C po all adduser.pot => leaves po files untouched and creates the
                              mo files

untouched = same file with same timestamp.

Cheers,

-- 
Thomas Huriaux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051009/8c713110/attachment.pgp

On Sun, Oct 09, 2005 at 01:21:39PM +0200, Thomas Huriaux
wrote:
> Marc Haber <mh+debian-packages@zugschlus.de> (09/10/2005):
> > On Sun, Oct 09, 2005 at 12:37:55PM +0200, Thomas Huriaux wrote:
> > > Marc Haber <mh+debian-packages@zugschlus.de> (08/10/2005):
> > > > On Tue, Oct 04, 2005 at 12:45:26PM +0200, Thomas Huriaux
wrote:
> > > > > While I was working on another package with the same
problem, I realized
> > > > > that there is still a small problem. You should change
the following
> > > > > line in the Makefile as following:
> > > > >   -install: $(MO)
> > > > >   +install: all 
> > > > > in order to run "update:" by calling
"install:" (for example during the
> > > > > package building process).
> > > > 
> > > > That one seems to make all Files in debian/po change on
every package
> > > > build, which is not good for the svn repository. Any chance
to work
> > > > around this?
> > > 
> > > Normally these files do not change unless your .pot file has
changed.
> > > This is one of the reason not to remove adduser.pot.
> > 
> > make -C po all adduser.pot => updates all po files
> > make -C po all adduser.pot => leaves po files untouched
> > make -C po clean => seems to do something
> > make -C po all adduser.pot => updates all po files _AGAIN_
> 
> What do you mean by "update"?
> Is it because msgmerge is writing
>   Updating **.po.......... done.
> or are the timestamps modified?
In my test, the timestamps were modified, but I cannot reproduce that
now.

But I noticed that the adduser.pot file was not in the svn repository,
which might have been a "challenge" to svn-buildpackage. Looks like
this was the issue. If not, I''ll come back yelling at you. Thanks for
your help.

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

Hi,

Marc Haber <mh+debian-packages@zugschlus.de> (09/10/2005):

[...]
> But I noticed that the adduser.pot file was not in the svn repository,
> which might have been a "challenge" to svn-buildpackage. Looks
like
> this was the issue. If not, I''ll come back yelling at you. Thanks
for
> your help.
The problem is still not fully solved:
In adduser 3.73,
$ msgfmt --statistics fr.po 
93 translated messages.
$ make update
[...]
$ msgfmt --statistics fr.po 
76 translated messages, 7 fuzzy translations, 8 untranslated messages.

The last statistics are right, because Christian has synced the
translation with the 3.67.2 version of adduser, so many strings are
now fuzzy.
The binary package is ok, it uses the updated fr.po generated at build
time.
But as you can see, the source package is wrong. I guess it is because
you use svn-buildpackage, but you haven''t commited yet the re-merged
fr.po.
I''m sorry, but this time I don''t know how to solve this
problem in an
other way than telling you not to forget to commit po files each time
they have been re-merged.

Cheers,

-- 
Thomas Huriaux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051020/13166f21/attachment.pgp

Hi,

sorry for not replying any sooner.

On Thu, Oct 20, 2005 at 04:18:18PM +0200, Thomas Huriaux
wrote:
> The problem is still not fully solved:
> In adduser 3.73,
> $ msgfmt --statistics fr.po 
> 93 translated messages.
> $ make update
> [...]
> $ msgfmt --statistics fr.po 
> 76 translated messages, 7 fuzzy translations, 8 untranslated messages.
> 
> The last statistics are right, because Christian has synced the
> translation with the 3.67.2 version of adduser, so many strings are
> now fuzzy.
> The binary package is ok, it uses the updated fr.po generated at build
> time.
> But as you can see, the source package is wrong. I guess it is because
> you use svn-buildpackage, but you haven''t commited yet the
re-merged
> fr.po.
Currently, there are no changes in the po files in the trunk
directory.

svn-buildpackage works like this:

* fakeroot debian/rules clean
* It then exports the working copy to the build "lab"
* It then builds the package, in my case with debuild.

That way, all changes done to the package during the build do not
propagate back to version control.

I have frequently seen packages update their debconf po files in the
clean target - maybe adduser should do that as well?
> I''m sorry, but this time I don''t know how to solve this
problem in an
> other way than telling you not to forget to commit po files each time
> they have been re-merged.
In the adduser build process, no changed po files end up in the
working copy, so there is nothing to commit. Help please.

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

Skipped content of type multipart/mixed-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051023/e3c55a70/attachment.pgp

On Sun, Oct 23, 2005 at 01:33:02PM +0200, Thomas Huriaux
wrote:
> > That way, all changes done to the package during the build do not
> > propagate back to version control.
> > 
> > I have frequently seen packages update their debconf po files in the
> > clean target - maybe adduser should do that as well?
> 
> This is only for the debconf templates, but indeed, you should add
> debconf-updatepo to the clean target of debian/rules, the debconf po
> files for de, el, es, nl and sv are outdated. You can do the same for
> the program (done in the svn repository AFAICS) and manpage
> translations. See the attached patch.
Applied, thanks.
> However, for the manpage translations, there is a problem. You will ask
> twice to run po4a: at the build time and at the clean time. I
don''t know
> how to avoid this situation.
I don''t think that this hurts, but why shouldn''t one remove
the po4a
call from build time?

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

Marc Haber <mh+debian-packages@zugschlus.de>
(23/10/2005):
> On Sun, Oct 23, 2005 at 01:33:02PM +0200, Thomas Huriaux wrote:
> > > That way, all changes done to the package during the build do not
> > > propagate back to version control.
> > > 
> > > I have frequently seen packages update their debconf po files in
the
> > > clean target - maybe adduser should do that as well?
> > 
> > This is only for the debconf templates, but indeed, you should add
> > debconf-updatepo to the clean target of debian/rules, the debconf po
> > files for de, el, es, nl and sv are outdated. You can do the same for
> > the program (done in the svn repository AFAICS) and manpage
> > translations. See the attached patch.
> 
> Applied, thanks.
> 
> > However, for the manpage translations, there is a problem. You will
ask
> > twice to run po4a: at the build time and at the clean time. I
don''t know
> > how to avoid this situation.
> 
> I don''t think that this hurts, but why shouldn''t one
remove the po4a
> call from build time?
Because the po4a call updates the po files and generates the translated
manpages. If you remove this call from build time, you won''t have the
manpages, if you don''t remove the generated manpages in the clean
target, your sources won''t be fully clean.

It does not hurt, but it is not optimized :)

-- 
Thomas Huriaux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url :
http://lists.alioth.debian.org/pipermail/adduser-devel/attachments/20051023/c96965ab/attachment.pgp