[SCM] ktp-auth-handler packaging branch, master, updated. debian/0.6.3-1-9-g7f870f9

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-auth-handler.git;a=commitdiff;h=7f870f9

The following commit has been merged in the master branch:
commit 7f870f9ba033f23f27edfcce09669d5ef7c8e189
Author: Diane Trout <diane at ghic.org>
Date:   Wed Oct 30 09:11:15 2013 -0700

    remove handle_no_ossl.patch as it was applied upstream
    
    Also update package version
---
 debian/changelog                    |    6 ++----
 debian/patches/handle_no_ossl.patch |   30 ------------------------------
 debian/patches/series               |    1 -
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 88190cd..d121352 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,10 @@
-ktp-auth-handler (0.6.80-1) UNRELEASED; urgency=low
+ktp-auth-handler (0.7.0-1) UNRELEASED; urgency=low
 
   * Add Suggests: libqca2-plugin-ossl
-  * Add handle_no_ossl.patch to prevent a crash when libqca2-plugin-ossl
-    isn't available.
   * Import upstream version 0.6.80
   * Bump Buildp-Depends ktpcommoninternalsprivate-dev to 0.6.80
 
- -- Diane Trout <diane at ghic.org>  Sat, 28 Sep 2013 21:13:41 -0700
+ -- Diane Trout <diane at ghic.org>  Tue, 29 Oct 2013 21:01:57 -0700
 
 ktp-auth-handler (0.6.3-1) unstable; urgency=low
 
diff --git a/debian/patches/handle_no_ossl.patch b/debian/patches/handle_no_ossl.patch
deleted file mode 100644
index 7fcc534..0000000
--- a/debian/patches/handle_no_ossl.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Author: Diane Trout <diane at ghic.org>
-Description:  Check for QCA certificate availability at run time.
-
-This fixes a crash if packagers don't include qca-ossl a runtime
-plugin for QCA needed to load SSL Certs. 
-
-This was accepted upstream as:
-http://quickgit.kde.org/?p=ktp-auth-handler.git&a=commit&h=c5222770fff5044dff2bc1e9d9ed1c52b3dd68ac
-
---- a/tls-cert-verifier-op.cpp
-+++ b/tls-cert-verifier-op.cpp
-@@ -93,9 +93,17 @@
-     // Initialize QCA module
-     QCA::Initializer initializer;
- 
-+    if(!QCA::isSupported("cert")) {
-+      setFinishedWithError(
-+          QLatin1String("Cert.NoPlugin"),
-+          i18n("The SSL/TLS support plugin is not available. "
-+               "Certificate validation cannot be done."));
-+      return;
-+    }
-+
-     QCA::CertificateChain chain;
-     Q_FOREACH (const QByteArray &data, m_certData) {
--       chain << QCA::Certificate::fromDER(data);
-+        chain << QCA::Certificate::fromDER(data);
-     }
- 
-     if (verifyCertChain(chain)) {
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f475514..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-handle_no_ossl.patch

-- 
ktp-auth-handler packaging