[SCM] qca-qt5 packaging branch, kubuntu_unstable_utopic, updated. cc9688d23076f65d59df19c9659a1fe63e2b0dfb

Harald Sitter apachelogger-guest at moszumanska.debian.org
Fri Feb 13 10:26:53 UTC 2015


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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit cc9688d23076f65d59df19c9659a1fe63e2b0dfb
Merge: e1975c499b6dd3ee29dd1552ac91caba9bc127b0 1749c4d2a4a73a514dda6f1afc85cb0be5b9bbcc
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 13 11:26:48 2015 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic

 debian/changelog            |  14 +++++
 debian/control              |   2 +-
 debian/libqca-qt5-2.symbols | 141 ++++++++++++++++++++++++++------------------
 3 files changed, 99 insertions(+), 58 deletions(-)

diff --cc debian/libqca-qt5-2.symbols
index 86aaac7,1b083dd..5dd8e13
--- a/debian/libqca-qt5-2.symbols
+++ b/debian/libqca-qt5-2.symbols
@@@ -12,16 -12,17 +12,17 @@@ libqca-qt5.so.2 libqca-qt5-2 #MINVER
   (optional=templinst)_Z16qVariantSetValueIN3QCA6PGPKeyEEvR8QVariantRKT_ at Base 2.0.3
   (optional=templinst)_Z16qVariantSetValueIN3QCA9KeyBundleEEvR8QVariantRKT_ at Base 2.0.3
   _Z16qca_secure_alloci at Base 2.0.2
-  (optional=templinst)_Z17qRegisterMetaTypeIN17QtMetaTypePrivate23QSequentialIterableImplEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
+  (optional=templinst|arch=!ppc64el)_Z17qRegisterMetaTypeIN17QtMetaTypePrivate23QSequentialIterableImplEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
   (optional=templinst)_Z17qRegisterMetaTypeIN3QCA11SecureArrayEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
-  (optional=templinst)_Z17qRegisterMetaTypeIN3QCA13KeyStoreEntryEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
+  (optional=templinst|arch=!armhf !ppc64el)_Z17qRegisterMetaTypeIN3QCA13KeyStoreEntryEEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS4_Xaasr12QMetaTypeId2IS4_E7DefinedntsrS9_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
   _Z18qca_secure_reallocPvi at Base 2.0.2
-  (optional=templinst)_Z27qRegisterNormalizedMetaTypeI5QListIN3QCA13KeyStoreEntryEEEiRK10QByteArrayPT_N9QtPrivate21MetaTypeDefinedHelperIS7_Xaasr12QMetaTypeId2IS7_E7DefinedntsrSC_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
+  (optional=templinst|arch=!ppc64el)_Z27qRegisterNormalizedMetaTypeI5QListIN3QCA13KeyStoreEntryEEEiRK10QByteArrayPT_N9QtPrivate21MetaTypeDefinedHelperIS7_Xaasr12QMetaTypeId2IS7_E7DefinedntsrSC_9IsBuiltInEE11DefinedTypeE at Base 2.1.0
   _ZGVZN9QtPrivate19ValueTypeIsMetaTypeI5QListI8QVariantELb1EE17registerConverterEiE1f at Base 2.1.0
   _ZGVZN9QtPrivate19ValueTypeIsMetaTypeI5QListIN3QCA13KeyStoreEntryEELb1EE17registerConverterEiE1f at Base 2.1.0
 - _ZN10QByteArrayD1Ev at Base 2.1.0+git20141127.0049+15.04
 - _ZN10QByteArrayD2Ev at Base 2.1.0+git20141127.0049+15.04
 + _ZN10QByteArrayD1Ev at Base 2.1.0+git20141127.0110
 + _ZN10QByteArrayD2Ev at Base 2.1.0+git20141127.0110
   (optional=templinst)_ZN11QMetaTypeIdI5QListIN3QCA13KeyStoreEntryEEE14qt_metatype_idEv at Base 2.1.0
+  (optional=templinst|arch=ppc64el)_ZN11QMetaTypeIdIN17QtMetaTypePrivate23QSequentialIterableImplEE14qt_metatype_idEv at Base 2.1.0.3
   (optional=templinst)_ZN11QMetaTypeIdIN3QCA11CertificateEE14qt_metatype_idEv at Base 2.0.3
   (optional=templinst)_ZN11QMetaTypeIdIN3QCA3CRLEE14qt_metatype_idEv at Base 2.0.3
   (optional=templinst)_ZN11QMetaTypeIdIN3QCA6PGPKeyEE14qt_metatype_idEv at Base 2.1.0
@@@ -547,10 -555,11 +554,11 @@@
   _ZN3QCA13ConsolePrompt16staticMetaObjectE at Base 2.0.2
   _ZN3QCA13ConsolePrompt7Private11qt_metacallEN11QMetaObject4CallEiPPv at Base 2.0.2
   _ZN3QCA13ConsolePrompt7Private11qt_metacastEPKc at Base 2.0.2
