diff -u gtkglarea-1.2.3/debian/control gtkglarea-1.2.3/debian/control
--- gtkglarea-1.2.3/debian/control
+++ gtkglarea-1.2.3/debian/control
@@ -1,7 +1,8 @@
 Source: gtkglarea
 Section: devel
 Priority: optional
-Maintainer: Debian QA Group <packages@qa.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian QA Group <packages@qa.debian.org>
 Standards-Version: 3.5.6
 Build-Depends: automake1.4, autoconf (>= 2.50), libtool, libgtk1.2-dev, xlibmesa-gl-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, debhelper (>= 3), autotools-dev
 
diff -u gtkglarea-1.2.3/debian/docs gtkglarea-1.2.3/debian/docs
--- gtkglarea-1.2.3/debian/docs
+++ gtkglarea-1.2.3/debian/docs
@@ -1,3 +1,4 @@
 AUTHORS
+NEWS
 README
 
diff -u gtkglarea-1.2.3/debian/changelog gtkglarea-1.2.3/debian/changelog
--- gtkglarea-1.2.3/debian/changelog
+++ gtkglarea-1.2.3/debian/changelog
@@ -1,3 +1,13 @@
+gtkglarea (1.2.3-3ubuntu1) intrepid; urgency=low
+
+  * Merge with Debian (LP: #240766), remaining changes:
+    + gtkgl.m4: Fix quoting problem.
+    + debian/docs: Install NEWS file
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Iain Lane <iain@orangesquash.org.uk>  Tue, 17 Jun 2008 20:54:31 +0100
+
 gtkglarea (1.2.3-3) unstable; urgency=low
 
   * QA upload, orphaned package, see #471986.
@@ -13,13 +23,18 @@
 
  -- Bart Martens <bartm@debian.org>  Sat, 12 Apr 2008 09:34:36 +0200
 
-gtkglarea (1.2.3-2.3) unstable; urgency=low
+gtkglarea (1.2.3-2.2ubuntu2) hardy; urgency=low
+
+  * Rebuild for libglib1.2 -> libglib1.2ldbl transition.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 23 Nov 2007 21:01:52 +0100
+
+gtkglarea (1.2.3-2.2ubuntu1) feisty; urgency=low
 
-  * NMU.
-  * debian/rules: Save and restore generated files.  Closes: #450459.
-  * debian/rules: Install docs/*.txt, not docs/Makefile*.
+  * gtkgl.m4: Fix quoting problem.
+  * Update maintainer fields according to debian-maintainer-field spec.
 
- -- Bart Martens <bartm@debian.org>  Sun, 09 Mar 2008 07:14:56 +0100
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 16 Feb 2007 19:24:51 +0100
 
 gtkglarea (1.2.3-2.2) unstable; urgency=low
 
only in patch2:
unchanged:
--- gtkglarea-1.2.3.orig/gtkgl.m4
+++ gtkglarea-1.2.3/gtkgl.m4
@@ -1,7 +1,7 @@
 dnl
 dnl AM_PATH_GTKGL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
 dnl
-AC_DEFUN(AM_PATH_GTKGL,
+AC_DEFUN([AM_PATH_GTKGL],
   [
     AC_REQUIRE([AM_PATH_GTK])