Bug#670081: dpkg: dpkg-source: expected [ +-] at start of line

[Jari Aalto]

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.


DEFAULTS = Makefile includes.h blowfish.h functions.h config.h
CC = gcc
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

bcrypt: ${OBJS} Makefile
        ${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}

install:        bcrypt Makefile
        mkdir -p ${PREFIX}/bin;\
        mkdir -p ${PREFIX}/man/man1;\
        cp bcrypt ${PREFIX}/bin;\
        cp bcrypt.1 ${PREFIX}/man/man1;\
        chmod 755 ${PREFIX}/bin/bcrypt;\
        chmod 644 ${PREFIX}/man/man1/bcrypt.1

main.o: main.c ${DEFAULTS}
        ${COMPILE} -c main.c

blowfish.o:     blowfish.c ${DEFAULTS}
        ${COMPILE} -c blowfish.c

rwfile.o:       rwfile.c ${DEFAULTS}
        ${COMPILE} -c rwfile.c

keys.o: keys.c ${DEFAULTS}
        ${COMPILE} -c keys.c

wrapbf.o:       wrapbf.c ${DEFAULTS}
        ${COMPILE} -c wrapbf.c

wrapzl.o:       wrapzl.c ${DEFAULTS}
        ${COMPILE} -c wrapzl.c

endian.o:       endian.c ${DEFAULTS}
        ${COMPILE} -c endian.c

clean:
        rm -rf *.o bcrypt bcrypt.core core bcrypt.tgz 


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
	mkdir -p ${PREFIX}/bin;\
-	mkdir -p ${PREFIX}/man/man1;\
+	mkdir -p ${PREFIX}/share/man/man1;\
	cp bcrypt ${PREFIX}/bin;\
-	cp bcrypt.1 ${PREFIX}/man/man1;\
+	cp bcrypt.1 ${PREFIX}/share/man/man1;\
	chmod 755 ${PREFIX}/bin/bcrypt;\
-	chmod 644 ${PREFIX}/man/man1/bcrypt.1
+	chmod 644 ${PREFIX}/share/man/man1/bcrypt.1
 
 main.o:	main.c ${DEFAULTS}
	${COMPILE} -c main.c
@@ -38,6 +38,8 @@ wrapzl.o:	wrapzl.c ${DEFAULTS}
 endian.o:	endian.c ${DEFAULTS}
	${COMPILE} -c endian.c
 
+distclean: clean
+	
 clean:
	rm -rf *.o bcrypt bcrypt.core core bcrypt.tgz