diff -Nru krename-4.0.4/debian/changelog krename-4.0.4/debian/changelog
--- krename-4.0.4/debian/changelog	2010-06-28 21:42:25.000000000 +0300
+++ krename-4.0.4/debian/changelog	2010-07-09 09:35:43.000000000 +0300
@@ -1,3 +1,11 @@
+krename (4.0.4-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable. (LP: #601865) Remaining changes:
+    - Export KUBUNTU_NO_DELETE_POT=1 in debian/rules so that the l10n stuff
+      doesn't break the build
+
+ -- Bilal Akhtar <bilalakhtar96@yahoo.com>  Fri, 09 Jul 2010 09:35:41 +0300
+
 krename (4.0.4-2) unstable; urgency=low
 
   * Add 03_skip_equal.diff to skip renaming if source and target filenames are
@@ -17,6 +25,13 @@
 
  -- Fathi Boudra <fabo@debian.org>  Sun, 27 Jun 2010 10:01:46 +0300
 
+krename (4.0.3-1ubuntu1) lucid; urgency=low
+
+  * Export KUBUNTU_NO_DELETE_POT=1 in debian/rules so that the l10n stuff
+    doesn't break the build
+
+ -- Jonathan Thomas <echidnaman@kubuntu.org>  Tue, 16 Feb 2010 18:50:25 -0500
+
 krename (4.0.3-1) unstable; urgency=low
 
   * New upstream release (Closes: #563848)
@@ -198,3 +213,4 @@
   * Initial Release.
 
  -- Roman Kreisel <roman.kreisel@web.de>  Sun, 14 Nov 2004 23:23:38 +0100
+
diff -Nru krename-4.0.4/debian/control krename-4.0.4/debian/control
--- krename-4.0.4/debian/control	2010-06-27 10:02:40.000000000 +0300
+++ krename-4.0.4/debian/control	2010-07-09 09:30:07.000000000 +0300
@@ -1,7 +1,8 @@
 Source: krename
 Section: utils
 Priority: optional
-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo@debian.org>, Richard A. Johnson <nixternal@ubuntu.com>
 Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.6.15),
  kdelibs5-dev (>= 4:4.4.4), libexiv2-dev, libtag1-dev, libpodofo-dev
diff -Nru krename-4.0.4/debian/rules krename-4.0.4/debian/rules
--- krename-4.0.4/debian/rules	2010-06-27 10:02:12.000000000 +0300
+++ krename-4.0.4/debian/rules	2010-07-01 03:55:11.000000000 +0300
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export KUBUNTU_NO_DELETE_POT=1
+
 %:
 	dh $@ --with kde