[Build-common-hackers] Bug#387103: cdbs: tarball+simple-patchsys does not clean properly

[Martin Pitt]

Package: cdbs
Version: 0.4.46
Severity: important

A package using tarball.mk and simple-patchsys.mk (like hal,
gnome-volume-manager, or postgresql-8.1) does not clean properly after
build any more:

-------- snip --------
~/debian/psql/8.1/postgresql-8.1-8.1.4$ debclean
Cleaning in directory .
/usr/share/cdbs/1/rules/buildcore.mk:68: Parsing postgresql-8.1.4.tar.bz2...
test -x debian/rules
test "`id -u`" = 0
rm -rf build-tree
rm debian/stamp-postgresql-8.1.4.tar.bz2
for i in ./build-tree/postgresql-8.1.4/config/config.guess ./build-tree/postgresql-8.1.4/config/config.sub  ; do \
                if test -e $i.cdbs-orig ; then \
                        mv $i.cdbs-orig $i ; \
                fi ; \
        done
/usr/bin/make -f debian/rules reverse-config
make[1]: Betrete Verzeichnis '/home/martin/debian/psql/8.1/postgresql-8.1-8.1.4'
/usr/share/cdbs/1/rules/buildcore.mk:68: Parsing postgresql-8.1.4.tar.bz2...
make[1]: Für das Ziel »reverse-config« ist nichts zu tun.
make[1]: Verlasse Verzeichnis '/home/martin/debian/psql/8.1/postgresql-8.1-8.1.4'
if [ "reverse-patches" = "reverse-patches" ]; then rm -f debian/stamp-patched; fi
patches: debian/patches/01-build-contrib.patch debian/patches/02-pager.patch debian/patches/03-gettext-domains.patch debian/patches/04-timezone-symlinks.patch debian/patches/05-check-rlimits-nofile.patch debian/patches/06-libpq-defaultsocketdir.patch debian/patches/07-testsuite-params.patch debian/patches/09-relax-sslkey-permscheck.patch debian/patches/10-pkglibdir.patch debian/patches/11-server-includedir.patch debian/patches/12-pg_restore-ignore-failing-tables.patch debian/patches/13-tutorial-README.patch debian/patches/50-contrib-oracle-enable.patch debian/patches/51-contrib-xml2-enable.patch debian/patches/52-contrib-dbase-enable-iconv.patch debian/patches/53-contrib-dbmirror-libpath.patch debian/patches/54-contrib-dbmirror-quoteparsing.patch debian/patches/55-contrib-admin.patch
Trying reverse patch debian/patches/55-contrib-admin.patch at level 1 ... 0 ... 2 ... failure.
make: *** [reverse-patches] Fehler 1
-------- snip --------

The reason is that this first removes build-tree/ and then tries to
unapply the patches. In earlier cdbs versions, the patches were
unapplied first and then build-tree was rm'ed. The new approach makes
sense in principle, since it is sufficient to just clean the
build-tree and the patch stamps, there is no need to unapply the
patches (so this is *much* faster).

Can you please adapt the logic to not try to unapply patches on clean
with tarball.mk?

Thank you,

Martin

-- 
Martin Pitt        http://www.piware.de
Ubuntu Developer   http://www.ubuntu.com
Debian Developer   http://www.debian.org

In a world without walls and fences, who needs Windows and Gates?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/build-common-hackers/attachments/20060912/12aadfa6/attachment-0001.pgp