Debhelper compat 6. Update cdbs snippets. Exact upstream Git URL.debian/0.8.0.git.13d354b-11

* Bump debhelper compatibility level to 6 (was 5).
* Update local cdbs snippets:
  + Relax python-central and python-support build-dependencies in
    python-autotools.mk.
  + Update copyright-check cdbs snippet to store newline-delimited
    hints, and strip any non-printable characters.  Update hints.
  + Drop wget options broken with recent versions of wget in
    update-tarball.mk.
* Mention exact upstream Git source in debian/copyright.
* Semi-auto-update debian/control to update build-dependencies:
    DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean

8 files changed, 83 insertions, 10 deletions

diff --git a/debian/cdbs/1/class/python-autotools.mk b/debian/cdbs/1/class/python-autotools.mk
index 5728470..28290d3 100644
--- a/debian/cdbs/1/class/python-autotools.mk
+++ b/debian/cdbs/1/class/python-autotools.mk
@@ -46,9 +46,9 @@ else
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
 endif
 ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.6)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
 else
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.5.6)
 endif
 
 DEB_CONFIGURE_SCRIPT_ENV += PYTHON="python$(cdbs_make_curflavor)"
diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index d4ead0d..5341ff9 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -43,6 +43,7 @@ debian/stamp-copyright-check:
 	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
 		| LC_ALL=C perl -e \
 	'$$n=0; while (<>) {'\
+	'	s/[^[:print:]]//g;'\
 	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
 	'		$$files[$$n]{name}=$$1;'\
 	'		$$files[$$n]{license}=$$2;'\
@@ -65,7 +66,7 @@ debian/stamp-copyright-check:
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	print "$$pattern: ", join(", ", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	print "$$pattern: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
 	'};'\
 		> debian/copyright_newhints
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
diff --git a/debian/cdbs/1/rules/upstream-tarball.mk b/debian/cdbs/1/rules/upstream-tarball.mk
index 55b2f56..e34a317 100644
--- a/debian/cdbs/1/rules/upstream-tarball.mk
+++ b/debian/cdbs/1/rules/upstream-tarball.mk
@@ -77,7 +77,7 @@ get-orig-source:
 			rm "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
 		fi ; \
 		echo "Downloading $(cdbs_upstream_local_tarball) from $(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball) ..." ; \
-		wget -N -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
+		wget -nv -T10 -t3 -O "$(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" "$(DEB_UPSTREAM_URL)/$(cdbs_upstream_tarball)" ; \
 	else \
 		echo "Upstream source tarball have been already downloaded: $(DEB_UPSTREAM_WORKDIR)/$(cdbs_upstream_local_tarball)" ; \
 	fi
diff --git a/debian/changelog b/debian/changelog
index a940607..6ea37a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sugar-datastore (0.8.0~git.13d354b-11) unstable; urgency=low
+
+  * Bump debhelper compatibility level to 6 (was 5).
+  * Update local cdbs snippets:
+    + Relax python-central and python-support build-dependencies in
+      python-autotools.mk.
+    + Update copyright-check cdbs snippet to store newline-delimited
+      hints, and strip any non-printable characters.  Update hints.
+    + Drop wget options broken with recent versions of wget in
+      update-tarball.mk.
+  * Mention exact upstream Git source in debian/copyright.
+  * Semi-auto-update debian/control to update build-dependencies:
+      DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean
+
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 24 Apr 2008 12:43:35 +0200
+
 sugar-datastore (0.8.0~git.13d354b-10) unstable; urgency=low
 
   * Suggest (not recommend) abiword and poppler-utils - really this time
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/control b/debian/control
index 7c94734..ab555f6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: python
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), devscripts (>= 2.10.7), libtool, automake, autoconf, python-dev (>= 2.3.5-11), python-central (>= 0.6), debhelper (>= 5), dh-buildinfo
+Build-Depends: quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), devscripts (>= 2.10.7), libtool, automake, autoconf, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), debhelper (>= 5.0.44), dh-buildinfo
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-datastore.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-datastore.git;a=summary
diff --git a/debian/copyright b/debian/copyright
index 6d644f0..fb7d857 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 This is Python module OLPC Datastore packaged for Debian GNU systems.
 
-Upstream Git source: git://dev.laptop.org
+Upstream Git source: git://dev.laptop.org/projects/datastore
 
 Upstream author: Benjamin Saller <bcsaller@objectrealms.net>
 
