--- openbox-xdgmenu-0.3.orig/Makefile
+++ openbox-xdgmenu-0.3/Makefile
@@ -1,6 +1,6 @@
 CC = gcc
-CFLAGS = -Os -g -O2 -DGMENU_I_KNOW_THIS_IS_UNSTABLE -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/local/include/gnome-menus
-LDFLAGS =  -L/usr/X11R6/lib -lgnome-menu -lglib-2.0 -s
+CFLAGS := -Os -g -O2 -DGMENU_I_KNOW_THIS_IS_UNSTABLE $(shell pkg-config --cflags glib-2.0) -I/usr/local/include/gnome-menus
+LDFLAGS := -L/usr/X11R6/lib -lgnome-menu $(shell pkg-config --libs glib-2.0) -s
 VERSION = 0.24
 BINDIR = /usr/X11R6/bin
 OSNAME = linux
--- openbox-xdgmenu-0.3.orig/debian/changelog
+++ openbox-xdgmenu-0.3/debian/changelog
@@ -0,0 +1,31 @@
+openbox-xdgmenu (0.3-0ubuntu2) oneiric; urgency=low
+
+  * Use pkg-config to find glib-2.0 headers, fixing build failure with
+    multiarch (LP: #755992).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sat, 10 Sep 2011 01:09:32 +0100
+
+openbox-xdgmenu (0.3-0ubuntu1) oneiric; urgency=low
+
+  * Upstream changes (openbox-xdgmenu.c):
+     - Properly escape amperstand ("&") characters (LP: #349960).
+       Thanks to Kévin Joly.
+  * debian/control:
+     - Add Homepage field.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Sat, 03 Sep 2011 22:07:25 +0200
+
+openbox-xdgmenu (0.2-0ubuntu1) intrepid; urgency=low
+
+  * Upstream changes (openbox-xdgmenu.c, openbox-xdgmenu.1):
+     - Add the option --plain.
+     - Delete field expansions (like %f, %U, etc.) from the command.
+     - Exit gracefully if the indicated Xdg file doesn't exist.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Fri, 08 Aug 2008 23:53:18 +0200
+
+openbox-xdgmenu (0.1-0ubuntu1) intrepid; urgency=low
+
+  * Initial release.
+
+ -- Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>  Sun, 03 Aug 2008 01:25:16 +0200
--- openbox-xdgmenu-0.3.orig/debian/rules
+++ openbox-xdgmenu-0.3/debian/rules
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+build:
+	dh_testdir
+	$(MAKE)
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	[ ! -f $(MAKE) ] || $(MAKE) clean
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/openbox-xdgmenu.
+	dh_install openbox-xdgmenu usr/bin
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installman openbox-xdgmenu.1
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
--- openbox-xdgmenu-0.3.orig/debian/compat
+++ openbox-xdgmenu-0.3/debian/compat
@@ -0,0 +1 @@
+5
--- openbox-xdgmenu-0.3.orig/debian/control
+++ openbox-xdgmenu-0.3/debian/control
@@ -0,0 +1,17 @@
+Source: openbox-xdgmenu
+Section: x11
+Priority: optional
+Maintainer: Siegfried-Angel Gevatter Pujals <rainct@ubuntu.com>
+Build-Depends: debhelper (>= 5),
+ libglib2.0-dev,
+ libgnome-menu-dev
+Standards-Version: 3.8.0
+Homepage: https://launchpad.net/openbox-xdgmenu
+
+Package: openbox-xdgmenu
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: openbox
+Description: Xdg menu for OpenBox
+ openbox-xdgmenu converts an Xdg menu structure (i.e., the menu system that
+ Ubuntu uses) to XML text which can be used to populate Openbox's menu.
--- openbox-xdgmenu-0.3.orig/debian/copyright
+++ openbox-xdgmenu-0.3/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Siegfried-A. Gevatter <rainct@ubuntu.com> on
+Sun, 03 Aug 2008 01:25:16 +0200.
+
+It was downloaded from https://launchpad.net/openbox-xdgmenu/+download
+
+Copyright: 
+
+    Copyright © Nathan Fisher <nfisher@grafpup.com>
+    Copyright © 2008 Siegfried-A. Gevatter <rainct@ubuntu.com>
+    Copyright © 2011 Kévin Joly <joly.kevin25@gmail.com>
+
+License:
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    On Debian systems, the complete text of the GNU General Public
+    License can be found in /usr/share/common-licenses/GPL.
+
+The Debian packaging is (C) 2008-2011 Siegfried-A. Gevatter
+<siegfried@gevatter.com> and is released under the same license
+as openbox-xdgmenu.