[SCM] qca-qt5 packaging branch, kubuntu_unstable, updated. 96bb50598ce10fe022c1891aea4b8e6183f1a665

Thu Mar 26 22:33:59 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/qca-qt5.git;a=commitdiff;h=96bb505

The following commit has been merged in the kubuntu_unstable branch:
commit 96bb50598ce10fe022c1891aea4b8e6183f1a665
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 23:33:56 2015 +0100

    drop upstream_scm metadata, now in ci-tooling
---
 debian/control                      | 27 +++++++++++++++++----------
 debian/copyright                    | 19 +++++++++----------
 debian/libqca-qt5-2-dev.install     |  4 ++--
 debian/libqca-qt5-2-plugins.install |  4 ++--
 debian/meta/upstream_scm.json       |  4 ----
 debian/qca-qt5-2-utils.install      |  2 +-
 6 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/debian/control b/debian/control
index c3d9d42..1f559de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,18 @@ Source: qca-qt5
 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.15.15), cmake, pkg-config,
- 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,
+               libsasl2-dev,
+               libssl-dev,
+               pkg-config,
+               pkg-kde-tools (>> 0.15.15),
+               qtbase5-dev
 Build-Conflicts: qca-dev
 Standards-Version: 3.9.6
 Homepage: http://delta.affinix.com/qca/
@@ -16,7 +23,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-req/qca2-qt5.git
 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).
@@ -25,7 +32,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-
@@ -35,7 +42,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,
@@ -48,7 +55,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-
@@ -61,7 +68,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}
 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,
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 a4b3165..7eca194 100644
--- a/debian/libqca-qt5-2-dev.install
+++ b/debian/libqca-qt5-2-dev.install
@@ -1,5 +1,5 @@
 usr/include/Qca-qt5/QtCrypto
+usr/lib/*/cmake/Qca-qt5
 usr/lib/*/libqca-qt5.so
-usr/lib/*/pkgconfig/qca2-qt5.pc
 usr/lib/*/mkspecs/features/crypto.prf
-usr/lib/*/cmake/Qca-qt5
+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/meta/upstream_scm.json b/debian/meta/upstream_scm.json
deleted file mode 100644
index 7fea219..0000000
--- a/debian/meta/upstream_scm.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "url" : "git://anongit.kde.org/qca.git",
-    "branch" : "qt5"
-}
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

-- 
qca-qt5 packaging

