Bug#672956: intltool: wrong newline handling for the first line in a file

[Steve Langasek]

Package: intltool
Version: 0.50.2-2.1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

Hi folks,

While working on a bug with broken translation merges in update-notifier in
Ubuntu
(https://bugs.launchpad.net/ubuntu/+source/update-notifier/+bug/993672), I
found that intltool-merge does not correctly handle the case where the first
line in an RFC822Deb file needs translations, because it prepends the same
"newline" character to each translation that was prepended to the original
string - i.e., none at all.

The attached patch corrects this issue, AFAICS.

  * Non-maintainer upload.
  * intltool-merge: correctly handle translations of the first line in an
    rfc822deb file.  LP: #993672.

I've not uploaded to Ubuntu because I don't think this warrants a delta from
Debian - the one case where I've seen this behavior, we've now worked around
by reordering the source file.

Thanks for considering the patch.

--
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: intltool_0.50.2-2.1.debdiff
Type: text/x-diff
Size: 495 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnome-maintainers/attachments/20120514/2353f503/attachment-0003.diff>