[SCM] QCA2 library packaging branch, master, updated. debian/2.0.2-1-17-gb6b3613

[Felix Geyer]

The following commit has been merged in the master branch:
commit 47faf27bec009a06c837bc12d549436ac0cc9176
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Sun May 29 18:54:02 2011 +0200

    Bump Standards-Version to 3.9.2.
    
    Drop ancient Conflicts.
---
 debian/changelog |    2 ++
 debian/control   |    3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2765428..02ce699 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ qca2 (2.0.3-1) UNRELEASED; urgency=low
   * Switch to debhelper compat level 7.
   * Simplify install files.
   * Don't install the TODO file.
+  * Bump Standards-Version to 3.9.2.
+    - Drop ancient Conflicts.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 17:30:46 +0200
 
diff --git a/debian/control b/debian/control
index e35b3e4..70f836e 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Jan Niehusmann <jan at debian.org>, Matthew Rosewarne <mrosewarne at inoutb
 Build-Depends: debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12),
  libqt4-dev (>= 4.4.0), ca-certificates
 Build-Conflicts: libqca2-dev, qca-dev
-Standards-Version: 3.8.1
+Standards-Version: 3.9.2
 Homepage: http://delta.affinix.com/qca/
 
 Package: libqca2
@@ -15,7 +15,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: ca-certificates
 Suggests: libqca2-plugin-cyrus-sasl, libqca2-plugin-gnupg, libqca2-plugin-ossl, libqca2-plugin-pkcs11
-Conflicts: libqca2-plugin-gnupg (<< 0.1~20070904-1), libqca2-plugin-ossl (<< 0.1~20070904-1)
 Description: libraries for the Qt Cryptographic Architecture
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
  platform API for a range of cryptographic features, including SSL/TLS,

-- 
QCA2 library packaging