diff -pruN 2.5.0-2/debian/changelog 2.5.0-2ubuntu2/debian/changelog
--- 2.5.0-2/debian/changelog	2008-11-01 19:32:45.000000000 +0000
+++ 2.5.0-2ubuntu2/debian/changelog	2008-11-01 18:33:10.000000000 +0000
@@ -1,3 +1,18 @@
+sylpheed (2.5.0-2ubuntu2) intrepid; urgency=low
+
+  * Rebuild against newer pilot link and libbluetooth (LP: #276343)
+  * debian/control:
+    - Build depend on newer pilot link
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Tue, 30 Sep 2008 15:41:40 -0500
+
+sylpheed (2.5.0-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #259185):
+    - Fix FTBFS with gtk >= 2.13.1
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Mon, 18 Aug 2008 15:29:11 -0500
+
 sylpheed (2.5.0-2) unstable; urgency=low
 
   * debian/control
@@ -5,6 +20,12 @@ sylpheed (2.5.0-2) unstable; urgency=low
 
  -- Ricardo Mones <mones@debian.org>  Thu, 24 Jul 2008 08:50:28 +0200
 
+sylpheed (2.5.0-1ubuntu1) intrepid; urgency=low
+
+  * Fix FTBFS with gtk >= 2.13.1
+
+ -- Laurent Bigonville <bigon@ubuntu.com>  Sat, 05 Jul 2008 13:54:26 +0200
+
 sylpheed (2.5.0-1) unstable; urgency=low
 
   * New upstream release
@@ -1408,4 +1429,3 @@ sylpheed (0.4.1-1) unstable; urgency=low
 
  -- Takuo KITAME <kitame@northeye.org>  Sat, 30 Sep 2000 16:31:27 +0900
 
-
diff -pruN 2.5.0-2/debian/control 2.5.0-2ubuntu2/debian/control
--- 2.5.0-2/debian/control	2008-11-01 19:32:45.000000000 +0000
+++ 2.5.0-2ubuntu2/debian/control	2008-11-01 18:33:10.000000000 +0000
@@ -1,11 +1,12 @@
 Source: sylpheed
 Section: mail
 Priority: optional
-Maintainer: Ricardo Mones <mones@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Ricardo Mones <mones@debian.org>
 Uploaders: Paul Mangan <claws@thewildbeast.co.uk>, Gustavo Noronha Silva <kov@debian.org>
 Build-Depends: debhelper (>= 5), libcompfaceg1-dev, libglib2.0-dev, 
  libgtk2.0-dev, libpng12-dev, libgpgme11-dev (>= 1.0.0), libssl-dev, 
- libpisock-dev, libldap2-dev, flex | flex-old, bison, gettext, 
+ libpisock-dev (>= 0.12.3-4ubuntu3), libldap2-dev, flex | flex-old, bison, gettext, 
  libreadline5-dev, cdbs, libgtkspell-dev (>= 2.0), libonig-dev,
  libaspell-dev
 Standards-Version: 3.8.0
diff -pruN 2.5.0-2/debian/patches/07gtk-2.13.1.patch 2.5.0-2ubuntu2/debian/patches/07gtk-2.13.1.patch
--- 2.5.0-2/debian/patches/07gtk-2.13.1.patch	1970-01-01 01:00:00.000000000 +0100
+++ 2.5.0-2ubuntu2/debian/patches/07gtk-2.13.1.patch	2008-11-01 18:33:10.000000000 +0000
@@ -0,0 +1,55 @@
+diff -Nur sylpheed-2.5.0rc2-orig/src/addr_compl.c sylpheed-2.5.0rc2/src/addr_compl.c
+--- sylpheed-2.5.0rc2-orig/src/addr_compl.c	2008-03-13 08:15:07.000000000 +0100
++++ sylpheed-2.5.0rc2/src/addr_compl.c	2008-06-10 14:54:24.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkentry.h>
+ #include <gtk/gtkeditable.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkscrolledwindow.h>
+ 
+diff -Nur sylpheed-2.5.0rc2-orig/src/editgroup.c sylpheed-2.5.0rc2/src/editgroup.c
+--- sylpheed-2.5.0rc2-orig/src/editgroup.c	2007-03-28 03:30:15.000000000 +0200
++++ sylpheed-2.5.0rc2/src/editgroup.c	2008-06-10 14:57:20.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <glib/gi18n.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <gtk/gtkwindow.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkstatusbar.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_display_items.c sylpheed-2.5.0rc2/src/prefs_display_items.c
+--- sylpheed-2.5.0rc2-orig/src/prefs_display_items.c	2007-09-20 04:17:58.000000000 +0200
++++ sylpheed-2.5.0rc2/src/prefs_display_items.c	2008-06-10 14:37:44.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c sylpheed-2.5.0rc2/src/prefs_summary_column.c
+--- sylpheed-2.5.0rc2-orig/src/prefs_summary_column.c	2007-09-12 08:56:55.000000000 +0200
++++ sylpheed-2.5.0rc2/src/prefs_summary_column.c	2008-06-10 14:36:12.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <gtk/gtkwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtkbutton.h>
+ #include <gtk/gtkstock.h>
+diff -Nur sylpheed-2.5.0rc2-orig/src/select-keys.c sylpheed-2.5.0rc2/src/select-keys.c
+--- sylpheed-2.5.0rc2-orig/src/select-keys.c	2008-05-16 11:19:55.000000000 +0200
++++ sylpheed-2.5.0rc2/src/select-keys.c	2008-06-10 14:58:13.000000000 +0200
+@@ -33,6 +33,7 @@
+ #include <gtk/gtkscrolledwindow.h>
+ #include <gtk/gtkvbox.h>
+ #include <gtk/gtkhbox.h>
++#include <gtk/gtk.h>
+ #include <gtk/gtkclist.h>
+ #include <gtk/gtklabel.h>
+ #include <gtk/gtkentry.h>