diff -u libvmime-0.9.1/debian/control libvmime-0.9.1/debian/control
--- libvmime-0.9.1/debian/control
+++ libvmime-0.9.1/debian/control
@@ -1,7 +1,7 @@
 Source: libvmime
 Priority: optional
 Maintainer: Mattias Nordstrom <mnordstr@debian.org>
-Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgnutls-dev (>= 1.2.0), libgsasl7-dev
+Build-Depends: debhelper (>= 5.0.0), autotools-dev, libgnutls28-dev (>= 1.2.0), libgsasl7-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://www.vmime.org/
@@ -9,7 +9,7 @@
 Package: libvmime-dev
 Section: libdevel
 Architecture: any
-Depends: libvmime0 (= ${binary:Version}), libgnutls-dev (>= 1.2.0), libgsasl7-dev, ${misc:Depends}
+Depends: libvmime0 (= ${binary:Version}), libgnutls28-dev (>= 1.2.0), libgsasl7-dev, ${misc:Depends}
 Description: C++ mail library (development files)
  VMime is a powerful C++ class library for parsing, generating, or editing
  Internet RFC-[2]822 and MIME messages. VMime is designed to provide a fast
diff -u libvmime-0.9.1/debian/changelog libvmime-0.9.1/debian/changelog
--- libvmime-0.9.1/debian/changelog
+++ libvmime-0.9.1/debian/changelog
@@ -1,3 +1,19 @@
+libvmime (0.9.1-1+rpi2) jessie-staging; urgency=medium
+
+  * Also change binary depends to libgntuls-dev
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Nov 2014 15:34:16 +0000
+
+libvmime (0.9.1-1+rpi1) jessie-staging; urgency=medium
+
+  * Change build-depends to libgnutls28-dev
+  * Remove include of libgnutls/extra.h which no longer seems to
+    exist.
+  * Remove various "ERRROR" macros that seem broken, I think this
+    is just code to make prettier error messages.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Nov 2014 04:14:21 +0000
+
 libvmime (0.9.1-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- libvmime-0.9.1.orig/src/net/tls/TLSSession.cpp
+++ libvmime-0.9.1/src/net/tls/TLSSession.cpp
@@ -22,7 +22,7 @@
 //
 
 #include <gnutls/gnutls.h>
-#include <gnutls/extra.h>
+//#include <gnutls/extra.h>
 
 #include "vmime/config.hpp"
 
@@ -298,10 +298,10 @@
 	ERROR(GNUTLS_E_FILE_ERROR)
 	ERROR(GNUTLS_E_TOO_MANY_EMPTY_PACKETS)
 	ERROR(GNUTLS_E_UNKNOWN_PK_ALGORITHM)
-	ERROR(GNUTLS_E_INIT_LIBEXTRA)
-	ERROR(GNUTLS_E_LIBRARY_VERSION_MISMATCH)
+	//ERROR(GNUTLS_E_INIT_LIBEXTRA)
+	//ERROR(GNUTLS_E_LIBRARY_VERSION_MISMATCH)
 	ERROR(GNUTLS_E_NO_TEMPORARY_RSA_PARAMS)
-	ERROR(GNUTLS_E_LZO_INIT_FAILED)
+	//ERROR(GNUTLS_E_LZO_INIT_FAILED)
 	ERROR(GNUTLS_E_NO_COMPRESSION_ALGORITHMS)
 	ERROR(GNUTLS_E_NO_CIPHER_SUITES)
 	ERROR(GNUTLS_E_OPENPGP_GETKEY_FAILED)