Package: cdbs
Version: 0.4.52
Severity: normal
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu ubuntu-patch intrepid
Hi,
In cdbs 0.4.48, simple-patchsys.mk was changed to unapply patches before
cleaning the build directory, in response to bug #387103. Objections were
raised at the time that this wasn't the right thing to do; that the correct
sequence was to unpatch after clean, but to skip the unpatch when using
tarball.mk.
Then in bug #424080, the package was changed so that tarball.mk *did* skip
the unpatching; but the unpatching is still being done before clean rather
than after.
This is simply wrong, because it means simple-patchsys.mk doesn't work
correctly when you have to patch the build system in a way that affects the
outcome of, e.g., 'make distclean'.
I believe the attached patch, to revert this behavior, is correct and should
be applied.
Thanks,
--
Steve Langasek Give me a lever long enough and a Free OS
Debian Developer to set it on, and I can move the world.
Ubuntu Developer http://www.debian.org/
[EMAIL PROTECTED] [EMAIL PROTECTED]
=== modified file '1/rules/simple-patchsys.mk.in'
--- 1/rules/simple-patchsys.mk.in 2008-03-28 16:04:32 +0000
+++ 1/rules/simple-patchsys.mk.in 2008-08-08 01:19:14 +0000
@@ -59,7 +59,7 @@
post-patches:: apply-patches
-cleanbuilddir:: reverse-patches
+clean:: reverse-patches
for dir in $(DEB_PATCHDIRS) ; do \
rm -f $$dir/*.log ; \
done
=== modified file 'debian/changelog'
--- debian/changelog 2008-08-01 18:44:48 +0000
+++ debian/changelog 2008-08-08 01:19:14 +0000
@@ -1,5 +1,10 @@
cdbs (0.4.53) UNRELEASED; urgency=low
+ * 1/rules/simple-patchsys.mk.in: revert the change for Debian bug #387103
+ that causes patches to be unapplied before cleaning the build directory;
+ the original issue was addressed more thoroughly in 0.4.49 with a fix
+ for Debian bug #424080, and unpatch-before-clean breaks some relevant
+ use cases that involve patching of build systems.
* Relax python-central build-dependency to >= 0.5.6 in python-distutils
class (instruction in python policy is only really needed for
transition of python-central itself, which has now completed).
