diff -u goldendict-1.0.2~git20110314/debian/changelog goldendict-1.0.2~git20110314/debian/changelog
--- goldendict-1.0.2~git20110314/debian/changelog
+++ goldendict-1.0.2~git20110314/debian/changelog
@@ -1,3 +1,10 @@
+goldendict (1.0.2~git20110314-1ubuntu1) oneiric; urgency=low
+
+  * Merge from debian unstable.  (LP: #776428) Remaining changes:
+    - Build-dep on libqtwebkit-dev for qtwebkit transition
+
+ -- Paolo Sammicheli <xdatap1@ubuntu.com>  Tue, 15 Mar 2011 19:00:17 +0000
+
 goldendict (1.0.2~git20110314-1) unstable; urgency=low
 
   * New GIT-snapshot.
@@ -5,6 +12,13 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Mon, 14 Mar 2011 16:22:44 +0300
 
+goldendict (1.0.1-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Build-dep on libqtwebkit-dev for qtwebkit transition
+
+ -- Lorenzo De Liso <blackz@ubuntu.com>  Mon, 06 Dec 2010 23:53:03 +0100
+
 goldendict (1.0.1-1) unstable; urgency=low
 
   * New upstream version.
@@ -52,6 +66,13 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 13 Oct 2010 08:53:01 +0400
 
+goldendict (0.9.1~git20100719-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #608168). Remaining changes:
+    - Build-dep on libqtwebkit-dev for qtwebkit transition
+
+ -- Angel Abad <angelabad@gmail.com>  Sun, 25 Jul 2010 08:26:46 +0100
+
 goldendict (0.9.1~git20100719-2) unstable; urgency=low
 
   * Fixed typos in debian/control, thanks for
@@ -66,12 +87,32 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Mon, 19 Jul 2010 09:44:35 +0400
 
+goldendict (0.9.1~git20100707-1ubuntu2) maverick; urgency=low
+
+  * Build-dep on libqtwebkit-dev for qtwebkit transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Jul 2010 10:08:01 +0100
+
+goldendict (0.9.1~git20100707-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.(LP: #604298) Remaining changes:
+    - Add build-dep on libqt4-webkit-dev.
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sun, 11 Jul 2010 19:27:43 +0530
+
 goldendict (0.9.1~git20100707-1) unstable; urgency=low
 
   * New GIT-snapshot
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 07 Jul 2010 10:30:00 +0400
 
+goldendict (0.9.1~git20100609-3ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - Add build-dep on libqt4-webkit-dev.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 21 Jun 2010 14:45:09 +0200
+
 goldendict (0.9.1~git20100609-3) unstable; urgency=low
 
   * Unstable upload.
@@ -90,6 +131,26 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Wed, 09 Jun 2010 11:44:36 +0400
 
+goldendict (0.9.1~git20100413-1ubuntu3) maverick; urgency=low
+
+  * debian/rules: Remove the rm of .desktop file; not needed.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 24 May 2010 02:21:43 +0200
+
+goldendict (0.9.1~git20100413-1ubuntu2) maverick; urgency=low
+
+  * debian/rules: Remove the rm of .desktop file.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 24 May 2010 01:35:19 +0200
+
+goldendict (0.9.1~git20100413-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes:
+    - debian/rules: Remove .desktop file
+  * Add build-dep on libqt4-webkit-dev.
+
+ -- Andreas Wenning <awen@awen.dk>  Sun, 23 May 2010 23:54:18 +0200
+
 goldendict (0.9.1~git20100413-1) unstable; urgency=low
 
   * New GIT-snapshot
@@ -131,6 +192,14 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Sun, 17 Jan 2010 11:46:25 +0300
 
+goldendict (0.9.1~git20091117-1ubuntu1) lucid; urgency=low
+
+  * Merging changes from Debian, closes (LP: #499335)
+     - Changes left:
+        - Removing a .desktop file
+
+ -- Vikram Dhillon <dhillonv10@gmail.com>  Thu, 31 Dec 2009 19:03:33 -0500
+
 goldendict (0.9.1~git20091117-1) unstable; urgency=low
 
   * New GIT snapshot.
@@ -281,6 +350,13 @@
 
  -- Dmitry E. Oboukhov <unera@debian.org>  Thu, 23 Jul 2009 15:39:10 +0400
 
+goldendict (0.9.0+svn354-3ubuntu1) karmic; urgency=low
+
+  * do not install /usr/share/app-install/desktop/goldendict.desktop
+    (LP: #437354)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 28 Sep 2009 10:20:31 +0200
+
 goldendict (0.9.0+svn354-3) unstable; urgency=low
 
   * Fix FTBFS on S390.
@@ -310,0 +387 @@
+
diff -u goldendict-1.0.2~git20110314/debian/control goldendict-1.0.2~git20110314/debian/control
--- goldendict-1.0.2~git20110314/debian/control
+++ goldendict-1.0.2~git20110314/debian/control
@@ -1,11 +1,12 @@
 Source: goldendict
 Priority: optional
 Section: utils
-Maintainer: Dmitry E. Oboukhov <unera@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Dmitry E. Oboukhov <unera@debian.org>
 Standards-Version: 3.9.1
 Build-Depends: cdbs, debhelper (>= 7),
  x11proto-record-dev, libxtst-dev,
- qt4-qmake, libqt4-dev (>= 4.5.1), libvorbis-dev,
+ qt4-qmake, libqt4-dev (>= 4.5.1), libqtwebkit-dev, libvorbis-dev,
  libhunspell-dev, libx11-dev, zlib1g-dev,
  libphonon-dev, pkg-config, libqtwebkit-dev
 Homepage: http://goldendict.berlios.de/