Bug#670048: dpkg-dev: gensymbols, please clarify if arch-wildcards are allowed
Package: dpkg-dev Version: 1.16.2 Severity: wishlist Hi, In dpkg-gensymbols(1), it is explained that it is possible to mark symbols as architecture specific (under Standard symbol tags). While it says the format of architecture list is the same as Build-Depends, it was (to me) not immediately clear whether that allows architecture wildcard or not. I had a look at the source code and it appears that architecture wildcards are accepted[1]. ~Niels [1] The final decision appears to be made by debarch_is (Dpkg::Arch). -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#670081: dpkg: dpkg-source: expected [ +-] at start of line
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
Bug#670081: dpkg: dpkg-source: expected [ +-] at start of line
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-dpkg-bugs-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#670048: dpkg-dev: gensymbols, please clarify if arch-wildcards are allowed
On Sun, 2012-04-22 at 17:03:59 +0200, Niels Thykier wrote: Package: dpkg-dev Version: 1.16.2 Severity: wishlist In dpkg-gensymbols(1), it is explained that it is possible to mark symbols as architecture specific (under Standard symbol tags). While it says the format of architecture list is the same as Build-Depends, it was (to me) not immediately clear whether that allows architecture wildcard or not. I had a look at the source code and it appears that architecture wildcards are accepted[1]. Ok, I guess changing the amd64 kfreebsd\-amd64 to any\-amd64 would make it clear by example. Would that be enough? thanks, guillem -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#670048: dpkg-dev: gensymbols, please clarify if arch-wildcards are allowed
On 2012-04-22 21:57, Guillem Jover wrote: On Sun, 2012-04-22 at 17:03:59 +0200, Niels Thykier wrote: Package: dpkg-dev Version: 1.16.2 Severity: wishlist In dpkg-gensymbols(1), it is explained that it is possible to mark symbols as architecture specific (under Standard symbol tags). While it says the format of architecture list is the same as Build-Depends, it was (to me) not immediately clear whether that allows architecture wildcard or not. I had a look at the source code and it appears that architecture wildcards are accepted[1]. Ok, I guess changing the amd64 kfreebsd\-amd64 to any\-amd64 would make it clear by example. Would that be enough? thanks, guillem Hi, I believe so - at least it would have convinced me. :) ~Niels -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#670081: dpkg: dpkg-source: expected [ +-] at start of line
On 2012-04-22 21:52, Guillem Jover wrote: | 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, Thanks | 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)? It was straight diff from git 1.7.10: git COMMIT COMMIT -- FILE output.patch Jari -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#670081: dpkg-source: expected [ +-] at start of line
jaalto wrote: On 2012-04-22 21:52, Guillem Jover wrote: | 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)? It was straight diff from git 1.7.10: git COMMIT COMMIT -- FILE output.patch Are you sure? Can you send the exact command line and git config -l | grep diff output? Thanks, Jonathan -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