+  (arch=armhf ppc64el)_ZN3QCA13ConsolePrompt7Private13con_readyReadEv at Base 2.1.0.3
   _ZN3QCA13ConsolePrompt7Private16staticMetaObjectE at Base 2.0.2
 - _ZN3QCA13ConsolePrompt7PrivateD0Ev at Base 2.1.0+git20141127.0049+15.04
 - _ZN3QCA13ConsolePrompt7PrivateD1Ev at Base 2.1.0+git20141127.0049+15.04
 - _ZN3QCA13ConsolePrompt7PrivateD2Ev at Base 2.1.0+git20141127.0049+15.04
 + _ZN3QCA13ConsolePrompt7PrivateD0Ev at Base 2.1.0+git20141127.0110
 + _ZN3QCA13ConsolePrompt7PrivateD1Ev at Base 2.1.0+git20141127.0110
 + _ZN3QCA13ConsolePrompt7PrivateD2Ev at Base 2.1.0+git20141127.0110
   _ZN3QCA13ConsolePrompt7getCharEv at Base 2.0.2
   _ZN3QCA13ConsolePrompt8finishedEv at Base 2.0.2
   _ZN3QCA13ConsolePrompt9getHiddenERK7QString at Base 2.0.2
@@@ -2704,16 -2735,16 +2731,16 @@@
   (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan5MutexEESt10_Select1stIS6_ESt4lessISsESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E at Base 2.0.3
   (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan9AllocatorEESt10_Select1stIS6_ESt4lessISsESaIS6_EE17_M_insert_unique_ESt23_Rb_tree_const_iteratorIS6_ERKS6_ at Base 2.0.3
   (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan9AllocatorEESt10_Select1stIS6_ESt4lessISsESaIS6_EE24_M_get_insert_unique_posERS1_ at Base 2.0.3
-  (optional=templinst|arch=amd64)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan9AllocatorEESt10_Select1stIS6_ESt4lessISsESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_ at Base 2.0.3
+  (optional=templinst|arch=amd64 arm64)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan9AllocatorEESt10_Select1stIS6_ESt4lessISsESaIS6_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS6_ERS1_ at Base 2.0.3
   (optional=templinst)_ZNSt8_Rb_treeISsSt4pairIKSsPN3QCA5Botan9AllocatorEESt10_Select1stIS6_ESt4lessISsESaIS6_EE8_M_eraseEPSt13_Rb_tree_nodeIS6_E at Base 2.0.3
 - (optional=templinst|arch=armhf i386 powerpc)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEEiS5_NS0_5__ops15_Iter_less_iterEEvT_T0_SE_T1_T2_ at Base 2.1.0+git20141127.0049+15.04
 - (optional=templinst|arch=amd64 arm64 ppc64el)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_less_iterEEvT_T0_SE_T1_T2_ at Base 2.0.3
 + (optional=templinst|arch=i386)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEEiS5_NS0_5__ops15_Iter_less_iterEEvT_T0_SE_T1_T2_ at Base 2.1.0+git20141127.0110
 + (optional=templinst|arch=amd64)_ZSt13__adjust_heapIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEElS5_NS0_5__ops15_Iter_less_iterEEvT_T0_SE_T1_T2_ at Base 2.0.3
   (optional=templinst)_ZSt16__insertion_sortIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_less_iterEEvT_SD_T0_ at Base 2.0.3
-  (optional=templinst)_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_less_iterEEvT_SD_SD_SD_T0_ at Base 2.0.3
-  (optional=templinst)_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEENS0_5__ops14_Val_less_iterEEvT_T0_ at Base 2.0.3
+  (optional=templinst|arch=amd64 arm64 i386)_ZSt22__move_median_to_firstIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEENS0_5__ops15_Iter_less_iterEEvT_SD_SD_SD_T0_ at Base 2.0.3
+  (optional=templinst|arch=!arm64 !ppc64el)_ZSt25__unguarded_linear_insertIN9__gnu_cxx17__normal_iteratorIPN3QCA5Botan17Pooling_Allocator12Memory_BlockESt6vectorIS5_SaIS5_EEEENS0_5__ops14_Val_less_iterEEvT_T0_ at Base 2.0.3
   (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_EPKS3_RKS6_ at Base 2.0.2
   (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_PKS3_ at Base 2.0.3
-  (optional=templinst)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_S8_ at Base 2.0.2
+  (optional=templinst|arch=!ppc64el)_ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_S8_ at Base 2.0.2
   _ZTIN3QCA10CRLContextE at Base 2.0.2
   _ZTIN3QCA10CSRContextE at Base 2.0.2
   _ZTIN3QCA10DSAContextE at Base 2.0.2

-- 
qca-qt5 packaging



More information about the pkg-kde-commits mailing list