[SCM] QCA2 library packaging branch, experimental, updated. debian/2.0.3-6-27-g500c24e

[Felix Geyer]

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

The following commit has been merged in the experimental branch:
commit 500c24e3b8075bc0f1ac392b0c1b61182b3b15d5
Author: Felix Geyer <fgeyer at debian.org>
Date:   Mon May 25 13:17:19 2015 +0200

    Install all qca Qt4 plugins into the new package libqca2-plugins.
    
    * Install all qca Qt4 plugins into the new package libqca2-plugins.
      - Add transitional packages for the existing libqca2-plugin-*
---
 debian/changelog               |  2 ++
 debian/control                 | 37 ++++++++++++++++++++++++++++++++++++-
 debian/libqca2-plugins.install |  5 +++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a892447..dde62bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qca2 (2.1.0.3-2) UNRELEASED; urgency=medium
 
   * Run the test suite on both builds.
+  * Install all qca Qt4 plugins into the new package libqca2-plugins.
+    - Add transitional packages for the existing libqca2-plugin-*
 
  -- Felix Geyer <fgeyer at debian.org>  Mon, 25 May 2015 12:49:12 +0200
 
diff --git a/debian/control b/debian/control
index e0e0160..bfb5f92 100644
--- a/debian/control
+++ b/debian/control
@@ -29,12 +29,24 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ca-certificates
-Suggests: libqca2-plugin-cyrus-sasl, libqca2-plugin-gnupg, libqca2-plugin-ossl
+Suggests: libqca2-plugins
 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,
  X.509 certificates, SASL, OpenPGP, S/MIME CMS, and smart cards.
 
+Package: libqca2-plugins
+Architecture: any
+Multi-Arch: same
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: libqca2-plugin-cyrus-sasl (<< 2.1.0), libqca2-plugin-gnupg (<< 2.1.0),
+ libqca2-plugin-ossl (<< 2.1.0)
+Replaces: libqca2-plugin-cyrus-sasl (<< 2.1.0), libqca2-plugin-gnupg (<< 2.1.0),
+ libqca2-plugin-ossl (<< 2.1.0)
+Description: QCA plugins for libqca2
+ This plugin provides cryptographic as well as helper plugins for Qt
+ Cryptographic Architecture (QCA).
+
 Package: libqca-qt5-2
 Architecture: any
 Multi-Arch: same
@@ -152,3 +164,26 @@ Description: API documentation for the Qt Cryptographic Architecture
  .
  This package contains documentation for developers working with the
  Qt Cryptographic Architecture.
+
+Package: libqca2-plugin-cyrus-sasl
+Section: oldlibs
+Architecture: any
+Depends: ${misc:Depends}, libqca2-plugins
+Description: transitional package for libqca2-plugins
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libqca2-plugin-gnupg
+Section: oldlibs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libqca2-plugins
+Description: transitional package for libqca2-plugins
+ This is a transitional dummy package. It can safely be removed.
+
+Package: libqca2-plugin-ossl
+Section: oldlibs
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, libqca2-plugins
+Description: transitional package for libqca2-plugins
+ This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libqca2-plugins.install b/debian/libqca2-plugins.install
new file mode 100644
index 0000000..bb1a333
--- /dev/null
+++ b/debian/libqca2-plugins.install
@@ -0,0 +1,5 @@
+usr/lib/*/qca/crypto/libqca-cyrus-sasl.so
+usr/lib/*/qca/crypto/libqca-gnupg.so
+usr/lib/*/qca/crypto/libqca-logger.so
+usr/lib/*/qca/crypto/libqca-ossl.so
+usr/lib/*/qca/crypto/libqca-softstore.so

-- 
QCA2 library packaging