diff -Nru mail-notification-5.4.dfsg.1/debian/changelog mail-notification-5.4.dfsg.1/debian/changelog
--- mail-notification-5.4.dfsg.1/debian/changelog	2012-03-28 07:23:49.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/changelog	2012-03-28 14:26:24.000000000 +0200
@@ -1,3 +1,11 @@
+mail-notification (5.4.dfsg.1-5ubuntu1) precise; urgency=low
+
+  * Merge with Debian; remaining changes:
+    - debian/patches/fix-linking-ld-as-needed.patch:
+      Fix linking with "ld --as-needed" by spliting gobject cflags and libs.
+
+ -- Whoopie <whoopie79@gmx.net>  Wed, 28 Mar 2012 14:25:32 +0200
+
 mail-notification (5.4.dfsg.1-5) unstable; urgency=low
 
   * Explicitly build-depend on libdbus-glib-1-dev for dbus-binding-tool.
@@ -74,6 +82,17 @@
 
  -- Stephen Kitt <steve@sk2.org>  Mon, 28 Feb 2011 00:14:07 +0100
 
+mail-notification (5.4.dfsg.1-2.2ubuntu1) natty; urgency=low
+
+  * debian/patches/fix-linking-ld-as-needed.patch:
+    Fix linking with "ld --as-needed" by spliting gobject cflags and libs.
+  * debian/patches/fix-linking-ld-no-add-needed.patch:
+    Add also "X11" to the required packages.
+  * debian/patches/fix-camel-include.patch:
+    Only <camel/camel.h> can be included directly.
+
+ -- Michael Bienia <geser@ubuntu.com>  Fri, 28 Jan 2011 18:10:24 +0100
+
 mail-notification (5.4.dfsg.1-2.2) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru mail-notification-5.4.dfsg.1/debian/control mail-notification-5.4.dfsg.1/debian/control
--- mail-notification-5.4.dfsg.1/debian/control	2012-03-28 07:23:31.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/control	2012-03-28 14:25:13.000000000 +0200
@@ -1,7 +1,8 @@
 Source: mail-notification
 Section: gnome
 Priority: optional
-Maintainer: LIU Qi <liuqi82@gmail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+Original-Maintainer: LIU Qi <liuqi82@gmail.com>
 Uploaders: Stephen Kitt <steve@sk2.org>
 Build-Depends: debhelper (>= 7),
                evolution-data-server-dev (>= 3.0.0),
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/fix-linking-ld-as-needed.patch mail-notification-5.4.dfsg.1/debian/patches/fix-linking-ld-as-needed.patch
--- mail-notification-5.4.dfsg.1/debian/patches/fix-linking-ld-as-needed.patch	1970-01-01 01:00:00.000000000 +0100
+++ mail-notification-5.4.dfsg.1/debian/patches/fix-linking-ld-as-needed.patch	2012-03-28 14:25:13.000000000 +0200
@@ -0,0 +1,35 @@
+Index: mail-notification-5.4.dfsg.1/jb
+===================================================================
+--- mail-notification-5.4.dfsg.1.orig/jb	2011-01-28 17:39:27.000000000 +0100
++++ mail-notification-5.4.dfsg.1/jb	2011-01-28 17:40:29.000000000 +0100
+@@ -89,10 +89,11 @@
+ 
+ 		mkdir -p build/jbsrc || exit 1
+ 
+-		if ! gobject_cflags_libs=`pkg-config --cflags --libs 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
++		if ! gobject_cflags=`pkg-config --cflags 'gobject-2.0 >= 2.8.0' 2>/dev/null`; then
+ 			echo "ERROR: the GLib library was not found" >&2
+ 			exit 1
+ 		fi
++		gobject_libs=`pkg-config --libs 'gobject-2.0 >= 2.8.0'`
+ 
+ 		sed -e 's|^#jb_include ["<]\(.*\)[">]|#include "\1.h"|' \
+ 			jbsrc/jb.c > build/jbsrc/jb.c || exit 1
+@@ -103,14 +104,15 @@
+ 			-DG_LOG_DOMAIN="\"jb\"" \
+ 			-DJB_SOURCES="\"$jb_c_sources $jb_h_sources\"" \
+ 			-DJB_PACKAGE_SOURCES="\"$jb_c_package_sources $jb_h_package_sources\"" \
+-			$gobject_cflags_libs \
++			$gobject_cflags \
+ 			$jb_cflags \
+ 			$jb_cppflags \
+ 			$jb_ldflags \
+ 			build/jbsrc/jb.c \
+ 			$jb_c_sources \
+ 			$jb_c_package_sources \
+-			$jb_libs; then
++			$jb_libs \
++			$gobject_libs; then
+ 			echo "ERROR: cannot build jb" >&2
+ 			exit 1
+ 		fi
diff -Nru mail-notification-5.4.dfsg.1/debian/patches/series mail-notification-5.4.dfsg.1/debian/patches/series
--- mail-notification-5.4.dfsg.1/debian/patches/series	2012-03-27 00:10:29.000000000 +0200
+++ mail-notification-5.4.dfsg.1/debian/patches/series	2012-03-28 14:25:13.000000000 +0200
@@ -16,3 +16,4 @@
 polish-error-fix.patch
 notification-span-fix.patch
 default-values.patch
+fix-linking-ld-as-needed.patch