diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 23:33:08 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-06-20 23:33:08 (GMT) |
| commit | 80e9906e0bec4d675c6983def4343b990d6e683d (patch) | |
| tree | 8e2ba7a29ae081fa7e50cea9b33a5a8c966de5f2 | |
| parent | 103a52d963ec0c7dfb0e1f1b460f4090f88f1dd0 (diff) | |
Relax copyright-check to only warn. Update debian/copyright-hints.debian/0.81.2-1
* Update local cdbs snippets:
+ Relax copyright-check to only warn about its discoveries. Closes:
bug#486999.
* Update debian/copyright-hints.
| -rw-r--r-- | debian/cdbs/1/rules/copyright-check.mk | 9 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/copyright_hints | 2 |
3 files changed, 9 insertions, 6 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:: diff --git a/debian/changelog b/debian/changelog index 6808117..8e89caf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,10 @@ sugar-presence-service (0.81.2-1) unstable; urgency=low * New upstream release. + * Update local cdbs snippets: + + Relax copyright-check to only warn about its discoveries. Closes: + bug#486999. + * Update debian/copyright-hints. -- Jonas Smedegaard <dr@jones.dk> Sat, 21 Jun 2008 01:27:39 +0200 diff --git a/debian/copyright_hints b/debian/copyright_hints index 59b1d05..3993637 100644 --- a/debian/copyright_hints +++ b/debian/copyright_hints @@ -20,6 +20,6 @@ GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2005]: missing GPL GENERATED FILE [2000-2001, 2003-2005 Free Software Foundation, Inc]: py-compile GPL-2+ [2006, Red Hat, Inc]: src/main.py GPL-2+ [2008, Red Hat, Inc]: src/sugar-presence-service.in -MIT/X11 (BSD like) [and license / notice and this permission notice shall be included in / 1994 X Consortium]: install-sh +MIT/X11 (BSD like) [1994 X Consortium]: install-sh UNKNOWN [1989, 1991 Free Software Foundation, Inc. / the software, and]: COPYING UNKNOWN [2002-2003, 2005 Free Software Foundation, Inc / 1996-2004 / 2001, 2003, 2005 Free Software Foundation, Inc]: aclocal.m4 |