[SCM] QCA2 library packaging branch, master, updated. debian/2.1.0.3-3-6-gef1aa62

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8349c8b05c65c99f69106cff8c65b2ee129ae7ca
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 9 11:25:41 2015 +0200

    Minor aesthetic changes
---
 debian/changelog                    |  1 -
 debian/control                      | 20 +++++++++++---------
 debian/libqca-qt5-2-dev.install     |  2 +-
 debian/libqca-qt5-2-plugins.install |  4 ++--
 debian/libqca2-dev.install          |  2 +-
 debian/qca-qt5-2-utils.install      |  2 +-
 6 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4735439..8737dc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 qca2 (2.1.0.3-4~) UNRELEASED; urgency=medium
 
-  * 
   * Update symbols files from buildds logs (2.1.0.3-3).
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 09 Jul 2015 11:22:10 +0200
diff --git a/debian/control b/debian/control
index 89a8d46..30cf41f 100644
--- a/debian/control
+++ b/debian/control
@@ -36,11 +36,13 @@ Description: libraries for the Qt Cryptographic Architecture
 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)
+Depends: ${misc:Depends}, ${shlibs: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).
@@ -59,7 +61,7 @@ Description: libraries for the Qt Cryptographic Architecture
 Package: libqca-qt5-2-plugins
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: QCA plugins for libqca2
  This plugin provides cryptographic as well as helper plugins for Qt
  Cryptographic Architecture (QCA).
@@ -166,7 +168,7 @@ Package: libqca2-plugin-cyrus-sasl
 Section: oldlibs
 Priority: extra
 Architecture: any
-Depends: ${misc:Depends}, libqca2-plugins
+Depends: libqca2-plugins, ${misc:Depends}
 Description: transitional package for libqca2-plugins
  This is a transitional dummy package. It can safely be removed.
 
@@ -175,7 +177,7 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libqca2-plugins
+Depends: libqca2-plugins, ${misc:Depends}
 Description: transitional package for libqca2-plugins
  This is a transitional dummy package. It can safely be removed.
 
@@ -184,6 +186,6 @@ Section: oldlibs
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libqca2-plugins
+Depends: libqca2-plugins, ${misc:Depends}
 Description: transitional package for libqca2-plugins
  This is a transitional dummy package. It can safely be removed.
diff --git a/debian/libqca-qt5-2-dev.install b/debian/libqca-qt5-2-dev.install
index ea7cdd3..f1bafa4 100644
--- a/debian/libqca-qt5-2-dev.install
+++ b/debian/libqca-qt5-2-dev.install
@@ -1,5 +1,5 @@
 usr/include/Qca-qt5
+usr/lib/*/cmake/Qca-qt5
 usr/lib/*/libqca-qt5.so
 usr/lib/*/pkgconfig/qca2-qt5.pc
-usr/lib/*/cmake/Qca-qt5
 usr/lib/*/qt5/mkspecs/features/crypto.prf
diff --git a/debian/libqca-qt5-2-plugins.install b/debian/libqca-qt5-2-plugins.install
index 15abb09..bbc791a 100644
--- a/debian/libqca-qt5-2-plugins.install
+++ b/debian/libqca-qt5-2-plugins.install
@@ -1,5 +1,5 @@
-usr/lib/*/qca-qt5/crypto/libqca-ossl.so
+usr/lib/*/qca-qt5/crypto/libqca-cyrus-sasl.so
 usr/lib/*/qca-qt5/crypto/libqca-gnupg.so
 usr/lib/*/qca-qt5/crypto/libqca-logger.so
-usr/lib/*/qca-qt5/crypto/libqca-cyrus-sasl.so
+usr/lib/*/qca-qt5/crypto/libqca-ossl.so
 usr/lib/*/qca-qt5/crypto/libqca-softstore.so
diff --git a/debian/libqca2-dev.install b/debian/libqca2-dev.install
index e65a8fa..5ae59d0 100644
--- a/debian/libqca2-dev.install
+++ b/debian/libqca2-dev.install
@@ -1,5 +1,5 @@
 usr/include/QtCrypto
+usr/lib/*/cmake/Qca
 usr/lib/*/libqca.so
 usr/lib/*/pkgconfig/qca2.pc
-usr/lib/*/cmake/Qca
 usr/share/qt4/mkspecs/features/crypto.prf
diff --git a/debian/qca-qt5-2-utils.install b/debian/qca-qt5-2-utils.install
index 3c26e7b..a34e5d5 100644
--- a/debian/qca-qt5-2-utils.install
+++ b/debian/qca-qt5-2-utils.install
@@ -1,3 +1,3 @@
-usr/bin/qcatool-qt5
 usr/bin/mozcerts-qt5
+usr/bin/qcatool-qt5
 usr/share/man/man1/qcatool-qt5.1

-- 
QCA2 library packaging