[SCM] QCA2 library packaging branch, kubuntu_vivid_archive, updated. debian/2.0.3-6-20-ga976eaa

Harald Sitter apachelogger-guest at moszumanska.debian.org
Mon Dec 1 13:03:47 UTC 2014 

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit a976eaa613c67a1490f6168c2a6dc99c2b9cc966
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 1 14:03:32 2014 +0100

    wrap and sort
---
 debian/control                      | 42 +++++++++++++++++++++----------------
 debian/copyright                    | 19 ++++++++---------
 debian/libqca-qt5-2-dev.install     |  4 ++--
 debian/libqca-qt5-2-plugins.install |  4 ++--
 debian/libqca2-dev.install          |  4 ++--
 debian/libqca2-plugins.install      |  4 ++--
 debian/qca-qt5-2-utils.install      |  2 +-
 7 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/debian/control b/debian/control
index c52e3a3..6f2b8af 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,19 @@ Source: qca2
 Priority: optional
 Section: libs
 Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Jan Niehusmann <jan at debian.org>, Felix Geyer <fgeyer at debian.org>,
- Modestas Vainius <modax 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
+Uploaders: Jan Niehusmann <jan at debian.org>,
+           Felix Geyer <fgeyer at debian.org>,
+           Modestas Vainius <modax at debian.org>
+Build-Depends: ca-certificates,
+               cmake,
+               debhelper (>= 9),
+               doxygen,
+               libqt4-dev (>= 4.4.0),
+               libsasl2-dev,
+               libssl-dev,
+               pkg-config,
+               pkg-kde-tools (>= 0.12),
+               qtbase5-dev
 Build-Conflicts: qca-dev
 Standards-Version: 3.9.6
 Homepage: http://delta.affinix.com/qca/
@@ -16,7 +24,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/qca2.git
 Package: libqca2-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).
@@ -25,7 +33,7 @@ Package: libqca2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ca-certificates, libqca2-plugins
 Description: libraries for the Qt Cryptographic Architecture
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
@@ -35,7 +43,7 @@ Description: libraries for the Qt Cryptographic Architecture
 Package: qca2-utils
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqca2 (= ${binary:Version})
+Depends: libqca2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Breaks: libqca2 (<< 2.0.3-3~)
 Replaces: libqca2 (<< 2.0.3-3~)
 Description: command line tool for the Qt Cryptographic Architecture
@@ -50,7 +58,7 @@ Package: libqca2-dbg
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libqca2 (= ${binary:Version})
+Depends: libqca2 (= ${binary:Version}), ${misc:Depends}
 Recommends: libqt4-dbg
 Priority: extra
 Description: debug symbols for the Qt Cryptographic Architecture
@@ -64,8 +72,8 @@ Description: debug symbols for the Qt Cryptographic Architecture
 Package: libqca2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libqca2 (= ${binary:Version}), libqt4-dev (>= 4.4.0~)
-Conflicts: qca-dev, libqca-qt5-2-dev
+Depends: libqca2 (= ${binary:Version}), libqt4-dev (>= 4.4.0~), ${misc:Depends}
+Conflicts: libqca-qt5-2-dev, qca-dev
 Description: development files 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,
@@ -77,7 +85,7 @@ Description: development files 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).
@@ -86,7 +94,7 @@ Package: libqca-qt5-2
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ca-certificates, libqca-qt5-2-plugins
 Description: libraries for the Qt Cryptographic Architecture
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
@@ -96,7 +104,7 @@ Description: libraries for the Qt Cryptographic Architecture
 Package: qca-qt5-2-utils
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqca-qt5-2 (= ${binary:Version})
+Depends: libqca-qt5-2 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: command line tool 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,
@@ -109,7 +117,7 @@ Package: libqca-qt5-2-dbg
 Section: debug
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, libqca-qt5-2 (= ${binary:Version})
+Depends: libqca-qt5-2 (= ${binary:Version}), ${misc:Depends}
 Priority: extra
 Description: debug symbols for the Qt Cryptographic Architecture
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
@@ -122,7 +130,7 @@ Description: debug symbols for the Qt Cryptographic Architecture
 Package: libqca-qt5-2-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, libqca-qt5-2 (= ${binary:Version}), qtbase5-dev
+Depends: libqca-qt5-2 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
 Conflicts: libqca2-dev
 Description: development files for the Qt Cryptographic Architecture
  The Qt Cryptographic Architecture (QCA) provides a straightforward and cross-
@@ -132,8 +140,6 @@ Description: development files for the Qt Cryptographic Architecture
  This package contains development files for building software that uses the
  Qt Cryptographic Architecture.
 
