diff -Nru qpid-cpp-0.16/debian/changelog qpid-cpp-0.16/debian/changelog
--- qpid-cpp-0.16/debian/changelog	2012-08-10 19:04:14.000000000 +0000
+++ qpid-cpp-0.16/debian/changelog	2014-02-17 01:38:22.000000000 +0000
@@ -1,3 +1,14 @@
+qpid-cpp (0.16-7+rpi1) jessie-staging; urgency=medium
+
+  [Peter Michael Green]
+  * Disable testsuite (Closes: #708841)
+  * Remove build-dependency on libxmltooling5 (Closes: #716737)
+  * Build with boost 1.49 explicitly
+  [Emmanuel Bourg]
+  * Fixed a compilation error with GCC 4.8.0 (Closes: #713449)
+  
+ -- Peter Michael Green <plugwash@raspbian.org>  Sun, 16 Feb 2014 22:58:41 +0000
+
 qpid-cpp (0.16-7) unstable; urgency=low
 
   * Fixes security issue CVE-2012-3467 which may allow bypassing the
diff -Nru qpid-cpp-0.16/debian/control qpid-cpp-0.16/debian/control
--- qpid-cpp-0.16/debian/control	2012-06-05 06:23:55.000000000 +0000
+++ qpid-cpp-0.16/debian/control	2014-02-17 00:52:31.000000000 +0000
@@ -2,7 +2,7 @@
 Section: misc
 Priority: extra
 Maintainer: Cajus Pollmeier <cajus@debian.org>
-Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost-all-dev (>= 1.35), ruby1.8 (>= 1.8.4), ruby1.8-dev, uuid-dev, libopenais-dev (>= 0.80.3), libsasl2-dev, libxqilla-dev (>= 2.0.0), libxmltooling5, libibverbs-dev, librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libcorosync-dev, libxerces-c-dev (>= 2.7.0), libcman-dev, swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath
+Build-Depends: debhelper (>= 8.9.0~), autotools-dev, autoconf (>= 2.61), automake (>= 1.9.6), libtool (>= 1.5.22), libboost1.49-all-dev (>= 1.35), ruby1.8 (>= 1.8.4), ruby1.8-dev, uuid-dev, libopenais-dev (>= 0.80.3), libsasl2-dev, libxqilla-dev (>= 2.0.0), libibverbs-dev, librdmacm-dev, libnspr4-dev, libnss3-dev, libssl-dev, sasl2-bin, libcorosync-dev, libxerces-c-dev (>= 2.7.0), libcman-dev, swig (>= 1.3.35), python (>= 2.6.6-3~), doxygen, help2man, valgrind [any-i386 any-amd64 arm], zip, procps, libnss3-tools, pkg-config, python-qpid, libperl-dev, dh-autoreconf, dpkg-dev (>= 1.16.1~), chrpath
 X-Python-Version: 2.7
 Standards-Version: 3.9.3
 Homepage: http://qpid.apache.org
diff -Nru qpid-cpp-0.16/debian/patches/fix-template.patch qpid-cpp-0.16/debian/patches/fix-template.patch
--- qpid-cpp-0.16/debian/patches/fix-template.patch	1970-01-01 00:00:00.000000000 +0000
+++ qpid-cpp-0.16/debian/patches/fix-template.patch	2014-02-16 23:03:55.000000000 +0000
@@ -0,0 +1,70 @@
+Description: Fix a template declaraction error with GCC 4.8.0.
+ This patch can be dropped after upgrading to qpid 0.22
+Author: Darryl L. Pierce <dpierce@redhat.com>
+Bug: https://issues.apache.org/jira/browse/QPID-4579
+--- a/src/qpid/framing/Handler.h
++++ b/src/qpid/framing/Handler.h
+@@ -49,29 +49,12 @@
+      * Functor<F>(f) will copy f.
+      * Functor<F&>(f) will only take a reference to x.
+      */
+-    template <class F> class Functor : public Handler<T> {
+-      public:
+-        Functor(F f, Handler<T>* next=0) : Handler<T>(next), functor(f) {}
+-        void handle(T t) { functor(t); }
+-      private:
+-        F functor;
+-    };
++    template <class F> class Functor;
+ 
+     /** Adapt a member function of X as a Handler.
+      * Only holds a reference to its target, not a copy.
+      */
+-    template <class X, void (X::*F)(T)>
+-    class MemFunRef : public Handler<T> {
+-      public:
+-        MemFunRef(X& x, Handler<T>* next=0) : Handler(next), target(&x) {}
+-        void handle(T t) { (target->*F)(t); }
+-
+-        /** Allow calling with -> syntax */
+-        MemFunRef* operator->() { return this; }
+-
+-      private:
+-        X* target;
+-    };
++    template <class X, void (X::*F)(T)> class MemFunRef;
+ 
+     /** Interface for a handler that implements a
+      * pair of in/out handle operations.
+@@ -94,8 +77,31 @@
+     };
+ };
+ 
++template <class T>
++template <class F>
++class Handler<T>::Functor : public Handler<T> {
++  public:
++    Functor(F f, Handler<T>* next=0) : Handler<T>(next), functor(f) {}
++    void handle(T t) { functor(t); }
++  private:
++    F functor;
++};
++
++template <class T>
++template <class X, void (X::*F)(T)>
++class Handler<T>::MemFunRef : public Handler<T> {
++  public:
++    MemFunRef(X& x, Handler<T>* next=0) : Handler(next), target(&x) {}
++    void handle(T t) { (target->*F)(t); }
+ 
++    /** Allow calling with -> syntax */
++    MemFunRef* operator->() { return this; }
++
++  private:
++    X* target;
++};
+ 
+ }}
+ #endif  /*!QPID_FRAMING_HANDLER_H*/
+ //
++
diff -Nru qpid-cpp-0.16/debian/patches/series qpid-cpp-0.16/debian/patches/series
--- qpid-cpp-0.16/debian/patches/series	2012-08-10 19:04:14.000000000 +0000
+++ qpid-cpp-0.16/debian/patches/series	2014-02-16 23:03:55.000000000 +0000
@@ -9,3 +9,4 @@
 module-location.patch
 fix-armel-compilation.patch
 sasldb-location.patch
+fix-template.patch
diff -Nru qpid-cpp-0.16/debian/rules qpid-cpp-0.16/debian/rules
--- qpid-cpp-0.16/debian/rules	2012-05-24 08:45:56.000000000 +0000
+++ qpid-cpp-0.16/debian/rules	2014-02-17 01:38:05.000000000 +0000
@@ -26,3 +26,8 @@
 
 %:
 	dh  $@ --with python2 --with autoreconf
+
+override_dh_auto_test:
+	echo testsuit disabled
+
+