diff -u gridengine-6.2u5/debian/rules gridengine-6.2u5/debian/rules
--- gridengine-6.2u5/debian/rules
+++ gridengine-6.2u5/debian/rules
@@ -19,6 +19,8 @@
 	CFLAGS += -O2
 endif
 
+export SGE_INPUT_CFLAGS=-Wno-error
+
 PRECMD=sh $(CURDIR)/debian/linux32-wrapper
 
 build: build-stamp
diff -u gridengine-6.2u5/debian/control gridengine-6.2u5/debian/control
--- gridengine-6.2u5/debian/control
+++ gridengine-6.2u5/debian/control
@@ -1,7 +1,8 @@
 Source: gridengine
 Section: utils
 Priority: optional
-Maintainer: Debian Grid Engine Maintainers <pkg-gridengine-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Grid Engine Maintainers <pkg-gridengine-devel@lists.alioth.debian.org>
 Uploaders: Michael Banck <mbanck@debian.org>, Mark Hymers <mhy@debian.org>
 Build-Depends: debhelper (>= 4.0.0), csh, groff, libdb-dev, libssl-dev,
  libncurses5-dev, libpam0g-dev, libxt-dev, lesstif2-dev, libxpm-dev, libxmu-dev,
diff -u gridengine-6.2u5/debian/changelog gridengine-6.2u5/debian/changelog
--- gridengine-6.2u5/debian/changelog
+++ gridengine-6.2u5/debian/changelog
@@ -1,3 +1,11 @@
+gridengine (6.2u5-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable (LP: #515441). Remaining changes:
+    - build with -Wno-error to silence compiler warnings during build
+      (Forwarded as DBTS: #589952)
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Thu, 22 Jul 2010 20:04:44 +0530
+
 gridengine (6.2u5-1) unstable; urgency=low
 
   * New upstream release.  Closes: #570411.
@@ -8,6 +16,13 @@
 
  -- Mark Hymers <mhy@debian.org>  Sun, 06 Jun 2010 17:35:47 +0100
 
+gridengine (6.2u4-2ubuntu1) lucid; urgency=low
+
+  * Build process produces a lot of warnings, so add -Wno-error to 
+    compiler flags.
+
+ -- Ilya Barygin <barygin@gmail.com>  Sat, 27 Feb 2010 10:22:47 +0300
+
 gridengine (6.2u4-2) unstable; urgency=low
 
   * Build java library bindings.  Closes: #544295.
@@ -123,0 +139 @@
+