Bug#670081: dpkg: dpkg-source: expected [ +-] at start of line
On Mon, 23 Apr 2012, jaalto wrote: | 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, Up to now, we closed those reports because the patch files are bogus and we want to ensure that what is shipped in a Debian source package is clean. | 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 I doubt it. I bet that you have some editor hook that cleans up mixes of spaces and tabs at the start of a line... or something similar. But I have never seen git generate this kind of patch. On the contrary, I often see some red highlight in my git log/show commands when I stumble upon such patches. Cheers, -- Raphaël Hertzog ◈ Debian Developer Pre-order a copy of the Debian Administrator's Handbook and help liberate it: http://debian-handbook.info/liberation/ -- 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: It looks like Emacs diff-mode does something to it on save. That makes sense and is analagous to Guillem's mangling-by-mail- client guess. Thanks and sorry for the noise. (I was trying to see if git had started misbehaving in some circumstance.) Jonathan -- 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
On 2012-04-22 17:03, Jonathan Nieder wrote:
| 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?
Unfortunately I'm not sure, now that I think of it. The diff was
combination of git + filterdiff + editing the headers in Emacs.
It looks like Emacs diff-mode does something to it on save. Here is
test without any personal Emacs setup:
emacs -Q -ne file
add space, delete space (to flag modified); then save with new name
I'm attaching the result below, which I think exhibits the changes as
in original bug report *.patch file.
Jari
[*] The new, saved, file is still fine for patch(1) and quilt(1).
13c13$
^I${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}$
---$
^I${COMPILE} -o bcrypt ${OBJS} ${LDFLAGS}$
16c16$
^Imkdir -p ${PREFIX}/bin;\$
---$
^Imkdir -p ${PREFIX}/bin;\$
19c19$
^Icp bcrypt ${PREFIX}/bin;\$
---$
^Icp bcrypt ${PREFIX}/bin;\$
22c22$
^Ichmod 755 ${PREFIX}/bin/bcrypt;\$
---$
^Ichmod 755 ${PREFIX}/bin/bcrypt;\$
27c27$
^I${COMPILE} -c main.c$
---$
^I${COMPILE} -c main.c$
30c30$
^I${COMPILE} -c endian.c$
---$
^I${COMPILE} -c endian.c$
35c35$
^Irm -rf *.o bcrypt bcrypt.core core bcrypt.tgz $
---$
^Irm -rf *.o bcrypt bcrypt.core core bcrypt.tgz $
diff --git a/Makefile b/Makefile
index b84da0f..8924de4 100644
--- 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
Processed: Re: Bug#659026: lm-sensors: own sensors file removed while upgrading ( /etc/sensors.d )
Processing commands for cont...@bugs.debian.org: reassign 659026 dpkg Bug #659026 [lm-sensors] lm-sensors: own sensors file removed while upgrading ( /etc/sensors.d ) Bug reassigned from package 'lm-sensors' to 'dpkg'. No longer marked as found in versions lm-sensors/1:3.3.1-2. Ignoring request to alter fixed versions of bug #659026 to the same values previously set retitle 659026 dpkg removes non-dpkg handled files during upgrade Bug #659026 [dpkg] lm-sensors: own sensors file removed while upgrading ( /etc/sensors.d ) Changed Bug title to 'dpkg removes non-dpkg handled files during upgrade' from 'lm-sensors: own sensors file removed while upgrading ( /etc/sensors.d )' tag 659026 - moreinfo Bug #659026 [dpkg] dpkg removes non-dpkg handled files during upgrade Removed tag(s) moreinfo. thanks Stopping processing here. Please contact me if you need assistance. -- 659026: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=659026 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-dpkg-bugs-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