-# Transitional packages can be removed no sooner than May 2016.
-# Next Kubuntu LTS is 16.04.
 Package: libqca2-plugin-cyrus-sasl
 Depends: libqca2-plugins, ${misc:Depends}
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 6b1ef1b..105b20b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,12 +15,12 @@ The library is licensed unter the LGPL:
 > modify it under the terms of the GNU Lesser General Public
 > License as published by the Free Software Foundation; either
 > version 2.1 of the License, or (at your option) any later version.
-> 
+>
 > This library is distributed in the hope that it will be useful,
 > but WITHOUT ANY WARRANTY; without even the implied warranty of
 > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 > Lesser General Public License for more details.
-> 
+>
 > You should have received a copy of the GNU Lesser General Public
 > License along with this library; if not, write to the Free Software
 > Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -32,21 +32,21 @@ The library uses and contains parts of the botan library, which is
 Copyright (C) 1999-2007 The Botan Project and licensed as follows:
 
 > Copyright (C) 1999-2007 The Botan Project. All rights reserved.
-> 
+>
 > Redistribution and use in source and binary forms, for any use, with or without
 > modification, is permitted provided that the following conditions are met:
-> 
+>
 > 1. Redistributions of source code must retain the above copyright notice, this
 > list of conditions, and the following disclaimer.
-> 
+>
 > 2. Redistributions in binary form must reproduce the above copyright notice,
 > this list of conditions, and the following disclaimer in the documentation
 > and/or other materials provided with the distribution.
-> 
+>
 > THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) "AS IS" AND ANY EXPRESS OR IMPLIED
 > WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 > MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ARE DISCLAIMED.
-> 
+>
 > IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE FOR ANY DIRECT,
 > INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
 > BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
@@ -79,7 +79,7 @@ Several unit tests and examples are Copyright (C) Brad Hards
 > (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 > THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-qca_default.cpp contains some code which is Copyright (C) 1999, 2000, 2002 
+qca_default.cpp contains some code which is Copyright (C) 1999, 2000, 2002
 Aladdin Enterprises and licensed as follows:
 
 >  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
@@ -103,7 +103,7 @@ Aladdin Enterprises and licensed as follows:
 >  L. Peter Deutsch
 >  ghost at aladdin.com
 
-examples/sasltest/sasltest.cpp and ./examples/saslservtest/saslservtest.cpp are 
+examples/sasltest/sasltest.cpp and ./examples/saslservtest/saslservtest.cpp are
 Copyright (C) 2003-2006 Justin Karneges <justin at affinix.com>, Michail Pishchagin and
 are licensed as follows:
 
@@ -143,4 +143,3 @@ Metarete s.r.l. <info at metarete.it> and is licensed as follows:
 >  AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 >  AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 >  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/debian/libqca-qt5-2-dev.install b/debian/libqca-qt5-2-dev.install
index a2e37a1..0d53973 100644
--- a/debian/libqca-qt5-2-dev.install
+++ b/debian/libqca-qt5-2-dev.install
@@ -1,5 +1,5 @@
 usr/include/QtCrypto
+usr/lib/*/cmake/Qca/
 usr/lib/*/libqca-qt5.so
-usr/lib/*/pkgconfig/qca2-qt5.pc
 usr/lib/*/mkspecs/features/crypto.prf
-usr/lib/*/cmake/Qca/
+usr/lib/*/pkgconfig/qca2-qt5.pc
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 faf50f9..d7fc812 100644
--- a/debian/libqca2-dev.install
+++ b/debian/libqca2-dev.install
@@ -1,5 +1,5 @@
 usr/include/QtCrypto
-usr/lib/*/libqca.so
 usr/lib/*/cmake/
-usr/share/qt4/mkspecs/mkspecs/features/crypto.prf
+usr/lib/*/libqca.so
 usr/lib/*/pkgconfig/qca2.pc
+usr/share/qt4/mkspecs/mkspecs/features/crypto.prf
diff --git a/debian/libqca2-plugins.install b/debian/libqca2-plugins.install
index c7c3386..3cdd8ed 100644
--- a/debian/libqca2-plugins.install
+++ b/debian/libqca2-plugins.install
@@ -1,6 +1,6 @@
-usr/lib/*/qca/crypto/libqca-gnupg.so
 usr/lib/*/qca/crypto/libqca-cyrus-sasl.so
 usr/lib/*/qca/crypto/libqca-gnupg.so
+usr/lib/*/qca/crypto/libqca-gnupg.so
 usr/lib/*/qca/crypto/libqca-logger.so
-usr/lib/*/qca/crypto/libqca-softstore.so
 usr/lib/*/qca/crypto/libqca-ossl.so
+usr/lib/*/qca/crypto/libqca-softstore.so
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

More information about the pkg-kde-commits mailing list