[Pkg-voip-commits] [twinkle] 64/73: Disable ZRTP support to allow migration to testing

[Peter Colberg]

This is an automated email from the git hooks/post-receive script.

pc-guest pushed a commit to branch master
in repository twinkle.

commit a6fc751a7fe937995ba3c2cc6aaf565d28885126
Author: Peter Colberg <peter at colberg.org>
Date:   Tue Dec 29 21:50:19 2015 -0500

    Disable ZRTP support to allow migration to testing
    
    libzrtpcpp links against OpenSSL in violation of the GPL (see: #797554).
---
 debian/control | 1 -
 debian/rules   | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 3ffa0b7..6e413d1 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends: bison,
                libspeex-dev,
                libspeexdsp-dev,
                libxml2-dev,
-               libzrtpcpp-dev (>= 1.4.0),
                linux-libc-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                qtdeclarative5-dev,
                qtquick1-5-dev,
diff --git a/debian/rules b/debian/rules
index b1ff052..02e8fcb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-CONFIGURE_FLAGS = -DWITH_QT5=ON -DWITH_ALSA=ON -DWITH_ZRTP=ON -DWITH_SPEEX=ON -DWITH_GSM=ON
+# Disable ZRTP support for now (see: #797554)
+CONFIGURE_FLAGS = -DWITH_QT5=ON -DWITH_ALSA=ON -DWITH_ZRTP=OFF -DWITH_SPEEX=ON -DWITH_GSM=ON
 
 %:
 	dh $@ --parallel

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/twinkle.git