diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-11-11 16:22:02 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-11-11 16:22:02 (GMT) |
| commit | 2a7b64153666ecfdd5b987e45bf6ea7225ca09b4 (patch) | |
| tree | 9fa08adce6aeec0b586048741c031054e1823637 | |
| parent | bc7befec317c1837af4fae7654b1dcaaa315e156 (diff) | |
Cleanup check stamp dir for flavored builds in makefile.mk, fixing failure to build twice in a row.
| -rw-r--r-- | debian/cdbs/1/class/makefile.mk | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/cdbs/1/class/makefile.mk b/debian/cdbs/1/class/makefile.mk index 86b1175..7a50962 100644 --- a/debian/cdbs/1/class/makefile.mk +++ b/debian/cdbs/1/class/makefile.mk @@ -74,7 +74,7 @@ $(cdbs_make_check_stamps) : debian/stamp-makefile-check% : debian/stamp-makefile $(if $(DEB_MAKE_CHECK_TARGET),touch $@) makefile-clean:: - $(if $(DEB_MAKE_CHECK_TARGET),rm -f debian/stamp-makefile-check) + $(if $(DEB_MAKE_CHECK_TARGET),$(if $(cdbs_make_multibuilds),-rmdir --ignore-fail-on-non-empty debian/stamp-makefile-check,rm -f debian/stamp-makefile-check)) $(cdbs_make_clean_nonstamps):: $(if $(cdbs_make_multibuilds),rm -f $(@:makefile-clean%=debian/stamp-makefile-check%)) diff --git a/debian/changelog b/debian/changelog index cca530c..2e5f2e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ sugar-presence-service (0.82.2-1) UNRELEASED; urgency=low * Update cdbs snippets: + Run dh_py* scripts before dh_installinit in python-autotools.mk (see bug#494288) + + Cleanup check stamp dir for flavored builds in makefile.mk, fixing + failure to build twice in a row. + Compact simple licenses too (those without ' or later') in copyright-check.mk + Various improvements to update-tarball.mk (none important here) |