Relax copyright-check to only warn. Update debian/copyright-hints.debian/0.8.2-1

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

5 files changed, 17 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 de12c79..58e34f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-sugar-datastore (0.8.2-1) UNRELEASED; urgency=low
+sugar-datastore (0.8.2-1) unstable; urgency=low
 
   * New upstream release.
+  * Unfuzz patches.
+  * Update local cdbs snippets:
+    + Relax copyright-check to only warn about its discoveries.  Closes:
+      bug#486979.
+    + 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 01:03:18 +0200
+ -- Jonas Smedegaard <dr@jones.dk>  Sat, 21 Jun 2008 01:19:15 +0200
 
 sugar-datastore (0.8.1-3) UNRELEASED; urgency=low
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 8f67ae5..9c85959 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -38,7 +38,7 @@ GENERATED FILE [1992-1996, 1998-2001]: configure
 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+ GENERATED FILE [2007 Lemur Consulting Ltd]: secore/errors.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 [2002-2003, 2005 Free Software Foundation, Inc / 1996-2004 / 2001, 2003, 2005 Free Software Foundation, Inc]: aclocal.m4
 UNKNOWN [ObjectRealms, LLC. 2007]: README.txt
-UNKNOWN [law: / holder saying it may be distributed / notice and a / notice and disclaimer of warranty; keep intact all the]: LICENSE.GPL
+UNKNOWN [law: / holder saying it may be distributed]: LICENSE.GPL
diff --git a/debian/patches/1002_avoid_try-except-finally.patch b/debian/patches/1002_avoid_try-except-finally.patch
index 863dc79..8fe7bb8 100644
--- a/debian/patches/1002_avoid_try-except-finally.patch
+++ b/debian/patches/1002_avoid_try-except-finally.patch
@@ -1,6 +1,6 @@
 --- sugar-datastore-0.8.0~git.13d354b.orig/src/olpc/datastore/backingstore.py
 +++ sugar-datastore-0.8.0~git.13d354b/src/olpc/datastore/backingstore.py
-@@ -258,9 +258,10 @@
+@@ -269,9 +269,10 @@
          if os.path.exists(fn):
              fp = open(fn, 'r')
              try:
@@ -48,7 +48,7 @@
              # reading
 --- sugar-datastore-0.8.0~git.13d354b.orig/src/olpc/datastore/datastore.py
 +++ sugar-datastore-0.8.0~git.13d354b/src/olpc/datastore/datastore.py
-@@ -412,11 +412,12 @@
+@@ -394,11 +394,12 @@
              backingstore = content.backingstore
              backingstore.current_user_id = dbus.Bus().get_unix_user(sender)
              try:
diff --git a/debian/rules b/debian/rules
index 7693704..461db95 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,4 +30,4 @@ pkg = python-olpc-datastore
 #CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-setuptools, python-dbus, python-gobject, python-sugar-toolkit
 
 # 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/ *, *$$//')