On Sun, 2012-04-22 at 22:20:03 +0300, Jari Aalto wrote:
> Package: dpkg
> Version: 1.16.2
> Severity: normal
>
> This is strange message:
>
> dpkg-source: error: expected [ +-] at start of line 14 of diff
> `bcrypt.git/debian/patches/20-makefile.patch'
>
> Both quilt and plain "patch -p1" accept the file as is without any
> messages. Files below.
Hmm, well quilt just makes use of patch. And yes, patch seems to
assume that when there's a '\t' or '\n' on the first line character
the space got eaten, in pch.c (another_hunk():1646), so given this I
guess I'll be adding support for these kinds of patches, but it seems
to me those are just somewhat bogus anyway, did you manually create
that patch or maybe it was extracted from a mail client that mangles
the body (evolution for example)?
> From: Unknown
> Subject: Use DESTDIR and other install fixes for Makefile
>
> --- a/Makefile
> +++ b/Makefile
> @@ -4,18 +4,18 @@ CFLAGS = -O2 -Wall
> COMPILE = ${CC} ${CFLAGS}
> OBJS = main.o blowfish.o rwfile.o keys.o wrapbf.o endian.o wrapzl.o
> LDFLAGS = -L/usr/local/lib -lz
> -PREFIX = /usr/local
> +PREFIX = ${DESTDIR}/usr/
>
> bcrypt: ${OBJS} Makefile
> ${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}
>
> install: bcrypt Makefile
This indeed is missing the heading space.
regards,
guillem
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
