Your message dated Sat, 08 Mar 2025 14:43:46 +0000
with message-id <e1tqvp0-007exj...@fasolo.debian.org>
and subject line Bug#525869: fixed in cdbs 0.4.168
has caused the Debian Bug report #525869,
regarding cdbs-edit-patch fails with tarball.mk and a nonstatic DEB_TAR_SRCDIR
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
525869: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=525869
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: cdbs
Version: 0.4.56
Tags: patch
User: ubuntu-de...@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)
--- /usr/bin/cdbs-edit-patch 2009-04-27 16:42:29.000000000 +0200
+++ cdbs-edit-patch 2009-04-27 17:45:00.000000000 +0200
@@ -63,9 +63,9 @@
debian/rules apply-patches
-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
+deb_tar_srcdir=build-tree/$(sed -nr 's/^[[:space:]]*DEB_TAR_SRCDIR[[:space:]]*:?=[[:space:]]*//p' debian/rules)
+if ! [ -d "$deb_tar_srcdir" ]; then
+ deb_srcdir=build-tree/$(ls build-tree | head -n 1)
fi
# create new source dir
signature.asc
Description: Digital signature
--- End Message ---
--- Begin Message ---
Source: cdbs
Source-Version: 0.4.168
Done: Alexandre Detiste <tc...@debian.org>
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.
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 525...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Alexandre Detiste <tc...@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 ftpmas...@ftp-master.debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Format: 1.8
Date: Sat, 08 Mar 2025 14:48:42 +0100
Source: cdbs
Architecture: source
Version: 0.4.168
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packa...@qa.debian.org>
Changed-By: Alexandre Detiste <tc...@debian.org>
Closes: 414305 508162 525869 554855
Changes:
cdbs (0.4.168) unstable; urgency=medium
.
* QA upload.
* Remove dpatch.mk, simple-patchsys.mk and tarball.mk
that were deprecated since 2010 and have no user left.
* Also remove related utility cdbs-edit-patch.
Closes: #414305, #554855, #508162, #525869
Checksums-Sha1:
f0fa1a8f8e9d0aa713ac0e58b58465ba7c954987 1723 cdbs_0.4.168.dsc
28c24e44ff6a094be53936087743c470eb5dda39 189020 cdbs_0.4.168.tar.xz
6e48c81ec5a536bfdaff7168c1ba7166086e6556 4562 cdbs_0.4.168_source.buildinfo
Checksums-Sha256:
0787f4b79ec0932cd4b293e4eddc75e2dd8343796c4c22753be309839771461a 1723
cdbs_0.4.168.dsc
93c7d530b4130265efdd136a4c3d29294b8c660d14de0537d8a0b9a26e0b4a46 189020
cdbs_0.4.168.tar.xz
998143e1aa260fc0d853e817416b070203210bbd280e5df1c31f2068fb4d91ba 4562
cdbs_0.4.168_source.buildinfo
Files:
219dc7f13d90ef5f57320f184a44afc9 1723 devel optional cdbs_0.4.168.dsc
005f57d6f06144f2e4a860f4c258aa9f 189020 devel optional cdbs_0.4.168.tar.xz
227ab640a027393cf1e39e14482741c9 4562 devel optional
cdbs_0.4.168_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJFBAEBCgAvFiEEj23hBDd/OxHnQXSHMfMURUShdBoFAmfMTgcRHHRjaGV0QGRl
Ymlhbi5vcmcACgkQMfMURUShdBrAig//XQbZHyyotlMRLtu/sFJCjkl1ZNib+qyo
mkYM9QEmfxkDO9GF2+amUgDtreACE7cPC+Pw+h11v5OVxu96tIS4phKerttKVn1D
BbHHZRQeYU2cFmCqyivRHnKGdLBYG9rrpIkTDnbbGCvPeDIm474tNmf58T9+bGHr
Azd/FND1cZAM8/2a5AFH07m1c4iQMopnDaNZljMfyW9btyr0O6h+lbtUC+bkcnW5
08xgKKu9htGJXCLW1geV9b0eLj8Tzey5/ueGyAZRQlbm+Qv/JeuklkVGH4EkN4WS
xtcRHztHVj/vD0UjRB/uWfPtAWc2KP9u3FM1HhnTWSjLx0TmzbZDkJPGWynRdBNe
ZCu8JoEx8q/ZajP6ScFvS2CRROgRP+Fb69dLWtgt1JOy/vd7LIqsBJEXBUGRGw3E
Flou2BXQi6TRBBan/ku5D9aGumYQCyDOuUkLOBMypBIaxAhQw756eSD05ouYQswj
Q1pcdb/hWhaDEs/VvmO4TB9dXAEX13DmDBvCuWDDhInC0rJVbGlAsIESveGJ88RN
u6tdlzI2ZSb1qOHDJk57xWzGwHbaPGxQruE7FKf2MFPJJoAzp3x+udONZkVyiaxo
niLo7JZcUTv/DtZNotOV+ZeiTnAjM9ekg2joD8D91Sfja1AuWWDUwXhmeHHTQBcq
HynSNymlz0E=
=gqap
-----END PGP SIGNATURE-----
pgp0ehYpf3ujl.pgp
Description: PGP signature
--- End Message ---