Bug#716855: libucomon-dev: Dependency on libgnutls28-dev makes sflphone unbuildable

[Mark Purcell]

On Wed, 30 Oct 2013 15:29:04 Dmitrijs Ledkovs wrote:
> The patch to fix FTBFS against GnuTLS 2.6 is trivial, and is attached
> with this email.
> 
> Please consider reverting and making libucommon build and link against
> GnuTLS 2.6.

Jonas,

Given the above and your LowNMU, if you are happy I intend to NMU this patch 
to ucommon.

It will require binNMU for ccrtp & linphone, which I can handle, and sipwitch 
which is one of yours.

Then at some stage in the future I would like to coordinate the switch to 
gnutls28 across all the voip family.


Mark

ucommon-gnutls.patch
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-10-30 12:34:56.000000000 +0000
@@ -10,7 +11,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/patches/fix-gnutls2.6.patch 
ucommon-6.0.7/debian/patches/fix-gnutls2.6.patch
--- ucommon-6.0.7/debian/patches/fix-gnutls2.6.patch    1970-01-01 
00:00:00.000000000 +0000
+++ ucommon-6.0.7/debian/patches/fix-gnutls2.6.patch    2013-10-30 
12:35:21.000000000 +0000
@@ -0,0 +1,14 @@
+Description: Fix building ucommon against gnutls2.6.
+Author: Dmitrijs Ledkovs <xnox at ubuntu.com>
+
+--- ucommon-6.0.7.orig/gnutls/local.h
++++ ucommon-6.0.7/gnutls/local.h
+@@ -37,7 +37,7 @@ class __LOCAL context : public secure
+ public:
+     ~context();
+ 
+-    unsigned int connect;
++    gnutls_connection_end_t connect;
+     gnutls_credentials_type_t xtype;
+     gnutls_certificate_credentials_t xcred;
+     gnutls_dh_params_t dh;
diff -Nru ucommon-6.0.7/debian/patches/series 
ucommon-6.0.7/debian/patches/series
--- ucommon-6.0.7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000
+++ ucommon-6.0.7/debian/patches/series 2013-10-30 12:35:10.000000000 +0000
@@ -0,0 +1 @@
+fix-gnutls2.6.patch
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.alioth.debian.org/pipermail/pkg-gnutls-maint/attachments/20140121/a3018ad3/attachment.sig>