New upstream release. Relax copyright-check to only warn.debian/0.81.1-1

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

4 files changed, 28 insertions, 19 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 612c851..d90a3c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+sugar-artwork (0.81.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Update local cdbs snippets:
+    + Relax copyright-check to only warn about its discoveries.  Closes:
+      bug#487012.
+    + 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 22:00:57 +0200
+
 sugar-artwork (0.79.3-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 94b5074..aae6008 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -12,17 +12,11 @@
 	cursor/cursorthemegen/sample.cursortheme
 	cursor/sugar/Makefile.am
 	cursor/sugar/sugar-00.png
-	cursor/sugar/sugar-01.png
-	cursor/sugar/sugar-02.png
 	cursor/sugar/sugar-03.png
-	cursor/sugar/sugar-04.png
-	cursor/sugar/sugar-05.png
 	cursor/sugar/sugar-06.png
 	cursor/sugar/sugar-07.png
 	cursor/sugar/sugar-08.png
 	cursor/sugar/sugar-09.png
-	cursor/sugar/sugar-10.png
-	cursor/sugar/sugar-11.png
 	cursor/sugar/sugar-hotspots.png
 	cursor/sugar/sugar.cursortheme
 	gtk/Makefile.am
@@ -220,20 +214,25 @@ LGPL-2+ [2007, Benjamin Berg]: gtk/engine/sugar-drawing.c
 	gtk/engine/sugar-info.h
 	gtk/engine/sugar-utils.c
 	gtk/engine/sugar-utils.h
-UNKNOWN [notice appear in all copies and that both that /  2003 Red Hat, Inc / notice and this permission notice appear in supporting]: cursor/cursorthemegen/cursortheme.h
+UNKNOWN [2003 Red Hat, Inc]: cursor/cursorthemegen/cursortheme.h
 	cursor/cursorthemegen/main.c
 	cursor/cursorthemegen/themefile.c
-GPL GENERATED FILE [1999-2000, 2003-2005 Free Software Foundation, Inc]: compile
-	depcomp
 LGPL-2+ [2007, Red Hat, Inc / 2008, Benjamin Berg]: gtk/engine/sugar-rc-style.c
 	gtk/engine/sugar-rc-style.h
 LGPL-2+ [2007, Red Hat, Inc]: gtk/engine/sugar-style.h
 	gtk/engine/sugar.c
 GENERATED FILE [1992-1996, 1998-2001]: configure
-GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2005]: missing
-GPL-2+ GENERATED FILE [1996-2001, 2003-2005]: ltmain.sh
+GPL GENERATED FILE [1996-1997, 1999-2000, 2002-2006]: missing
+GPL GENERATED FILE [1999-2000, 2003-2007 Free Software]: depcomp
+GPL-2+ GENERATED FILE [1996-2001, 2003-2006]: ltmain.sh
 LGPL-2+ [2007, Red Hat, Inc / 2007, Benjamin Berg]: gtk/engine/sugar-style.c
-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 [2002-2003 Erik Max Francis']: gtk/theme/em.py
+UNKNOWN [?YrE,dTviz1kyubyy<L`IQ.WbtTLQO&jkqd;n]: cursor/sugar/sugar-11.png
+UNKNOWN [?ZrlE*_ESN@,/t_L>)*?dVilS"su8r3Wo]: cursor/sugar/sugar-10.png
+UNKNOWN [Oo;=UvemZ\O7-pt[BkT"<qnSCd_<o|&j|V:fe]: cursor/sugar/sugar-04.png
+UNKNOWN [m`@Q]: cursor/sugar/sugar-01.png
 UNKNOWN [the / 1991, 1999 Free Software Foundation, Inc]: COPYING
+UNKNOWN [w1jGaM!84~J8humuu13|JtE|L^A?JHC|g3Wt}!AtxH<e2\e}?3oMMj72>yC_m$k`,AZDTYg#z"5*>\#<.\'{q@PE4Y5 / ?ZrlYc&wn&E/v-?`X^Ry(|&Uc]: cursor/sugar/sugar-02.png
+UNKNOWN [~\dh?IuMw8Lhi\+iHmwW__G>M/+R\q0||XiEkc<%C31Jp5_X> 9$G-<0eXuf~.GL~=3YzU['L@<&\O1o / ?ZrlE*`hbRbj+5R0/L>)AaDDhqfzn["VnqgCF|>)IMy?J+|.)"!Iy*es)mg.8\)&k(>\__VX(od]: cursor/sugar/sugar-05.png
diff --git a/debian/rules b/debian/rules
index 0b9ea1d..a4f9dab 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ include debian/cdbs/1/rules/buildinfo.mk
 
 DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE)
 DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
-DEB_UPSTREAM_TARBALL_MD5 = eddcd740b104513e6750c43b0c3a17ca
+DEB_UPSTREAM_TARBALL_MD5 = 137c630284bcf138f0ecb4ba6dc8b957
 
 # Needed by upstream build process
 #  x11-apps is needed for xcursorgen
@@ -20,4 +20,4 @@ DEB_UPSTREAM_TARBALL_MD5 = eddcd740b104513e6750c43b0c3a17ca
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), libgtk2.0-dev, libglib2.0-dev, libcairo2-dev, python-empy, x11-apps | xbase-clients
 
 # 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/ *, *$$//')