diff -Nru ucommon-6.0.7/debian/changelog ucommon-6.0.7/debian/changelog
--- ucommon-6.0.7/debian/changelog	2013-08-02 09:33:30.000000000 +0000
+++ ucommon-6.0.7/debian/changelog	2013-08-17 20:21:01.000000000 +0000
@@ -1,3 +1,12 @@
+ucommon (6.0.7-1+rpi1) jessie-staging; urgency=low
+
+  * Return to using gnutls-dev to make sflphone buildable again 
+    (closes: 716855)
+  * Set CXXFLAGS to -fpermissive to prevent errors when 
+    converting from integer to enum
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 17 Aug 2013 18:43:09 +0000
+
 ucommon (6.0.7-1) unstable; urgency=low
 
   [ upstream ]
diff -Nru ucommon-6.0.7/debian/control ucommon-6.0.7/debian/control
--- ucommon-6.0.7/debian/control	2013-08-02 09:27:21.000000000 +0000
+++ ucommon-6.0.7/debian/control	2013-08-17 19:26:11.000000000 +0000
@@ -10,7 +10,7 @@
  debhelper (>= 9~),
  dh-buildinfo,
  pkg-config,
- libgnutls28-dev,
+ libgnutls-dev,
  d-shlibs (>= 0.45~),
  graphviz
 Build-Depends-Indep: doxygen-latex
diff -Nru ucommon-6.0.7/debian/rules ucommon-6.0.7/debian/rules
--- ucommon-6.0.7/debian/rules	2013-08-02 09:26:53.000000000 +0000
+++ ucommon-6.0.7/debian/rules	2013-08-17 19:57:40.000000000 +0000
@@ -16,6 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+export CXXFLAGS=-fpermissive
+
 # This needs to run (and thus be declared) before CDBS includes
 debian/control:: debian/control.in
 DEB_PHONY_RULES += debian/control.in