diff -u gv-3.6.3dfsg/debian/changelog gv-3.6.3dfsg/debian/changelog
--- gv-3.6.3dfsg/debian/changelog
+++ gv-3.6.3dfsg/debian/changelog
@@ -1,3 +1,11 @@
+gv (1:3.6.3dfsg-1ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Update depends from gs-gpl | gs to a hardcoded gs-esp-x.
+    - Update maintainer field in debian/control.
+
+ -- Michele Angrisano <micheleangrisano@ubuntu.com>  Wed, 25 Jul 2007 19:10:48 +0200
+
 gv (1:3.6.3dfsg-1) unstable; urgency=low
 
   * new maintainer (Closes: 407666)
@@ -12,6 +20,15 @@
 
  -- Bernhard R. Link <brlink@debian.org>  Sun, 15 Jul 2007 21:38:19 +0200
 
+gv (1:3.6.2-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - Update depends from gs-gpl | gs to a hardcoded gs-esp-x.
+    - Set maintainer to ubuntu universe developers, see
+      https://wiki.ubuntu.com/DebianMaintainerField.
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Sun,  6 May 2007 22:51:26 +0200
+
 gv (1:3.6.2-4) unstable; urgency=low
 
   * QA upload.
@@ -21,12 +38,30 @@
 
  -- Stefan Fritsch <sf@debian.org>  Sat, 05 May 2007 14:51:16 +0200
 
+gv (1:3.6.2-3ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Update depends from gs-gpl | gs to a hardcoded gs-esp-x.
+    - Set maintainer to ubuntu universe developers, see
+      https://wiki.ubuntu.com/DebianMaintainerField.
+
+ -- Michael Bienia <geser@ubuntu.com>  Sat, 17 Feb 2007 00:34:44 +0100
+
 gv (1:3.6.2-3) unstable; urgency=high
 
   * Update fix for CVE-2006-5864 as in DSA 1214-2 (See: #398292).
 
  -- Christoph Berg <myon@debian.org>  Fri,  5 Jan 2007 17:02:41 +0100
 
+gv (1:3.6.2-2ubuntu1) feisty; urgency=low
+
+  * Update depends from gs-gpl | gs to a hardcoded gs-esp-x. See
+    lp #83597 for details.
+  * Set maintainer to ubuntu universe developers, see
+    https://wiki.ubuntu.com/DebianMaintainerField.
+
+ -- Stefan Potyra <sistpoty@ubuntu.com>  Fri, 16 Feb 2007 01:23:32 +0100
+
 gv (1:3.6.2-2) unstable; urgency=high
 
   * Apply patch by Werner Fink to fix ps_gettext() buffer overflow
diff -u gv-3.6.3dfsg/debian/control gv-3.6.3dfsg/debian/control
--- gv-3.6.3dfsg/debian/control
+++ gv-3.6.3dfsg/debian/control
@@ -1,7 +1,8 @@
 Source: gv
 Section: text
 Priority: optional
-Maintainer: Bernhard R. Link <brlink@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bernhard R. Link <brlink@debian.org>
 Build-Depends: debhelper (>> 4), xaw3dg-dev, texinfo
 Standards-Version: 3.7.2
 XS-Vcs-Browser: http://cvs.savannah.gnu.org/viewvc/gv/?root=gv
@@ -9,7 +10,7 @@
 
 Package: gv
 Architecture: any
-Depends: gs-gpl | gs, ${shlibs:Depends}
+Depends: gs-esp-x, ${shlibs:Depends}
 Provides: postscript-viewer, pdf-viewer
 Replaces: gv-2d, gv-3d, fvwm-common (<< 2.0.46-BETA-2)
 Conflicts: gv-2d, gv-3d