[Pkg-fcoe-general] Bug#753235: lldpad: FTBFS: dpkg-source: error: expected ^--- in line 2 of diff `lldpad-0.9.46/debian/patches/fix-typo-in-lldptool-ets-8.patch'

[Guillem Jover]

Control: tags -1 wheezy
Control: found -1 0.9.44-1
Control: tags -1 patch

On Sun, 2014-06-29 at 20:04:58 +0200, David Suárez wrote:
> Source: lldpad
> Version: 0.9.46-2
> Severity: serious
> Tags: jessie sid
> User: debian-qa at lists.debian.org
> Usertags: qa-ftbfs-20140628 qa-ftbfs
> Justification: FTBFS on amd64
> 
> Relevant part (hopefully):
> > Unpack source
> > ─────────────
> > 
> > gpgv: keyblock resource `/sbuild-nonexistent/.gnupg/trustedkeys.gpg': file open error
> > gpgv: Signature made Wed Feb 12 18:09:42 2014 UTC using RSA key ID F2E17569
> > gpgv: Can't check signature: public key not found
> > dpkg-source: warning: failed to verify signature on ./lldpad_0.9.46-2.dsc
> > dpkg-source: info: extracting lldpad in lldpad-0.9.46
> > dpkg-source: info: unpacking lldpad_0.9.46.orig.tar.gz
> > dpkg-source: info: unpacking lldpad_0.9.46-2.debian.tar.xz
> > dpkg-source: info: applying dont-run-chkconfig-when-install-data.patch
> > dpkg-source: info: applying fix-lintian-warning-on-lldpad-init.patch
> > dpkg-source: info: applying fix-cannot-adjust-line-in-dcbtool-8.patch
> > dpkg-source: info: applying dont-touch-var-lock-subsys-lldpad-when-start.patch
> > dpkg-source: error: expected ^--- in line 2 of diff `lldpad-0.9.46/debian/patches/fix-typo-in-lldptool-ets-8.patch'
> > dpkg-source: info: applying fix-typo-in-lldptool-ets-8.patch
> > dpkg-source: info: fuzz is not allowed when applying patches
> > dpkg-source: info: if patch 'fix-typo-in-lldptool-ets-8.patch' is correctly applied by quilt, use 'quilt refresh' to update it
> > FAILED [dpkg-source died]

This also affects stable, it would be nice if a stable update could be
prepared, I'm ready to help if needed, given that the “regression” was
caused by the dpkg update.

The broken patches have line-wrapped --- header lines.

Attached a simple patch fixing this.

Thanks,
Guillem
-------------- next part --------------
A non-text attachment was scrubbed...
Name: lldpad_0.9.44-1.1.dsc.patch
Type: text/x-diff
Size: 2208 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-fcoe-general/attachments/20140706/82d02c58/attachment.patch>