diff -pruN 3.0.r4480.debian-1/debian/changelog 3.0.r4480.debian-1ubuntu1/debian/changelog
--- 3.0.r4480.debian-1/debian/changelog	2008-06-25 10:14:40.000000000 +0100
+++ 3.0.r4480.debian-1ubuntu1/debian/changelog	2008-06-25 10:13:11.000000000 +0100
@@ -1,3 +1,11 @@
+maemo-af-desktop-l10n (3.0.r4480.debian-1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. 
+  * Remaining Ubuntu changes:
+    - Build with NO_PKG_MANGLE=1.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Wed, 25 Jun 2008 16:59:21 +1000
+
 maemo-af-desktop-l10n (3.0.r4480.debian-1) unstable; urgency=low
 
   [ Jonny Lamb ]
diff -pruN 3.0.r4480.debian-1/debian/rules 3.0.r4480.debian-1ubuntu1/debian/rules
--- 3.0.r4480.debian-1/debian/rules	2008-06-25 10:14:40.000000000 +0100
+++ 3.0.r4480.debian-1ubuntu1/debian/rules	2008-06-25 10:13:11.000000000 +0100
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# HACK: Hildon/Maemo needs better l10n
+export NO_PKG_MANGLE=1
+
 TEXT_DOMAIN := $(shell dpkg-parsechangelog | sed -n 's/^Source: \(.*\)-l10n$$/\1/p')
 LANGS = $(shell echo po/*.po | sed -e 's,^po/,,; s/\.po$$//')