New Upstream VersionHEADmaster

* New Upstream Version
* debian/copyright is not ready for upload yet, see debian/copyright_hints.

16 files changed, 537 insertions, 47 deletions

diff --git a/debian/README.cdbs-tweaks b/debian/README.cdbs-tweaks
index 5880b2f..6130d0f 100644
--- a/debian/README.cdbs-tweaks
+++ b/debian/README.cdbs-tweaks
@@ -69,6 +69,13 @@ Handle packaging of Sugar activities.
 
 
 
+New perl-build class
+--------------------
+
+Handle Perl modules using Module::Build.
+
+
+
 New copyright-check rule
 ------------------------
 
@@ -84,6 +91,16 @@ Small wrapper around dh-kpatches, taking care of build-dependencies too.
 
 
 
+New package-relations rule
+--------------------------
+
+Improved build-dependency handling (merging multiple dependencies on
+same packages), and add dependency handling for binary packages (to ease
+maintaining identical build-dependencies and dependencies for eg. Perl
+modules meeding runtime stuff for buildtime tests).
+
+
+
 New routines for handling upstream tarball
 ------------------------------------------
 
diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk
index 31bab61..166db9e 100644
--- a/debian/cdbs/1/class/python-sugar.mk
+++ b/debian/cdbs/1/class/python-sugar.mk
@@ -30,7 +30,7 @@ include debian/cdbs/1/class/python-vars.mk
 include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
 
 # Declare Build-Deps for packages using this file
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit, unzip
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip
 # FIXME: Resolve DEB_PYTHON_PACKAGES in build targets only
 ifeq (,$(cdbs_python_pkg_check)$(DEB_PYTHON_ARCH_PACKAGES))
   ifneq (, $(cdbs_python_compile_version))
@@ -42,52 +42,58 @@ 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
 
-# Files or `find -name`-compatible search patterns to add to temp MANIFEST
-#DEB_PYTHON_SUGAR_MANIFEST = *.py *.po *.pot *.svg
+DEB_PYTHON_SUGAR_PACKAGES = $(filter sugar-%-activity, $(DEB_PACKAGES))
 
-DEB_PYTHON_SUGAR_MANIFEST_REGEX =
-DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX = ^debian/.*
+# TODO: Move this to buildvars.mk
+cdbs_pkgsrcdir = $(if $(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_PKGSRCDIR_$(cdbs_curpkg)),$(DEB_SRCDIR))
 
-cdbs_python_sugar_manifest_files_tmp = $(patsubst %,-or -name '%',$(DEB_PYTHON_SUGAR_MANIFEST))
-cdbs_python_sugar_manifest_files = $(wordlist 2, $(words $(cdbs_python_sugar_manifest_files_tmp)), $(cdbs_python_sugar_manifest_files_tmp))
+pre-build::
+	mkdir -p debian/stamps-configure
 
