diff -Nru liboauth-0.9.4/debian/changelog liboauth-0.9.4/debian/changelog
--- liboauth-0.9.4/debian/changelog	2011-08-01 15:52:05.000000000 +0000
+++ liboauth-0.9.4/debian/changelog	2011-08-10 11:53:10.000000000 +0000
@@ -1,8 +1,14 @@
-liboauth (0.9.4-1ubuntu1) oneiric; urgency=low
+liboauth (0.9.4-2) unstable; urgency=low
 
-  * debian/control: add Depends on libcurl4-gnutls-dev to liboauth-dev.
+  * Make package multiarch-aware.
+    - Bump compat to 9.
+  * debian/control:
+    - Add libcurl4-gnutls-dev to liboauth-dev dependencies, thanks Mathieu!
+    - Bump Standards-Version to 3.9.2 (no changes needed).
+  * debian/patches/02_xmalloc_dont_exit.patch: Return NULL in case malloc
+    fails.
 
- -- Mathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>  Mon, 01 Aug 2011 11:51:25 -0400
+ -- Bilal Akhtar <bilalakhtar@ubuntu.com>  Wed, 10 Aug 2011 14:51:38 +0300
 
 liboauth (0.9.4-1) unstable; urgency=low
 
diff -Nru liboauth-0.9.4/debian/compat liboauth-0.9.4/debian/compat
--- liboauth-0.9.4/debian/compat	2011-08-01 15:07:04.000000000 +0000
+++ liboauth-0.9.4/debian/compat	2011-08-10 11:49:38.000000000 +0000
@@ -1 +1 @@
-7
+9
diff -Nru liboauth-0.9.4/debian/control liboauth-0.9.4/debian/control
--- liboauth-0.9.4/debian/control	2011-08-01 15:46:11.000000000 +0000
+++ liboauth-0.9.4/debian/control	2011-08-10 11:51:19.000000000 +0000
@@ -1,13 +1,13 @@
 Source: liboauth
 Priority: optional
 Maintainer: Bilal Akhtar <bilalakhtar@ubuntu.com>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3),
                libcurl4-gnutls-dev,
                libnss3-dev,
                libtool,
                locales-all | language-pack-en,
                pkg-config
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Section: libs
 Homepage: http://liboauth.sourceforge.net/
 Vcs-Git: git://git.debian.org/collab-maint/liboauth.git
@@ -27,7 +27,9 @@
 
 Package: liboauth0
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Description: C library for implementing OAuth 1.0
  liboauth is a collection of C functions implementing the
  OAuth Core 1.0 standard API.
diff -Nru liboauth-0.9.4/debian/liboauth0.install liboauth-0.9.4/debian/liboauth0.install
--- liboauth-0.9.4/debian/liboauth0.install	2011-08-01 15:07:04.000000000 +0000
+++ liboauth-0.9.4/debian/liboauth0.install	2011-08-10 11:49:38.000000000 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*/lib*.so.*
diff -Nru liboauth-0.9.4/debian/liboauth-dev.install liboauth-0.9.4/debian/liboauth-dev.install
--- liboauth-0.9.4/debian/liboauth-dev.install	2011-08-01 15:07:04.000000000 +0000
+++ liboauth-0.9.4/debian/liboauth-dev.install	2011-08-10 11:49:38.000000000 +0000
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
+usr/lib/*/pkgconfig/*
 usr/share/man/*
diff -Nru liboauth-0.9.4/debian/patches/02_xmalloc_dont_exit.patch liboauth-0.9.4/debian/patches/02_xmalloc_dont_exit.patch
--- liboauth-0.9.4/debian/patches/02_xmalloc_dont_exit.patch	2011-08-01 15:07:04.000000000 +0000
+++ liboauth-0.9.4/debian/patches/02_xmalloc_dont_exit.patch	2011-08-10 11:49:38.000000000 +0000
@@ -5,11 +5,12 @@
 Author: Bilal Akhtar <bilalakhtar@ubuntu.com>
 --- a/src/xmalloc.c
 +++ b/src/xmalloc.c
-@@ -30,7 +30,6 @@
+@@ -30,7 +30,7 @@
  static void *xmalloc_fatal(size_t size) {
    if (size==0) return NULL;
    fprintf(stderr, "Out of memory.");
 -  exit(1);
++  return NULL;
  }
  
  void *xmalloc (size_t size) {