CDBS: Relax copyright-check to only warn about its discoveries.debian/0.81.1-2

* Update local cdbs snippets:
  + Relax copyright-check to only warn about its discoveries.  Closes:
    bug# #486966.
  + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
* Update debian/copyright-hints.

4 files changed, 16 insertions, 7 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 b3d418b..f4f1d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sugar-base (0.81.1-2) unstable; urgency=low
+
+  * Update local cdbs snippets:
+    + Relax copyright-check to only warn about its discoveries.  Closes:
+      bug# #486966.
+    + Update dependency cleanup to strip cdbs 0.4.27 (not 0.4.27-1).
+  * Update debian/copyright-hints.
+
+ -- Jonas Smedegaard <dr@jones.dk>  Fri, 20 Jun 2008 21:51:02 +0200
+
 sugar-base (0.81.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 0093ae1..5e3bdb5 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -32,6 +32,6 @@ LGPL-2+ [2006-2007, Red Hat, Inc / 2007-2008, One Laptop Per Child]: src/sugar/_
 LGPL-2+ [2006-2007, Red Hat, Inc]: src/sugar/_sugarbaseextmodule.c
 LGPL-2+ [2007 Red Hat, Inc]: src/sugar/logger.py
 LGPL-2+ [2007, One Laptop Per Child / 2006-2007, Red Hat, Inc]: src/sugar/mime.py
-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 [1996-2004]: aclocal.m4
 UNKNOWN [the / 1991, 1999 Free Software Foundation, Inc]: COPYING
diff --git a/debian/rules b/debian/rules
index 11fa542..0b08aa5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,4 +36,4 @@ CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-gtk2-dev, python-gobject-dev
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), chrpath
 
 # Merge duplicate build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27-1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.39)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')