-common-configure-arch common-configure-indep:: common-configure-impl
-common-configure-impl::
-	$(if $(DEB_PYTHON_SUGAR_MANIFEST),i=$(DEB_SRCDIR)/MANIFEST; if [ -e $$i ] && [ ! -e $$i.cdbs-orig ]; then mv $$i $$i.cdbs-orig; fi)
-	$(if $(DEB_PYTHON_SUGAR_MANIFEST),cd $(DEB_SRCDIR) && find * -type f $(cdbs_python_sugar_manifest_files) $(if $(DEB_PYTHON_SUGAR_MANIFEST_REGEX),-regex '$(DEB_PYTHON_SUGAR_MANIFEST_REGEX)') $(if $(DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX),-not -regex '$(DEB_PYTHON_SUGAR_MANIFEST_IGNORE_REGEX))' > MANIFEST)
-
-$(patsubst %,build/%,$(DEB_PACKAGES)) :: build/%:
+$(patsubst %,build/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: build/%:
+	[ ! -e $(cdbs_pkgsrcdir)/MANIFEST ] || [ -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv $(cdbs_pkgsrcdir)/MANIFEST $(cdbs_pkgsrcdir)/MANIFEST.upstream
+	egrep -v '^locale/.*/(.*\.mo|activity\.linfo)$$' $(cdbs_pkgsrcdir)/MANIFEST.upstream > $(cdbs_pkgsrcdir)/MANIFEST
 	for pythonver in $(cdbs_python_build_versions); do \
-		/usr/bin/python$$ver setup.py dist; \
+		/usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py build; \
+	done
+	-IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
+		echo "$$path" | sed 's!^$(cdbs_pkgsrcdir)/!!' >> $(cdbs_pkgsrcdir)/MANIFEST; \
 	done
 
-$(patsubst %,install/%,$(DEB_PACKAGES)) :: install/%:
+$(patsubst %,install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: install/%:
 	mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities
 	for pythonver in $(cdbs_python_build_versions); do \
-		/usr/bin/python$$ver setup.py install $(DEB_DESTDIR)usr; \
+		LANG=C /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix="$(DEB_DESTDIR)/usr"; \
 	done
 
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+$(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%:
 ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
 	dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS) $(DEB_PYTHON_PRIVATE_MODULES_DIRS_$(cdbs_curpkg))
 else
 	dh_pycentral -p$(cdbs_curpkg)
 endif
 
-clean::
-	for pythonver in $(cdbs_python_build_versions); do \
-		/usr/bin/python$$ver setup.py clean; \
-	done
-	$(if $(DEB_PYTHON_SUGAR_MANIFEST),i=$(DEB_SRCDIR)/MANIFEST; if test -e $$i.cdbs-orig ; then mv -f $$i.cdbs-orig $$i; fi)
+reverse-config:: $(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES))
+$(patsubst %,cleanpythonsugar-reverse-config/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar-reverse-config/% : 
+	[ ! -e $(cdbs_pkgsrcdir)/MANIFEST.upstream ] || mv -f $(cdbs_pkgsrcdir)/MANIFEST.upstream $(cdbs_pkgsrcdir)/MANIFEST
+
+clean:: $(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES))
 ifeq (, $(cdbs_selected_pycompat))
 	echo "$(cdbs_pycompat)" >debian/pycompat
 endif # use pycompat
 
+$(patsubst %,cleanpythonsugar/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: cleanpythonsugar/% : 
+	-IFS="`printf '\n'`" find "$(cdbs_pkgsrcdir)/locale" -type f \( -name '*.mo' -or -name 'activity.linfo' \) | while read path; do \
+		rm -f "$$path"; \
+		rmdir --ignore-fail-on-non-empty "`dirname "$$path"`"; \
+	done
+	-rmdir --ignore-fail-on-non-empty "$(cdbs_pkgsrcdir)/locale"
+
 ## TODO: Drop this when DEB_PYTHON_PACKAGES is only resolved in build targets
 pre-build clean::
 	$(cdbs_python_pkgresolve_check)
diff --git a/debian/cdbs/1/rules/copyright-check.mk b/debian/cdbs/1/rules/copyright-check.mk
index d4ead0d..d96681a 100644
--- a/debian/cdbs/1/rules/copyright-check.mk
+++ b/debian/cdbs/1/rules/copyright-check.mk
@@ -28,6 +28,9 @@ include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
 
 CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), devscripts (>= 2.10.7)
 
+# Set to yes to fail on changed/new hints are found
+#DEB_COPYRIGHT_CHECK_STRICT := yes
+
 # Single regular expression for files to include or ignore
 DEB_COPYRIGHT_CHECK_REGEX = .*
 DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\..*)?)$
@@ -35,14 +38,19 @@ DEB_COPYRIGHT_CHECK_IGNORE_REGEX = ^(debian/.*|(.*/)?config\.(guess|sub|rpath)(\
 pre-build:: debian/stamp-copyright-check
 
 debian/stamp-copyright-check:
-	@echo 'Scanning upstream source for new/changed copyright notices (except debian subdir!)...'
+	@echo 'Scanning upstream source for new/changed copyright notices...'
+	@echo licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+		"| some-output-filtering..."
 
 # Perl in shell in make requires extra care:
 #  * Single-quoting ('...') protects against shell expansion
 #  * Double-dollar ($$) expands to plain dollar ($) in make
-	licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
+	@licensecheck -c '$(DEB_COPYRIGHT_CHECK_REGEX)' -r --copyright -i '$(DEB_COPYRIGHT_CHECK_IGNORE_REGEX)' * \
 		| LC_ALL=C perl -e \
+	'print "Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX\n";'\
+	'print "Upstream-Name: Untrusted draft - double-check copyrights yourself!\n\n";'\
 	'$$n=0; while (<>) {'\
+	'	s/[^[:print:]]//g;'\
 	'	if (/^([^:\s][^:]+):[\s]+(\S.*?)\s*$$/) {'\
 	'		$$files[$$n]{name}=$$1;'\
 	'		$$files[$$n]{license}=$$2;'\
@@ -55,8 +63,15 @@ debian/stamp-copyright-check:
 	'foreach $$file (@files) {'\
 	'	$$file->{license} =~ s/\s*\(with incorrect FSF address\)//;'\
 	'	$$file->{license} =~ s/\s+\(v([^)]+) or later\)/-$$1+/;'\
+	'	$$file->{license} =~ s/\s*(\*No copyright\*)\s*// and $$file->{copyright} = $$1;'\
+	'	$$file->{license} =~ s/^\s*(GENERATED FILE)/UNKNOWN ($$1)/;'\
+	'	$$file->{license} =~ s/\s+(GENERATED FILE)/ ($$1)/;'\
 	'	$$file->{copyright} =~ s/(?<=(\b\d{4}))(?{$$y=$$^N})\s*[,-]\s*((??{$$y+1}))\b/-$$2/g;'\
 	'	$$file->{copyright} =~ s/(?<=\b\d{4})\s*-\s*\d{4}(?=\s*-\s*(\d{4})\b)//g;'\
+	'	$$file->{copyright} =~ s/\b(\d{4})\s+([\S^\d])/$$1, $$2/g;'\
+	'	$$file->{copyright} =~ s/^\W*\s+\/\s+//g;'\
+	'	$$file->{copyright} =~ s/\s+\/\s+\W*$$//;'\
+	'	$$file->{copyright} =~ s/\s+\/\s+/\n\t/g;'\
 	'	$$pattern = "$$file->{license} [$$file->{copyright}]";'\
 	'	push @{ $$patternfiles{"$$pattern"} }, $$file->{name};'\
 	'};'\
@@ -65,7 +80,10 @@ debian/stamp-copyright-check:
 	'			||'\
 	'			$$a cmp $$b'\
 	'		} keys %patternfiles ) {'\
-	'	print "$$pattern: ", join(", ", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	($$license, $$copyright) = $$pattern =~ /(.*) \[(.*)\]/s;'\
+	'	print "Files: ", join("\n\t", sort @{ $$patternfiles{$$pattern} }), "\n";'\
+	'	print "Copyright: $$copyright\n";'\
+	'	print "License: $$license\n\n";'\
 	'};'\
 		> debian/copyright_newhints
 	@patterncount="`cat debian/copyright_newhints | sed 's/^[^:]*://' | LANG=C sort -u | grep . -c -`"; \
@@ -73,18 +91,18 @@ 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 "$(if $(DEB_COPYRIGHT_CHECK_STRICT),ERROR,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; \
+			$(if $(DEB_COPYRIGHT_CHECK_STRICT),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/cdbs/1/rules/package-relations.mk b/debian/cdbs/1/rules/package-relations.mk
new file mode 100644
index 0000000..3a92eb7
--- /dev/null
+++ b/debian/cdbs/1/rules/package-relations.mk
@@ -0,0 +1,50 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2004-2006 Jonas Smedegaard <dr@jones.dk>
+# Description: Resolve, cleanup and apply package relationships
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+# 02111-1307 USA.
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_rules_package_relations
+_cdbs_rules_package_relations = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+
+# Merge build-dependencies on same packages
+# TODO: rewrite (in perl, probably) to be more generic
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.43)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\|0.4.27\|0.4.39\)) *,* */, /g')
+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')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.44)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\|5.0.37.2\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5.0.37.2)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\|5\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 5)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\|4.2.28\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.28)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\|4.2.21\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.21)/ s/ *,* *\bdebhelper (>= \(4.1.60\|4.2.0\)) *,* */, /g')
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bdebhelper (>= 4.2.0)/ s/ *,* *\bdebhelper (>= \(4.1.60\)) *,* */, /g')
+
+# Cleanup superfluous commas
+CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/ *,/,/g' -e 's/^ *, *//' -e 's/ *, *$$//')
+
+# Apply CDBS-declared dependencies to binary packages
+$(patsubst %,binary-predeb/%,$(DEB_PACKAGES)) :: binary-predeb/%:
+	echo 'cdbs:Depends=$(CDBS_DEPENDS_ALL), $(or $(CDBS_DEPENDS_$(cdbs_curpkg)),$(CDBS_DEPENDS))' \
+	  | sed -e 's/ *,/,/g' -e 's/^ *, *//' -e 's/ *, *$$//' \
+	  >> debian/$(cdbs_curpkg).substvars
+
+endif
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 8960399..cb480bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sugar-memorize-activity (29-1) UNRELEASED; urgency=low
+
+  * New Upstream Version
+  * debian/copyright is not ready for upload yet, see debian/copyright_hints. 
+
+ -- Holger Levsen <holger@debian.org>  Sat, 13 Dec 2008 14:11:04 +0000
+
 sugar-memorize-activity (26~git.20080405-1) unstable; urgency=low
 
   * Initial release.
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 cd7a1fa..30003f5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: sugar-memorize-activity
 Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>, Patrick Winnertz <winnie@debian.org>
