[Pkg-samba-maint] Merging some Ubuntu changes...indeed *drop* some Ubuntu changes...

[Kees Cook]

Hi Christian,

On Thu, May 31, 2007 at 09:07:30PM +0200, Christian Perrier wrote:
> I think that changing "Report-Msgid-Bugs-To" in PO files is not really
> a good idea, nor is changing the "POT-Creation-Date".
> 
> The debconf templates are identical between Ubuntu and Debian, so
> reporting "msgid bugs" (namely typos/errors in English) is relevant
> for upstream, ie Debian.
> 
> I suggest you consider dropping these changes if possible. This will
> minimize the number of files affected by the diff and make it easier
> to read, imho.

I suspect this is a result of the debconf-updatepo call, which
regenerates these files during the build.  In other words, I don't think
this is an intentional change, but one that I'm unclear on how to work
around when doing merges.

I'm very open to suggestions; this is something I run into when doing
Ubuntu security updates too.  For security updates, I just comment out
the debconf-updatepo call from the rules.  Obviously, this won't work
for the current development release.  :)

Take care,

-Kees

-- 
Kees Cook
-------------- 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/pkg-samba-maint/attachments/20070531/2c324bcf/attachment-0001.pgp