Debian Bug report logs - #365524
cdbs creates/applies patch incorrectly

Toggle useless messages

Message #5 received at submit@bugs.debian.org (full text, mbox, reply):

From: Thomas Weber <thomas.weber.mail@gmail.com>

To: Debian Bug Tracking System <submit@bugs.debian.org>

Subject: cdbs creates/applies patch incorrectly

Date: Sun, 30 Apr 2006 20:00:11 +0200

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

Message #12 received at 365524-close@bugs.debian.org (full text, mbox, reply):

From: Peter Eisentraut <petere@debian.org>

To: 365524-close@bugs.debian.org

Subject: Bug#365524: fixed in cdbs 0.4.40

Date: Sun, 28 May 2006 15:47:17 -0700

Source: cdbs
Source-Version: 0.4.40

We believe that the bug you reported is fixed in the latest version of
cdbs, which is due to be installed in the Debian FTP archive:

cdbs_0.4.40.dsc
  to pool/main/c/cdbs/cdbs_0.4.40.dsc
cdbs_0.4.40.tar.gz
  to pool/main/c/cdbs/cdbs_0.4.40.tar.gz
cdbs_0.4.40_all.deb
  to pool/main/c/cdbs/cdbs_0.4.40_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 365524@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Peter Eisentraut <petere@debian.org> (supplier of updated cdbs package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Mon, 29 May 2006 00:24:11 +0200
Source: cdbs
Binary: cdbs
Architecture: source all
Version: 0.4.40
Distribution: unstable
Urgency: low
Maintainer: CDBS Hackers <build-common-hackers@lists.alioth.debian.org>
Changed-By: Peter Eisentraut <petere@debian.org>
Description: 
 cdbs       - common build system for Debian packages
Closes: 306941 365085 365122 365257 365457 365524
Changes: 
 cdbs (0.4.40) unstable; urgency=low
 .
   * Acknowledge NMU (closes: #365085)
   * Added DEB_PYTHON_PACKAGES_EXCLUDE (python-distutils.mk)
     (closes: #365257)
   * cdbs-edit-patch: Avoid error message when creating new patch
   * Try patches at level 1 first, to avoid problems with patches that only
     create new files (simple-patchsys.mk) (closes: #365524)
   * Unset DEB_DBG_PACKAGE_ALL if some DEB_DBG_PACKAGE_pkg is set by user
     (debhelper.mk); test case in debhelper-6.sh
   * Set DEB_DBG_PACKAGE_pkg automatically if corresponding pkg exists
     (debhelper.mk) (closes: #365122); test case in debhelper-7.sh
   * Resurrected old documentation changelog
   * Fixed doc-base entries
   * Documented that directories with special characters are not supported
     (closes: #306941)
   * Corrected some typos in documentation (closes: #365457)
Files: 
 4be37d3718de68d6ec8fada3bda427c0 980 devel optional cdbs_0.4.40.dsc
 60d249106adbee72048c7bcf64075f10 402300 devel optional cdbs_0.4.40.tar.gz
 006f6a19855f362dd6b87281cd3590e9 301104 devel optional cdbs_0.4.40_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)

iD8DBQFEeiXlTTx8oVVPtMYRAvMzAJ9BTAxBlJc9VKVEfIu+XEQ+Yum1RgCfQ7gl
OS9J2c0XraiA+T/CvS+wdzQ=
=aOiU
-----END PGP SIGNATURE-----

Send a report that this bug log contains spam.