diff options
| -rw-r--r-- | debian/cdbs/1/class/makefile.mk | 2 | ||||
| -rw-r--r-- | debian/cdbs/1/rules/copyright-check.mk | 1 | ||||
| -rw-r--r-- | debian/changelog | 10 |
3 files changed, 12 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/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk index d96681a..98a0b12 100644 --- a/debian/cdbs/1/rules/copyright-check.mk +++ b/debian/cdbs/1/rules/copyright-check.mk @@ -63,6 +63,7 @@ debian/stamp-copyright-check: 'foreach $$file (@files) {'\ ' $$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\ ' $$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\ + ' $$file->{license} =~ s/\s+\(v([^)]+)\)/-$$1/;'\ ' $$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\ ' $$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\ ' $$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\ diff --git a/debian/changelog b/debian/changelog index 4dc1846..bfc0918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +sugar-toolkit (0.82.11-3) unstable; urgency=low + + * Update cdbs snippets: + + 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 + + -- Jonas Smedegaard <dr@jones.dk> Tue, 11 Nov 2008 17:35:46 +0100 + sugar-toolkit (0.82.11-2) unstable; urgency=low * Update cdbs snippets: |