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.

4 files changed, 27 insertions, 12 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 d20b4a2..f19d5c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 sugar-hulahop (0.4.1-1) unstable; urgency=low
 
   * New upstream release.
+  * 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.
 
  -- Jonas Smedegaard <dr@jones.dk>  Sat, 21 Jun 2008 00:19:21 +0200
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 0a5bea1..383dbdf 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,32 +1,43 @@
 *No copyright* UNKNOWN []: Makefile.am
 	NEWS
+	components/Makefile.am
+	components/hulahopAddCertException.idl
+	components/hulahopAddCertException.js
 	configure.ac
 	data/Makefile.am
+	data/chrome/Makefile.am
+	data/chrome/brand.properties
+	data/chrome/chrome.manifest.in
+	data/chrome/netError.dtd
 	data/prefs.js
 	m4/python.m4
 	python/Makefile.am
+	python/config.py
 	python/config.py.in
 	python/hulahop.defs
 	python/hulahop.override
 	python/hulahopmodule.c
 	src/Makefile.am
+GENERATED FILE [1994-2002]: Makefile.in
+	components/Makefile.in
+	data/Makefile.in
+	data/chrome/Makefile.in
+	python/Makefile.in
+	src/Makefile.in
 LGPL-2+ [2007, Red Hat, Inc]: python/__init__.py
 	python/webview.py
 	src/HulahopDirectoryProvider.cpp
 	src/HulahopDirectoryProvider.h
 	src/hulahop-web-view.cpp
 	src/hulahop.cpp
-GENERATED FILE [1994-2002]: Makefile.in
-	data/Makefile.in
-	python/Makefile.in
-	src/Makefile.in
 LGPL-2+ [2006, Red Hat, Inc]: src/hulahop-web-view.h
 	src/hulahop.h
+*No copyright* GENERATED FILE []: python/hulahop.c
 GENERATED FILE [1992-1996, 1998-2001]: configure
 GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2006]: missing
-GPL GENERATED FILE [1999-2000, 2003-2006 Free Software]: depcomp
+GPL GENERATED FILE [1999-2000, 2003-2007 Free Software]: depcomp
 GPL GENERATED FILE [2000-2001, 2003-2005 Free Software Foundation, Inc]: py-compile
 GPL-2+ GENERATED FILE [1996-2001, 2003-2006]: ltmain.sh
-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 52e4fe0..e8dc5b1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,4 +35,4 @@ binary-predep/python-hulahop::
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), xulrunner-dev (>= $(python-xpcom-minver)), python-xpcom (>= $(python-xpcom-minver)), python-gtk2-dev
 
 # 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/ *, *$$//')