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...@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
diff -Nru lldpad-0.9.44/debian/changelog lldpad-0.9.44/debian/changelog
--- lldpad-0.9.44/debian/changelog	2012-04-28 13:07:52.000000000 +0200
+++ lldpad-0.9.44/debian/changelog	2014-07-05 23:13:00.000000000 +0200
@@ -1,3 +1,10 @@
+lldpad (0.9.44-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix broken patch headers.
+
+ -- Guillem Jover <guil...@debian.org>  Sat, 05 Jul 2014 23:13:00 +0200
+
 lldpad (0.9.44-1) unstable; urgency=low
 
   [ Liang Guo ]
diff -Nru lldpad-0.9.44/debian/patches/fix-hyphen-used-as-minus-sign-in-lldptool-app-8.patch lldpad-0.9.44/debian/patches/fix-hyphen-used-as-minus-sign-in-lldptool-app-8.patch
--- lldpad-0.9.44/debian/patches/fix-hyphen-used-as-minus-sign-in-lldptool-app-8.patch	2012-04-28 13:07:52.000000000 +0200
+++ lldpad-0.9.44/debian/patches/fix-hyphen-used-as-minus-sign-in-lldptool-app-8.patch	2014-07-05 23:10:43.000000000 +0200
@@ -1,5 +1,6 @@
 Fix lintian warning:
-lldpad: hyphen-used-as-minus-sign usr/share/man/man8/lldptool-app.8.gz:18--- a/docs/lldptool-app.8
+lldpad: hyphen-used-as-minus-sign usr/share/man/man8/lldptool-app.8.gz:18
+--- a/docs/lldptool-app.8
 +++ b/docs/lldptool-app.8
 @@ -15,7 +15,7 @@
  .TP
diff -Nru lldpad-0.9.44/debian/patches/fix-typo-in-config-c.patch lldpad-0.9.44/debian/patches/fix-typo-in-config-c.patch
--- lldpad-0.9.44/debian/patches/fix-typo-in-config-c.patch	2012-04-28 13:07:52.000000000 +0200
+++ lldpad-0.9.44/debian/patches/fix-typo-in-config-c.patch	2014-07-05 23:10:50.000000000 +0200
@@ -1,4 +1,5 @@
-Fix typo writeable -> writable--- a/config.c
+Fix typo writeable -> writable
+--- a/config.c
 +++ b/config.c
 @@ -216,7 +216,7 @@
  			}
diff -Nru lldpad-0.9.44/debian/patches/fix-typo-in-lldptool-ets-8.patch lldpad-0.9.44/debian/patches/fix-typo-in-lldptool-ets-8.patch
--- lldpad-0.9.44/debian/patches/fix-typo-in-lldptool-ets-8.patch	2012-04-28 13:07:52.000000000 +0200
+++ lldpad-0.9.44/debian/patches/fix-typo-in-lldptool-ets-8.patch	2014-07-05 23:10:59.000000000 +0200
@@ -1,4 +1,5 @@
-Fix type seperated -> separated--- a/docs/lldptool-ets.8
+Fix type seperated -> separated
+--- a/docs/lldptool-ets.8
 +++ b/docs/lldptool-ets.8
 @@ -58,13 +58,13 @@
  Sets the ETS-CFG willing bit 

Reply via email to