+Uploaders: Jonas Smedegaard <dr@jones.dk>, 
+ Patrick Winnertz <winnie@debian.org>,
+ Holger Levsen <holger@debian.org>
 Build-Depends: devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 5), python-sugar, python-sugar-toolkit, unzip, python-dev (>= 2.3.5-11), python-central (>= 0.6), dh-buildinfo
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-memorize-activity.git
diff --git a/debian/control.in b/debian/control.in
index e6ba3e2..6e5b040 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: sugar-memorize-activity
 Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
-Uploaders: Jonas Smedegaard <dr@jones.dk>, Patrick Winnertz <winnie@debian.org>
+Uploaders: Jonas Smedegaard <dr@jones.dk>, 
+ Patrick Winnertz <winnie@debian.org>,
+ Holger Levsen <holger@debian.org>
 Build-Depends: @cdbs@
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-memorize-activity.git
diff --git a/debian/copyright b/debian/copyright
index 79f197f..4fab6fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -27,5 +27,4 @@ License: GPL-2+
  (at your option) any later version.
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in file "/usr/share/common-licenses/GPL", and that of the
-GNU Lesser General Public License in "/usr/share/common-licenses/LGPL".
+can be found in file "/usr/share/common-licenses/GPL".
diff --git a/debian/copyright_hints b/debian/copyright_hints
index c4e50a2..7622114 100644
--- a/debian/copyright_hints
+++ b/debian/copyright_hints
@@ -1,5 +1,137 @@
-*No copyright* UNKNOWN []: AUTHORS, NEWS, activity/activity-memorize.svg, activity/activity.info, activity/application-x-memorize-project.svg, csound/__init__.py, csound/csoundserver.py, csound/univorc.csd, demos/addition.zip, demos/letters.zip, demos/sounds.zip, images/card.svg, images/equal_pairs1.svg, images/equal_pairs2.svg, images/game-load.svg, images/game-new.svg, images/game-restart.svg, images/game-save.svg, images/import_picture.svg, images/import_sound.svg, images/pair-add.svg, images/pair-update.svg, images/score.svg, images/stock-buddy.svg, locale/am/LC_MESSAGES/org.laptop.Memorize.mo, locale/am/activity.linfo, locale/ar/LC_MESSAGES/org.laptop.Memorize.mo, locale/ar/activity.linfo, locale/ay/LC_MESSAGES/org.laptop.Memorize.mo, locale/ay/activity.linfo, locale/bg/LC_MESSAGES/org.laptop.Memorize.mo, locale/bg/activity.linfo, locale/bn/LC_MESSAGES/org.laptop.Memorize.mo, locale/bn/activity.linfo, locale/bn_IN/LC_MESSAGES/org.laptop.Memorize.mo, locale/bn_IN/activity.linfo, locale/ca/LC_MESSAGES/org.laptop.Memorize.mo, locale/ca/activity.linfo, locale/de/LC_MESSAGES/org.laptop.Memorize.mo, locale/de/activity.linfo, locale/dz/LC_MESSAGES/org.laptop.Memorize.mo, locale/dz/activity.linfo, locale/el/LC_MESSAGES/org.laptop.Memorize.mo, locale/el/activity.linfo, locale/en/LC_MESSAGES/org.laptop.Memorize.mo, locale/en/activity.linfo, locale/es/LC_MESSAGES/org.laptop.Memorize.mo, locale/es/activity.linfo, locale/fa/LC_MESSAGES/org.laptop.Memorize.mo, locale/fa/activity.linfo, locale/fa_AF/LC_MESSAGES/org.laptop.Memorize.mo, locale/fa_AF/activity.linfo, locale/ff/LC_MESSAGES/org.laptop.Memorize.mo, locale/ff/activity.linfo, locale/fr/LC_MESSAGES/org.laptop.Memorize.mo, locale/fr/activity.linfo, locale/ha/LC_MESSAGES/org.laptop.Memorize.mo, locale/ha/activity.linfo, locale/hi/LC_MESSAGES/org.laptop.Memorize.mo, locale/hi/activity.linfo, locale/ig/LC_MESSAGES/org.laptop.Memorize.mo, locale/ig/activity.linfo, locale/is/LC_MESSAGES/org.laptop.Memorize.mo, locale/is/activity.linfo, locale/it/LC_MESSAGES/org.laptop.Memorize.mo, locale/it/activity.linfo, locale/ja/LC_MESSAGES/org.laptop.Memorize.mo, locale/ja/activity.linfo, locale/ko/LC_MESSAGES/org.laptop.Memorize.mo, locale/ko/activity.linfo, locale/mk/LC_MESSAGES/org.laptop.Memorize.mo, locale/mk/activity.linfo, locale/ml/LC_MESSAGES/org.laptop.Memorize.mo, locale/ml/activity.linfo, locale/mn/LC_MESSAGES/org.laptop.Memorize.mo, locale/mn/activity.linfo, locale/ne/LC_MESSAGES/org.laptop.Memorize.mo, locale/ne/activity.linfo, locale/nl/LC_MESSAGES/org.laptop.Memorize.mo, locale/nl/activity.linfo, locale/pa/LC_MESSAGES/org.laptop.Memorize.mo, locale/pa/activity.linfo, locale/pl/LC_MESSAGES/org.laptop.Memorize.mo, locale/pl/activity.linfo, locale/ps/LC_MESSAGES/org.laptop.Memorize.mo, locale/ps/activity.linfo, locale/pt/LC_MESSAGES/org.laptop.Memorize.mo, locale/pt/activity.linfo, locale/pt_BR/LC_MESSAGES/org.laptop.Memorize.mo, locale/pt_BR/activity.linfo, locale/qu/LC_MESSAGES/org.laptop.Memorize.mo, locale/qu/activity.linfo, locale/ro/LC_MESSAGES/org.laptop.Memorize.mo, locale/ro/activity.linfo, locale/ru/LC_MESSAGES/org.laptop.Memorize.mo, locale/ru/activity.linfo, locale/rw/LC_MESSAGES/org.laptop.Memorize.mo, locale/rw/activity.linfo, locale/te/LC_MESSAGES/org.laptop.Memorize.mo, locale/te/activity.linfo, locale/th/LC_MESSAGES/org.laptop.Memorize.mo, locale/th/activity.linfo, locale/ur/LC_MESSAGES/org.laptop.Memorize.mo, locale/ur/activity.linfo, locale/yo/LC_MESSAGES/org.laptop.Memorize.mo, locale/yo/activity.linfo, locale/zh_CN/LC_MESSAGES/org.laptop.Memorize.mo, locale/zh_CN/activity.linfo, locale/zh_TW/LC_MESSAGES/org.laptop.Memorize.mo, locale/zh_TW/activity.linfo, memorize.dtd, po/am.po, po/ar.po, po/ay.po, po/bg.po, po/bn.po, po/bn_IN.po, po/ca.po, po/de.po, po/dz.po, po/el.po, po/en.po, po/es.po, po/fa.po, po/fa_AF.po, po/ff.po, po/fr.po, po/gu.po, po/ha.po, po/hi.po, po/ht.po, po/ig.po, po/is.po, po/it.po, po/ja.po, po/ko.po, po/mk.po, po/ml.po, po/mn.po, po/mr.po, po/ne.po, po/nl.po, po/pa.po, po/pl.po, po/ps.po, po/pt.po, po/pt_BR.po, po/qu.po, po/ro.po, po/ru.po, po/rw.po, po/si.po, po/te.po, po/th.po, po/tr.po, po/ur.po, po/vi.po, po/yo.po, po/zh_CN.po, po/zh_TW.po
-GPL-2+ [2006-2007, One Laptop Per Child]: activity.py, cardlist.py, cardtable.py, createcardpanel.py, createtoolbar.py, game.py, memorizetoolbar.py, messenger.py, model.py, playerscoreboard.py, score.py, scoreboard.py, svglabel.py
-UNKNOWN [YEAR THE PACKAGE'S COPYRIGHT HOLDER]: po/Memorize.pot, po/km.po
-GPL-2+ [2006, Red Hat, Inc]: setup.py
-GPL-2+ [2007, One Laptop Per Child]: svgcard.py
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=XXX
+Upstream-Name: Untrusted draft - double-check copyrights yourself!
+
+Files: AUTHORS
+	MANIFEST
+	NEWS
+	activity/activity-memorize.svg
+	activity/activity.info
+	activity/application-x-memorize-project.svg
+	csound/__init__.py
+	csound/univorc.csd
+	demos/addition.zip
+	demos/letters.zip
+	images/card.svg
+	images/equal_pairs1.svg
+	images/equal_pairs2.svg
+	images/game-load.svg
+	images/game-new.svg
+	images/game-restart.svg
+	images/game-save.svg
+	images/import_picture.svg
+	images/import_sound.svg
+	images/pair-add.svg
+	images/pair-update.svg
+	images/score.svg
+	images/stock-buddy.svg
+	memorize.dtd
+	po/am.po
+	po/ay.po
+	po/bg.po
+	po/bn.po
+	po/bn_IN.po
+	po/ca.po
+	po/de.po
+	po/dz.po
+	po/el.po
+	po/en.po
+	po/es.po
+	po/fa.po
+	po/fa_AF.po
+	po/ff.po
+	po/fr.po
+	po/gu.po
+	po/ha.po
+	po/hi.po
+	po/ht.po
+	po/ig.po
+	po/is.po
+	po/it.po
+	po/ja.po
+	po/ko.po
+	po/mk.po
+	po/ml.po
+	po/mn.po
+	po/mr.po
+	po/ne.po
+	po/nl.po
+	po/pa.po
+	po/pl.po
+	po/ps.po
+	po/pt.po
+	po/pt_BR.po
+	po/qu.po
+	po/ro.po
+	po/ru.po
+	po/rw.po
+	po/si.po
+	po/te.po
+	po/th.po
+	po/tr.po
+	po/ur.po
+	po/vi.po
+	po/yo.po
+	po/zh_CN.po
+	po/zh_TW.po
+Copyright: *No copyright*
+License: UNKNOWN
+
+Files: po/Memorize.pot
+	po/af.po
+	po/bi.po
+	po/cs.po
+	po/km.po
+	po/mvo.po
+	po/na.po
+	po/nb.po
+	po/pap.po
+	po/pis.po
+	po/pseudo.po
+	po/sd.po
+	po/sk.po
+	po/sl.po
+	po/sv.po
+	po/sw.po
+	po/ta.po
+	po/tpi.po
+Copyright: YEAR THE PACKAGE'S HOLDER
+License: UNKNOWN
+
+Files: activity.py
+	cardlist.py
+	cardtable.py
+	createcardpanel.py
+	createtoolbar.py
+	csound/csoundserver.py
+	game.py
+	memorizetoolbar.py
+	messenger.py
+	model.py
+	playerscoreboard.py
+	score.py
+	scoreboard.py
+	svglabel.py
+Copyright: 2006-2008, One Laptop Per Child
+License: GPL-2+
+
+Files: setup.py
+Copyright: 2006, Red Hat, Inc
+License: GPL-2+
+
+Files: svgcard.py
+Copyright: 2007-2008, One Laptop Per Child
+License: GPL-2+
+
+Files: po/ar.po
+Copyright: "
+License: UNKNOWN
+
+Files: demos/sounds.zip
+Copyright: 01Znqg3+R+<B%uC{^xGv6142`Mw=_dPm@ *.S
+License: UNKNOWN
+
+Files: COPYING
+Copyright: 1989, 1991, Free Software Foundation, Inc.
+	the software, and
+License: UNKNOWN
+
diff --git a/debian/patches/1001_add_manifest.patch b/debian/patches/1001_add_manifest.patch
new file mode 100644
index 0000000..349ee74
--- /dev/null
+++ b/debian/patches/1001_add_manifest.patch
@@ -0,0 +1,242 @@
+diff -Nur a/MANIFEST b/MANIFEST
+--- a/MANIFEST	1970-01-01 01:00:00.000000000 +0100
++++ b/MANIFEST	2008-12-13 19:40:12.000000000 +0100
+@@ -0,0 +1,238 @@
++csound/csoundserver.py
++csound/univorc.csd
++csound/__init__.py
++NEWS
++images/game-load.svg
++images/score.svg
++images/import_sound.svg
++images/equal_pairs2.svg
++images/game-restart.svg
++images/pair-add.svg
++images/equal_pairs1.svg
++images/card.svg
++images/stock-buddy.svg
++images/pair-update.svg
++images/game-new.svg
++images/game-save.svg
++images/import_picture.svg
++createtoolbar.py
++setup.py
++COPYING
++score.py
++messenger.py
++demos/letters.zip
++demos/sounds.zip
++demos/addition.zip
++memorize.dtd
++model.py
++memorizetoolbar.py
++scoreboard.py
++cardtable.py
++AUTHORS
++activity/activity.info
++activity/activity-memorize.svg
++activity/application-x-memorize-project.svg
++po/ca.po
++po/fr.po
++po/nl.po
++po/ur.po
++po/rw.po
++po/ko.po
++po/nb.po
++po/ta.po
++po/de.po
++po/ig.po
++po/mn.po
++po/Memorize.pot
++po/bi.po
++po/yo.po
++po/sd.po
++po/af.po
++po/ml.po
++po/es.po
++po/mr.po
++po/en.po
++po/ro.po
++po/tpi.po
++po/is.po
++po/zh_CN.po
++po/am.po
++po/vi.po
++po/bn.po
++po/km.po
++po/fa_AF.po
++po/pt_BR.po
++po/tr.po
++po/sl.po
++po/pap.po
++po/ne.po
++po/it.po
++po/ps.po
++po/ay.po
++po/bg.po
++po/ja.po
++po/pl.po
++po/el.po
++po/pt.po
++po/ar.po
++po/sk.po
++po/mk.po
++po/qu.po
++po/gu.po
++po/dz.po
++po/te.po
++po/pa.po
++po/ru.po
++po/si.po
++po/th.po
++po/ht.po
++po/pseudo.po
++po/sw.po
++po/zh_TW.po
++po/sv.po
++po/hi.po
++po/fa.po
++po/ff.po
++po/na.po
++po/cs.po
++po/mvo.po
++po/pis.po
++po/bn_IN.po
++po/ha.po
++activity.py
++svglabel.py
++svgcard.py
++game.py
++createcardpanel.py
++cardlist.py
++playerscoreboard.py
++locale/fa_AF/activity.linfo
++locale/fa_AF/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ro/activity.linfo
++locale/ro/LC_MESSAGES/org.laptop.Memorize.mo
++locale/es/activity.linfo
++locale/es/LC_MESSAGES/org.laptop.Memorize.mo
++locale/is/activity.linfo
++locale/is/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ht/activity.linfo
++locale/ht/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ml/activity.linfo
++locale/ml/LC_MESSAGES/org.laptop.Memorize.mo
++locale/en/activity.linfo
++locale/en/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ff/activity.linfo
++locale/ff/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ca/activity.linfo
++locale/ca/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ay/activity.linfo
++locale/ay/LC_MESSAGES/org.laptop.Memorize.mo
++locale/bn/activity.linfo
++locale/bn/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ta/activity.linfo
++locale/ta/LC_MESSAGES/org.laptop.Memorize.mo
++locale/fr/activity.linfo
++locale/fr/LC_MESSAGES/org.laptop.Memorize.mo
++locale/te/activity.linfo
++locale/te/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pap/activity.linfo
++locale/pap/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ru/activity.linfo
++locale/ru/LC_MESSAGES/org.laptop.Memorize.mo
++locale/sw/activity.linfo
++locale/sw/LC_MESSAGES/org.laptop.Memorize.mo
++locale/mn/activity.linfo
++locale/mn/LC_MESSAGES/org.laptop.Memorize.mo
++locale/am/activity.linfo
++locale/am/LC_MESSAGES/org.laptop.Memorize.mo
++locale/sd/activity.linfo
++locale/sd/LC_MESSAGES/org.laptop.Memorize.mo
++locale/th/activity.linfo
++locale/th/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ha/activity.linfo
++locale/ha/LC_MESSAGES/org.laptop.Memorize.mo
++locale/rw/activity.linfo
++locale/rw/LC_MESSAGES/org.laptop.Memorize.mo
++locale/zh_CN/activity.linfo
++locale/zh_CN/LC_MESSAGES/org.laptop.Memorize.mo
++locale/qu/activity.linfo
++locale/qu/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ko/activity.linfo
++locale/ko/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pl/activity.linfo
++locale/pl/LC_MESSAGES/org.laptop.Memorize.mo
++locale/fa/activity.linfo
++locale/fa/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ur/activity.linfo
++locale/ur/LC_MESSAGES/org.laptop.Memorize.mo
++locale/nl/activity.linfo
++locale/nl/LC_MESSAGES/org.laptop.Memorize.mo
++locale/tpi/activity.linfo
++locale/tpi/LC_MESSAGES/org.laptop.Memorize.mo
++locale/sv/activity.linfo
++locale/sv/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pa/activity.linfo
++locale/pa/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ar/activity.linfo
++locale/ar/LC_MESSAGES/org.laptop.Memorize.mo
++locale/bi/activity.linfo
++locale/bi/LC_MESSAGES/org.laptop.Memorize.mo
++locale/hi/activity.linfo
++locale/hi/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ne/activity.linfo
++locale/ne/LC_MESSAGES/org.laptop.Memorize.mo
++locale/na/activity.linfo
++locale/na/LC_MESSAGES/org.laptop.Memorize.mo
++locale/sl/activity.linfo
++locale/sl/LC_MESSAGES/org.laptop.Memorize.mo
++locale/km/activity.linfo
++locale/km/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ja/activity.linfo
++locale/ja/LC_MESSAGES/org.laptop.Memorize.mo
++locale/nb/activity.linfo
++locale/nb/LC_MESSAGES/org.laptop.Memorize.mo
++locale/tr/activity.linfo
++locale/tr/LC_MESSAGES/org.laptop.Memorize.mo
++locale/bg/activity.linfo
++locale/bg/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ig/activity.linfo
++locale/ig/LC_MESSAGES/org.laptop.Memorize.mo
++locale/af/activity.linfo
++locale/af/LC_MESSAGES/org.laptop.Memorize.mo
++locale/si/activity.linfo
++locale/si/LC_MESSAGES/org.laptop.Memorize.mo
++locale/gu/activity.linfo
++locale/gu/LC_MESSAGES/org.laptop.Memorize.mo
++locale/cs/activity.linfo
++locale/cs/LC_MESSAGES/org.laptop.Memorize.mo
++locale/mvo/activity.linfo
++locale/mvo/LC_MESSAGES/org.laptop.Memorize.mo
++locale/it/activity.linfo
++locale/it/LC_MESSAGES/org.laptop.Memorize.mo
++locale/el/activity.linfo
++locale/el/LC_MESSAGES/org.laptop.Memorize.mo
++locale/yo/activity.linfo
++locale/yo/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pt/activity.linfo
++locale/pt/LC_MESSAGES/org.laptop.Memorize.mo
++locale/ps/activity.linfo
++locale/ps/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pis/activity.linfo
++locale/pis/LC_MESSAGES/org.laptop.Memorize.mo
++locale/mk/activity.linfo
++locale/mk/LC_MESSAGES/org.laptop.Memorize.mo
++locale/vi/activity.linfo
++locale/vi/LC_MESSAGES/org.laptop.Memorize.mo
++locale/pt_BR/activity.linfo
++locale/pt_BR/LC_MESSAGES/org.laptop.Memorize.mo
++locale/zh_TW/activity.linfo
++locale/zh_TW/LC_MESSAGES/org.laptop.Memorize.mo
++locale/sk/activity.linfo
++locale/sk/LC_MESSAGES/org.laptop.Memorize.mo
++locale/bn_IN/activity.linfo
++locale/bn_IN/LC_MESSAGES/org.laptop.Memorize.mo
++locale/de/activity.linfo
++locale/de/LC_MESSAGES/org.laptop.Memorize.mo
++locale/dz/activity.linfo
++locale/dz/LC_MESSAGES/org.laptop.Memorize.mo
++locale/mr/activity.linfo
++locale/mr/LC_MESSAGES/org.laptop.Memorize.mo
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0991968
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+1001_add_manifest.patch
diff --git a/debian/rules b/debian/rules
index 532b135..db0f515 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,21 @@
 
 # NB! Local CDBS tweaks in use. More info in README.cdbs-tweaks
 DEB_PYTHON_SYSTEM = pycentral
+ifneq (,$(DEB_MAINTAINER_MODE))
+  # Enable stuff not policy compliant (eg. unsuitable for build daemons)
+  DEB_COPYRIGHT_CHECK_STRICT = yes
+  DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
+endif
+include debian/cdbs/1/rules/upstream-tarball.mk
 include debian/cdbs/1/rules/copyright-check.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include debian/cdbs/1/class/python-sugar.mk
 include debian/cdbs/1/rules/buildinfo.mk
 
-# Merge duplicate build-dependencies
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e '/\bcdbs (>= 0.4.27-1)/ s/ *,* *\bcdbs (>= \(0.4.23-1.1\)) *,* */, /g' -e 's/^ *, *//' -e 's/ *, *$$//')
+DEB_UPSTREAM_PACKAGE = Memorize
+DEB_UPSTREAM_URL = http://dev.laptop.org/pub/sugar/sources/$(DEB_UPSTREAM_PACKAGE)
+DEB_UPSTREAM_TARBALL_EXTENSION = tar.bz2
+DEB_UPSTREAM_TARBALL_MD5 = 3a0103e515d1e75b493cea3229353193
 
-# Avoid 1-revision in build-dependency
-CDBS_BUILD_DEPENDS := $(shell echo '$(CDBS_BUILD_DEPENDS)' | sed -e 's/\bcdbs (>= 0.4.27-1)/cdbs (>= 0.4.27)/')
+# Resolve, cleanup and apply CDBS-declared dependencies
+include debian/cdbs/1/rules/package-relations.mk
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..78bcac1
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+# run the "uscan" command to check for upstream updates and more.
+version=3
+http://dev.laptop.org/pub/sugar/sources/Memorize/Memorize-(.*)\.tar\.bz2