diff --git a/debian/copyright_hints b/debian/copyright_hints
index 92c4646..3bd79a8 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,6 +1,62 @@
-*No copyright* UNKNOWN []: Makefile.am, autogen.sh, bin/Makefile.am, bin/datastore-service, bin/sample-client.py, bin/test-indexprop.py, bin/test-inplace.py, configure.ac, docs/Makefile, docs/getbuildpath.py, docs/writedocs.py, etc/.gitignore, etc/Makefile.am, etc/org.laptop.sugar.DataStore.service.in, secore/Makefile.am, src/Makefile.am, src/olpc/Makefile.am, src/olpc/__init__.py, src/olpc/datastore/Makefile.am, src/olpc/datastore/__init__.py, src/olpc/datastore/__version__.py, src/olpc/datastore/bin_copy.py, src/olpc/datastore/utils.py, tests/Makefile, tests/__init__.py, tests/cleaner.py, tests/dateranges.txt, tests/funkyabi.odt, tests/milestone_1.txt, tests/milestone_2.txt, tests/mountpoints.txt, tests/properties.txt, tests/runalltests.py, tests/sugar_demo_may17.txt, tests/test.doc, tests/test.jpg, tests/test.odt, tests/test.pdf, tests/test_backingstore.py, tests/test_conversion.py, tests/test_model.py, tests/test_xapianindex.py, tests/testutils.py, tests/web_data.json, tests/xapianindex.txt
-GPL-2+ [2007 Lemur Consulting Ltd]: secore/__init__.py, secore/datastructures.py, secore/fieldactions.py, secore/fieldmappings.py, secore/highlight.py, secore/indexerconnection.py, secore/marshall.py, secore/parsedate.py, secore/searchconnection.py
-UNKNOWN [ObjectRealms, LLC, 2007']: src/olpc/datastore/backingstore.py, src/olpc/datastore/converter.py, src/olpc/datastore/datastore.py, src/olpc/datastore/model.py, src/olpc/datastore/xapianindex.py
+*No copyright* UNKNOWN []: Makefile.am
+	autogen.sh
+	bin/Makefile.am
+	bin/datastore-service
+	bin/sample-client.py
+	bin/test-indexprop.py
+	bin/test-inplace.py
+	configure.ac
+	docs/Makefile
+	docs/getbuildpath.py
+	docs/writedocs.py
+	etc/.gitignore
+	etc/Makefile.am
+	etc/org.laptop.sugar.DataStore.service.in
+	secore/Makefile.am
+	src/Makefile.am
+	src/olpc/Makefile.am
+	src/olpc/__init__.py
+	src/olpc/datastore/Makefile.am
+	src/olpc/datastore/__init__.py
+	src/olpc/datastore/__version__.py
+	src/olpc/datastore/bin_copy.py
+	src/olpc/datastore/utils.py
+	tests/Makefile
+	tests/__init__.py
+	tests/cleaner.py
+	tests/dateranges.txt
+	tests/funkyabi.odt
+	tests/milestone_1.txt
+	tests/milestone_2.txt
+	tests/mountpoints.txt
+	tests/properties.txt
+	tests/runalltests.py
+	tests/sugar_demo_may17.txt
+	tests/test.doc
+	tests/test.jpg
+	tests/test.odt
+	tests/test.pdf
+	tests/test_backingstore.py
+	tests/test_conversion.py
+	tests/test_model.py
+	tests/test_xapianindex.py
+	tests/testutils.py
+	tests/web_data.json
+	tests/xapianindex.txt
+GPL-2+ [2007 Lemur Consulting Ltd]: secore/__init__.py
+	secore/datastructures.py
+	secore/fieldactions.py
+	secore/fieldmappings.py
+	secore/highlight.py
+	secore/indexerconnection.py
+	secore/marshall.py
+	secore/parsedate.py
+	secore/searchconnection.py
+UNKNOWN [ObjectRealms, LLC, 2007']: src/olpc/datastore/backingstore.py
+	src/olpc/datastore/converter.py
+	src/olpc/datastore/datastore.py
+	src/olpc/datastore/model.py
+	src/olpc/datastore/xapianindex.py
 GPL-2+ GENERATED FILE [2007 Lemur Consulting Ltd]: secore/errors.py
 GPL-2+ [[path]: maint-helper.py
 UNKNOWN [1997 American Mathematical Society. All Rights Reserved / 1997 American Mathematical Society. All Rights Reserved) readonly def]: tests/plugger.pdf