[Build-common-hackers] Bug#525869: cdbs-edit-patch fails with tarball.mk and a nonstatic DEB_TAR_SRCDIR

[Martin Pitt]

Package: cdbs
Version: 0.4.56
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: ubuntu-patch origin-ubuntu karmic

Hello,

In https://launchpad.net/bugs/137827 it was reported that
cdbs-edit-patch fails if DEB_TAR_SRCDIR is not a static value, but
contains variables, such as

  DEB_TAR_SRCDIR:=postgresql-$VERSION

cdbs-edit-patch currently does

   deb_tar_srcdir=$(sed -nr 's/^[[:space:]]*DEB_TAR_SRCDIR[[:space:]]*:?=[[:space:]]*//p' debian/rules)
   if [ -n "$deb_tar_srcdir" ]; then
           deb_srcdir=build-tree/$deb_tar_srcdir
   fi

which is pretty much unfixable for dynamic Makefile comments, I think.
What do you think about adding a fallback which will work in pretty
much every case, such as the attached patch?

Thanks,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: cdbs.edit-patch-dynamicpath.patch
Type: text/x-diff
Size: 589 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20090427/16fc1599/attachment-0001.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20090427/16fc1599/attachment-0001.pgp>