diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 22:26:42 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 22:26:42 (GMT) |
| commit | 31378d75db1a7b48c0dc6c1cf3d1ca6d76cb8985 (patch) | |
| tree | 0468e9d43863d29c6e8958140bf96fdf4b032401 /debian/cdbs | |
| parent | ab56a69e5a2441ceaaaa5a8215b9813924e636a3 (diff) | |
CDBS: Relax copyright-check. strip cdbs 0.4.27 (not 0.4.27-1).debian/0.4.1-1
* Update local cdbs snippets:
+ Relax copyright-check to only warn about its discoveries. Closes:
bug#486994.
+ Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
* Update debian/copyright-hints.
Diffstat (limited to 'debian/cdbs')
| -rw-r--r-- | debian/cdbs/1/rules/copyright-check.mk | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk index 5341ff9..645363b 100644 --- a/debian/cdbs/1/rules/copyright-check.mk +++ b/debian/cdbs/1/rules/copyright-check.mk @@ -74,18 +74,17 @@ debian/stamp-copyright-check: @if [ ! -f debian/copyright_hints ]; then touch debian/copyright_hints; fi @newstrings=`diff -u debian/copyright_hints debian/copyright_newhints | sed '1,2d' | egrep '^\+' - | sed 's/^\+//'`; \ if [ -n "$$newstrings" ]; then \ - echo "ERROR: The following new or changed copyright notices discovered:"; \ + echo "WARNING: The following new or changed copyright notices discovered:"; \ echo; \ echo "$$newstrings"; \ echo; \ echo "To fix the situation please do the following:"; \ echo " 1) Investigate the above changes and update debian/copyright as needed"; \ echo " 2) Replace debian/copyright_hints with debian/copyright_newhints"; \ - exit 1; \ + else \ + echo 'No new copyright notices found - assuming no news is good news...'; \ + rm -f debian/copyright_newhints; \ fi - - @echo 'No new copyright notices found - assuming no news is good news...' - rm -f debian/copyright_newhints touch $@ clean:: |