diff -u openhpi-2.14.1/debian/changelog openhpi-2.14.1/debian/changelog
--- openhpi-2.14.1/debian/changelog
+++ openhpi-2.14.1/debian/changelog
@@ -1,3 +1,10 @@
+openhpi (2.14.1-1.2ubuntu1) quantal; urgency=low
+
+  * src/lock.c: glib no longer permits include of individual
+    headers, switch to including "glib.h".  (Closes: #665590).
+
+ -- Andy Whitcroft <apw@ubuntu.com>  Wed, 06 Jun 2012 19:18:14 +0100
+
 openhpi (2.14.1-1.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -u openhpi-2.14.1/debian/control openhpi-2.14.1/debian/control
--- openhpi-2.14.1/debian/control
+++ openhpi-2.14.1/debian/control
@@ -1,7 +1,8 @@
 Source: openhpi
 Section: admin
 Priority: optional
-Maintainer: Bryan Sutula <Bryan.Sutula@hp.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Bryan Sutula <Bryan.Sutula@hp.com>
 Uploaders: Khalid Aziz <khalid@debian.org>
 Homepage: http://openhpi.org
 Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf (>= 2.57), automake1.9, uuid-dev, libglib2.0-dev (>= 2.2), pkg-config, libltdl-dev, openipmi (>= 2.0.7), libopenipmi-dev (>=2.0.7), libsnmp-dev, libssl-dev, libsysfs-dev (>= 0.3), libncurses5-dev, libxml2-dev
only in patch2:
unchanged:
--- openhpi-2.14.1.orig/src/lock.c
+++ openhpi-2.14.1/src/lock.c
@@ -20,7 +20,7 @@
 
 /* multi-threading support, use Posix mutex for data access */
 /* initialize mutex used for data locking */
-#include <glib/gthread.h>
+#include <glib.h>
 
 GStaticRecMutex oh_main_lock = G_STATIC_REC_MUTEX_INIT;