diff -u claws-mail-extra-plugins-3.5.0/debian/control claws-mail-extra-plugins-3.5.0/debian/control
--- claws-mail-extra-plugins-3.5.0/debian/control
+++ claws-mail-extra-plugins-3.5.0/debian/control
@@ -1,10 +1,11 @@
 Source: claws-mail-extra-plugins
 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>
 Build-Depends: debhelper (>= 5), quilt, libglib2.0-dev, libgtk2.0-dev,
  libclaws-mail-dev (>= 3.5.0),
- flex, bison,
+ flex, bison, libcurl4-gnutls-dev,
  autotools-dev, pkg-config, libetpan-dev (>= 0.52),
  libperl-dev (>= 5.8.0), perl (>= 5.8.0),
  docbook-to-man, libxml2-dev, libkrb5-dev,
diff -u claws-mail-extra-plugins-3.5.0/debian/changelog claws-mail-extra-plugins-3.5.0/debian/changelog
--- claws-mail-extra-plugins-3.5.0/debian/changelog
+++ claws-mail-extra-plugins-3.5.0/debian/changelog
@@ -1,3 +1,11 @@
+claws-mail-extra-plugins (3.5.0-3ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #260958):
+    - explicitely depend on libcurl4-gnutls-dev instead of relying on it
+      being dragged in by libetpan-dev.
+
+ -- Nathan Handler <nhandler@ubuntu.com>  Sun, 24 Aug 2008 16:22:53 -0500
+
 claws-mail-extra-plugins (3.5.0-3) unstable; urgency=high
 
   * patches/fix_newmail_crash.patch, patches/series
@@ -5,6 +13,14 @@
 
  -- Ricardo Mones <mones@debian.org>  Mon, 18 Aug 2008 14:23:35 +0200
 
+claws-mail-extra-plugins (3.5.0-2ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - explicitely depend on libcurl4-gnutls-dev instead of relying on it
+      being dragged in by libetpan-dev.
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Thu, 24 Jul 2008 12:19:52 +0200
+
 claws-mail-extra-plugins (3.5.0-2) unstable; urgency=low
 
   * debian/control, debian/rules, debian/README.Packaging, debian/configure,
@@ -17,6 +33,17 @@
 
  -- Ricardo Mones <mones@debian.org>  Mon, 14 Jul 2008 19:23:48 +0200
 
+claws-mail-extra-plugins (3.5.0-1ubuntu1) intrepid; urgency=low
+
+  * Fix FTBFS:
+    Instead of depending on the virtual libcurl-dev, explicitely depend on
+    libcurl4-gnutls-dev.
+    This library is anyhow a needed dep of libetpan-dev.
+  * Modify Maintainer value to match the DebianMaintainerField
+    specification.
+
+ -- Cesare Tirabassi <norsetto@ubuntu.com>  Sun, 20 Jul 2008 16:31:01 +0200
+
 claws-mail-extra-plugins (3.5.0-1) unstable; urgency=low
 
   * New upstream release
@@ -369,0 +397 @@
+