[Build-common-hackers] Bug#365524: cdbs creates/applies patch incorrectly

[Thomas Weber]

Package: cdbs
Version: 0.4.39
Severity: normal

I need to add a new file to a package. Doing this with cdbs-edit-patch results
in the following head lines:

======================
diff -Nur octave-forge-2006.03.17/main/comm/gisequal.m octave-forge-2006.03.17.new/main/comm/gisequal.m
--- octave-forge-2006.03.17/main/comm/gisequal.m	1970-01-01 01:00:00.000000000 +0100
+++ octave-forge-2006.03.17.new/main/comm/gisequal.m	2006-04-30 19:54:19.000000000 +0200
@@ -0,0 +1,34 @@
======================

Now, if cdbs applies this patch, it doesn't create a file 
  octave-forge2.9-2006.03.17/main/comm/gisequal.m
but instead
  octave-forge-2006.03.17/octave-forge-2006.03.17/main/comm/gisequal.m
i.e. a complete new directory structure is created with only the new file.

The relevant line from 'debian/rules apply-patches':
  Trying patch debian/patches/add_gisqueal.patch at level 0...success.

Changing the patch isn't difficult, but I think cdbs should start trying patches
at level 1.

Thanks
  Thomas



-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (700, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.16-1-686-smp
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)

cdbs depends on no packages.

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

-- no debconf information