[SCM] QCA2 library packaging branch, kubuntu_unstable, updated. debian/2.0.3-6-19-g0a99748

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca2.git;a=commitdiff;h=0a99748

The following commit has been merged in the kubuntu_unstable branch:
commit 0a997486fd43067115cba76f598479d30a0ee98a
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 28 15:08:42 2014 +0100

    remove conflict on own package
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e907629..c52e3a3 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jan Niehusmann <jan at debian.org>, Felix Geyer <fgeyer at debian.org>,
 Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.12), cmake, pkg-config,
  libqt4-dev (>= 4.4.0), ca-certificates, libsasl2-dev, libssl-dev, doxygen,
  qtbase5-dev
-Build-Conflicts: libqca-qt5-2-dev, qca-dev
+Build-Conflicts: qca-dev
 Standards-Version: 3.9.6
 Homepage: http://delta.affinix.com/qca/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/qca2.git

-- 
QCA2 library packaging