[Build-common-hackers] Bug#404575: cdbs: Patches won't apply when using both tarball and simple-patchsys

[Sam Morris]

Subject: cdbs: Patches won't apply when using both tarball and simple-patchsys
Package: cdbs
Version: 0.4.48
Severity: important

Please see the archive at
<http://robots.org.uk/stuff/pyxplot-0.5.8_cdbs-patchbug.tar.bz2>. On my
machine:

	$ fakeroot debian/rules common-configure-indep
	/usr/share/cdbs/1/rules/buildcore.mk:68: Parsing pyxplot_0.5.8.tar.gz...
	test -x debian/rules
	mkdir -p "build-tree/pyxplot"
	tar -C build-tree  -xzf pyxplot_0.5.8.tar.gz
	touch debian/stamp-pyxplot_0.5.8.tar.gz
	/usr/bin/make -f debian/rules reverse-config
	make[1]: Entering directory `/home/sam/src/pyxplot/pyxplot-0.5.8'
	/usr/share/cdbs/1/rules/buildcore.mk:68: Parsing pyxplot_0.5.8.tar.gz...
	make[1]: Nothing to be done for `reverse-config'.
	make[1]: Leaving directory `/home/sam/src/pyxplot/pyxplot-0.5.8'
	if [ "debian/stamp-patched" = "reverse-patches" ]; then rm -f debian/stamp-patched; fi
	patches: debian/patches/100_dont-hide-latex-output.diff.patch
	Trying patch debian/patches/100_dont-hide-latex-output.diff.patch at level 1 ... 0 ... 2 ... failure.
	make: *** [debian/stamp-patched] Error 1

	$ cat debian/patches/100_dont-hide-latex-output.diff.patch.*
	can't find file to patch at input line 4
	Perhaps you used the wrong -p or --strip option?
	The text leading up to this was:
	--------------------------
	|diff -Nur pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile
	|--- pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile      2006-07-02 17:14:16.000000000 +0100
	|+++ pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile  2006-12-22 04:37:28.000000000 +0000
	--------------------------
	File to patch: 
	Skip this patch? [y] 
	Skipping patch.
	1 out of 1 hunk ignored
	can't find file to patch at input line 4
	Perhaps you used the wrong -p or --strip option?
	The text leading up to this was:
	--------------------------
	|diff -Nur pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile
	|--- pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile      2006-07-02 17:14:16.000000000 +0100
	|+++ pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile  2006-12-22 04:37:28.000000000 +0000
	--------------------------
	File to patch: 
	Skip this patch? [y] 
	Skipping patch.
	1 out of 1 hunk ignored
	can't find file to patch at input line 4
	Perhaps you used the wrong -p or --strip option?
	The text leading up to this was:
	--------------------------
	|diff -Nur pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile
	|--- pyxplot-0.5.8/build-tree/pyxplot/doc/Makefile      2006-07-02 17:14:16.000000000 +0100
	|+++ pyxplot-0.5.8.new/build-tree/pyxplot/doc/Makefile  2006-12-22 04:37:28.000000000 +0000
	--------------------------
	File to patch: 
	Skip this patch? [y] 
	Skipping patch.
	1 out of 1 hunk ignored

However, I can apply the patch myself without errors:

	$ patch -p1 --dry-run < debian/patches/100_dont-hide-latex-output.diff.patch
	patching file build-tree/pyxplot/doc/Makefile

	$ echo $?
	0

-- System Information:
Debian Release: 4.0
  APT prefers testing
  APT policy: (530, 'testing'), (520, 'unstable'), (510, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-k7
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)

cdbs depends on no packages.

Versions of packages cdbs recommends:
ii  autotools-dev                 20060702.1 Update infrastructure for config.{
ii  debhelper                     5.0.42     helper programs for debian/rules

-- no debconf information

-- 
Sam Morris
http://robots.org.uk/

PGP key id 1024D/5EA01078
3412 EA18 1277 354B 991B  C869 B219 7FDB 5EA0 1078
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20061226/07f1e92b/attachment.pgp