From 1be3c7210e28733852eed5810140b4a7e8f1c8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sat, 11 Jul 2015 17:19:15 +0200 Subject: Revert "Enable jingle support in kopete on Debian and Ubuntu" Jingle support in Kopete is still not stable - therefore is not suitable for final R14.0.1. This reverts commit 3779538b284634db24e092ea64746c80fc78a21d. --- ubuntu/maverick/tdenetwork/debian/control | 2 +- ubuntu/maverick/tdenetwork/debian/rules | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'ubuntu') diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control index b409d00fa..0ca17e922 100644 --- a/ubuntu/maverick/tdenetwork/debian/control +++ b/ubuntu/maverick/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/ubuntu/maverick/tdenetwork/debian/rules b/ubuntu/maverick/tdenetwork/debian/rules index b10997d3b..ec0abfcde 100755 --- a/ubuntu/maverick/tdenetwork/debian/rules +++ b/ubuntu/maverick/tdenetwork/debian/rules @@ -36,8 +36,6 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DCMAKE_VERBOSE_MAKEFILE="ON" \ -DCMAKE_SKIP_RPATH="OFF" \ -DBUILD_ALL="ON" \ - -DWITH_JINGLE="ON" \ - -DWITH_SPEEX="ON" \ -DWITH_ARTS="ON" \ -DWITH_SLP="ON" \ -DBUILD_KOPETE_PROTOCOL_ALL="ON" \ -- cgit v1.2.1