Update local CDBS snippets and debian/control.debian/48-1

* Update local CDBS snippets:
  + python-sugar.mk: Install into right path. Closes: bug#507326.
  + python-sugar.mk: Install as non-localized activity name.
  + python-sugar.mk: Dynamically update locale entries in MANIFEST.
* Semi-auto-update debian/control to tighten build-dependencies.

3 files changed, 20 insertions, 8 deletions

diff --git a/debian/cdbs/1/class/python-sugar.mk b/debian/cdbs/1/class/python-sugar.mk
index c67a865..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 (>= 0.81.4-2~), 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))
@@ -56,14 +56,19 @@ pre-build::
 	mkdir -p debian/stamps-configure
 
 $(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 $(cdbs_pkgsrcdir)/setup.py dist_xo; \
+		/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_PYTHON_SUGAR_PACKAGES)) :: install/%:
 	mkdir -p $(DEB_DESTDIR)usr/share/sugar/activities
 	for pythonver in $(cdbs_python_build_versions); do \
-		/usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install $(DEB_DESTDIR)usr/share/sugar/activities; \
+		LANG=C /usr/bin/python$$ver $(cdbs_pkgsrcdir)/setup.py install --prefix="$(DEB_DESTDIR)/usr"; \
 	done
 
 $(patsubst %,binary-install/%,$(DEB_PYTHON_SUGAR_PACKAGES)) :: binary-install/%:
@@ -73,14 +78,16 @@ else
 	dh_pycentral -p$(cdbs_curpkg)
 endif
 
+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/% : 
-	-find "$(cdbs_pkgsrcdir)/dist" -maxdepth 1 -type f -name '*.xo' -exec rm -f '{}' ';'
-	-rmdir --ignore-fail-on-non-empty "$(cdbs_pkgsrcdir)/dist"
 	-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"`"; \
diff --git a/debian/changelog b/debian/changelog
index e192427..e6fc0d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-sugar-chat-activity (48-1) UNRELEASED; urgency=low
+sugar-chat-activity (48-1) unstable; urgency=low
 
   * New Upstream Version
   * Depend on ${misc:Depends}.
+  * Update local CDBS snippets:
+    + python-sugar.mk: Install into right path. Closes: bug#507326.
+    + python-sugar.mk: Install as non-localized activity name.
+    + python-sugar.mk: Dynamically update locale entries in MANIFEST.
+  * Semi-auto-update debian/control to tighten build-dependencies.
 
- -- Jonas Smedegaard <dr@jones.dk>  Wed, 03 Dec 2008 22:31:47 +0100
+ -- Jonas Smedegaard <dr@jones.dk>  Thu, 04 Dec 2008 03:15:19 +0100
 
 sugar-chat-activity (45-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f9e0b83..f7b7f86 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
 Priority: optional
 Maintainer: Debian OLPC <debian-olpc-devel@lists.alioth.debian.org>
 Uploaders: Jonas Smedegaard <dr@jones.dk>
-Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5.0.44), python-sugar, python-sugar-toolkit (>= 0.81.4-2~), unzip, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo
+Build-Depends: cdbs (>= 0.4.39), debhelper (>= 5.0.44), python-sugar, python-sugar-toolkit (>= 0.82.5), unzip, python-dev (>= 2.3.5-11), python-central (>= 0.5.6), devscripts (>= 2.10.7), quilt, patchutils (>= 0.2.25), dh-buildinfo
 Standards-Version: 3.7.3
 Vcs-Git: git://git.debian.org/git/collab-maint/sugar-chat-activity.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/sugar-chat-activity.git;a=summary