diff -Nru josm-plugins-0.0.svn24632/debian/changelog josm-plugins-0.0.svn24632/debian/changelog
--- josm-plugins-0.0.svn24632/debian/changelog	2010-12-08 19:52:15.000000000 +0100
+++ josm-plugins-0.0.svn24632/debian/changelog	2010-12-09 22:48:43.000000000 +0100
@@ -1,3 +1,11 @@
+josm-plugins (0.0.svn24632-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #688277). Remaining changes:
+    - Build-depend on libqtwebkit-dev as libqt4-dev doesn't contain
+      QtWebKit anymore.
+
+ -- Angel Abad <angelabad@ubuntu.com>  Thu, 09 Dec 2010 22:34:28 +0100
+
 josm-plugins (0.0.svn24632-1) unstable; urgency=low
 
   * New upstream snapshot
@@ -6,6 +14,14 @@
 
  -- David Paleino <dapal@debian.org>  Wed, 08 Dec 2010 19:52:09 +0100
 
+josm-plugins (0.0.svn24572-1ubuntu1) natty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Build-depend on libqtwebkit-dev as libqt4-dev doesn't contain
+      QtWebKit anymore.
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Tue, 07 Dec 2010 14:06:23 +0100
+
 josm-plugins (0.0.svn24572-1) unstable; urgency=low
 
   * New upstream snapshot
@@ -18,6 +34,13 @@
 
  -- David Paleino <dapal@debian.org>  Mon, 06 Dec 2010 11:56:39 +0100
 
+josm-plugins (0.0.svn23479-3ubuntu1) natty; urgency=low
+
+  * Build-depend on libqtwebkit-dev as libqt4-dev doesn't contain
+    QtWebKit anymore.
+
+ -- Felix Geyer <debfx-pkg@fobos.de>  Tue, 19 Oct 2010 21:45:18 +0200
+
 josm-plugins (0.0.svn23479-3) unstable; urgency=low
 
   * Switch priority between webkit-image-gtk and -qt in Recommends
diff -Nru josm-plugins-0.0.svn24632/debian/control josm-plugins-0.0.svn24632/debian/control
--- josm-plugins-0.0.svn24632/debian/control	2010-12-08 19:52:15.000000000 +0100
+++ josm-plugins-0.0.svn24632/debian/control	2010-12-09 01:03:35.000000000 +0100
@@ -1,7 +1,8 @@
 Source: josm-plugins
 Section: utils
 Priority: extra
-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders:
  Giovanni Mascellani <gio@debian.org>
  , Andreas Putzo <andreas@putzo.net>
@@ -17,6 +18,7 @@
  , libjgrapht0.8-java
 # webkit-image dependencies
  , libqt4-dev
+ , libqtwebkit-dev
  , qt4-qmake
  , libwebkit-dev
  , libglib2.0-dev