diff -u antennavis-0.3/debian/control antennavis-0.3/debian/control
--- antennavis-0.3/debian/control
+++ antennavis-0.3/debian/control
@@ -1,8 +1,9 @@
 Source: antennavis
 Section: hamradio
 Priority: optional
-Maintainer: Joop Stakenborg <pa3aba@debian.org>
-Build-Depends: debhelper (>= 4.0.0), tcl8.4-dev, tk8.4-dev, xlibmesa-gl-dev, libglu1-mesa-dev, libxmu-dev
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Joop Stakenborg <pa3aba@debian.org>
+Build-Depends: debhelper (>= 4.0.0), tcl8.4-dev, tk8.4-dev, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libxmu-dev
 Standards-Version: 3.7.2
 
 Package: antennavis
diff -u antennavis-0.3/debian/changelog antennavis-0.3/debian/changelog
--- antennavis-0.3/debian/changelog
+++ antennavis-0.3/debian/changelog
@@ -1,3 +1,12 @@
+antennavis (0.3-3ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Retained change of build depends reflecting
+      xorg -> mesa GL/GLU transition
+    - Retained Updated maintainer field
+
+ -- Joseph Jackson IV <jjacksoniv@fluxbuntu.org>  Tue, 06 Nov 2007 11:28:58 +0000
+
 antennavis (0.3-3) unstable; urgency=low
 
   * Use AC_PROG_INSTALL in configure.ac and "INSTALL := @INSTALL@" and
@@ -9,6 +18,19 @@
 
  -- Joop Stakenborg <pa3aba@debian.org>  Sat, 01 Sep 2007 20:22:04 +0200
 
+antennavis (0.3-2ubuntu2) gutsy; urgency=low
+
+  * debian/control: Update maintainer fields according to debian-
+    maintainer-field spec.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 14 Aug 2007 10:51:21 +0000
+
+antennavis (0.3-2ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Stephan Hermann <sh@sourcecode.de>  Sat,  8 Jul 2006 12:40:50 +0200
+
 antennavis (0.3-2) unstable; urgency=low
 
   * Change build dependencies to use libglu1-mesa-dev instead of obsolete
@@ -35,6 +57,12 @@
 
  -- Joop Stakenborg <pa3aba@debian.org>  Mon,  27 Feb 2006 21:30:33 +0100
 
+antennavis (0.2-5ubuntu1) breezy; urgency=low
+
+  * Update {build-,}depends for xorg -> mesa GL/GLU transition.
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 25 Aug 2005 00:21:45 +1000
+
 antennavis (0.2-5) unstable; urgency=low
 
   * Somehow the old makefile got distributed. Fixed that.