diff -u maemo-af-desktop-l10n-3.0.r4480.debian/debian/changelog maemo-af-desktop-l10n-3.0.r4480.debian/debian/changelog
--- maemo-af-desktop-l10n-3.0.r4480.debian/debian/changelog
+++ maemo-af-desktop-l10n-3.0.r4480.debian/debian/changelog
@@ -1,3 +1,10 @@
+maemo-af-desktop-l10n (3.0.r4480.debian-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable(LP: #612435). Remaining change
+    - Build with NO_PKG_MANGLE=1.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Mon, 02 Aug 2010 11:48:38 +0530
+
 maemo-af-desktop-l10n (3.0.r4480.debian-2) unstable; urgency=low
 
   * debian/gbp.conf: Added git-buildpackage config.
@@ -10,6 +17,14 @@
 
  -- Jonny Lamb <jonny@debian.org>  Sat, 31 Jul 2010 21:53:08 -0400
 
+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 -u maemo-af-desktop-l10n-3.0.r4480.debian/debian/rules maemo-af-desktop-l10n-3.0.r4480.debian/debian/rules
--- maemo-af-desktop-l10n-3.0.r4480.debian/debian/rules
+++ maemo-af-desktop-l10n-3.0.r4480.debian/debian/rules
@@ -8,6 +8,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$$//')