diff -Nru gpgmepp-15.12.3/autotests/installtest.cpp gpgmepp-16.04.3/autotests/installtest.cpp --- gpgmepp-15.12.3/autotests/installtest.cpp 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/autotests/installtest.cpp 2016-06-15 04:35:44.000000000 +0000 @@ -36,6 +36,7 @@ #include #include #include +#include "../src/util.h" using namespace GpgME; @@ -67,9 +68,9 @@ { printf("GPGME_PROTOCOL_CMS: %s\n", - gpgme_strerror(gpgme_engine_check_version(GPGME_PROTOCOL_CMS))); + gpgmepp_strerror_r(gpgme_engine_check_version(GPGME_PROTOCOL_CMS))); printf("GPGME_PROTOCOL_OpenPGP: %s\n", - gpgme_strerror(gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP))); + gpgmepp_strerror_r(gpgme_engine_check_version(GPGME_PROTOCOL_OpenPGP))); gpgme_engine_info_t ei = 0; if (gpgme_get_engine_info(&ei)) { printf("error not engine info found \n"); diff -Nru gpgmepp-15.12.3/cmake/FindGpgme.cmake gpgmepp-16.04.3/cmake/FindGpgme.cmake --- gpgmepp-15.12.3/cmake/FindGpgme.cmake 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/cmake/FindGpgme.cmake 2016-06-15 04:35:44.000000000 +0000 @@ -87,12 +87,6 @@ else() - # is this needed, of just unreflected cut'n'paste? - # this isn't a KDE library, after all! - if( NOT KDEWIN_FOUND ) - find_package( KDEWIN REQUIRED ) - endif() - set( GPGME_FOUND false ) set( GPGME_VANILLA_FOUND false ) set( GPGME_GLIB_FOUND false ) diff -Nru gpgmepp-15.12.3/CMakeLists.txt gpgmepp-16.04.3/CMakeLists.txt --- gpgmepp-15.12.3/CMakeLists.txt 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/CMakeLists.txt 2016-06-15 04:35:44.000000000 +0000 @@ -3,7 +3,7 @@ project(Gpgmepp) # ECM setup -find_package(ECM 5.14.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${Gpgmepp_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -14,12 +14,12 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -set(KF5_VERSION "5.14.0") -set(GPGMEPP_LIB_VERSION "4.80.0") -set(QT_MIN_VERSION "5.4.0") +set(KF5_VERSION "5.19.0") +set(GPGMEPP_LIB_VERSION "5.2.3") +set(QT_MIN_VERSION "5.2.0") ecm_setup_version(${GPGMEPP_LIB_VERSION} VARIABLE_PREFIX GPGMEPP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/gpgmepp_version.h" @@ -37,11 +37,6 @@ ) find_package(Boost REQUIRED) -if(WIN32) - find_package(KDEWin REQUIRED) - INCLUDE_DIRECTORIES(${KDEWIN_INCLUDES}) - LINK_LIBRARIES(${KDEWIN_LIBRARIES}) -endif() ########### CMake Config Files ########### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Gpgmepp") diff -Nru gpgmepp-15.12.3/debian/changelog gpgmepp-16.04.3/debian/changelog --- gpgmepp-15.12.3/debian/changelog 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/changelog 2016-09-30 04:39:16.000000000 +0000 @@ -1,3 +1,25 @@ +gpgmepp (16.04.3-0ubuntu1) yakkety; urgency=medium + + [ Scarlett Clark ] + * New upstream release + * Bump SO version in install files. + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Scarlett Clark ] + * Fix merge markers in symbols. + * New upstream bugfix release + + [ Clive Johnston ] + * Refreshing symbols + * New upstream release (16.04.2) + * New upstream release (16.04.3) + * Refreshing symbols and removing MISSING + + -- José Manuel Santamaría Lema Fri, 30 Sep 2016 06:39:16 +0200 + gpgmepp (15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release @@ -15,6 +37,18 @@ -- Clive Johnston Wed, 09 Mar 2016 10:24:32 +0100 +gpgmepp (15.12.0-2) experimental; urgency=medium + + * Update symbols files from buildds logs (15.12.0-1). + + -- Maximiliano Curia Tue, 02 Feb 2016 16:01:14 +0100 + +gpgmepp (15.12.0-1) experimental; urgency=medium + + * New upstream release (15.12.0). + + -- Maximiliano Curia Mon, 01 Feb 2016 10:23:06 +0100 + gpgmepp (15.08.2-0ubuntu1) wily; urgency=medium * Vivid backport diff -Nru gpgmepp-15.12.3/debian/control gpgmepp-16.04.3/debian/control --- gpgmepp-15.12.3/debian/control 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/control 2016-09-30 04:39:16.000000000 +0000 @@ -5,15 +5,15 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 5.12.0~), + extra-cmake-modules (>= 5.24.0~), libboost-dev, libgpgme11-dev, pkg-kde-tools (>> 0.15.15), - qtbase5-dev (>= 5.2.0~) + qtbase5-dev (>= 5.6.1~) Standards-Version: 3.9.6 Homepage: https://projects.kde.org/projects/kde/pim/gpgmepp -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/gpgmepp.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/gpgmepp.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/gpgmepp +Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/gpgmepp Package: libkf5gpgmepp5 Architecture: any @@ -44,7 +44,7 @@ libkf5gpgmepp-pthread5 (= ${binary:Version}), libkf5gpgmepp5 (= ${binary:Version}), libkf5qgpgme5 (= ${binary:Version}), - qtbase5-dev (>= 5.2.0~), + qtbase5-dev (>= 5.4.0~), ${misc:Depends}, ${shlibs:Depends} Description: c++ wrapper library for gpgme - development files @@ -63,16 +63,3 @@ and some Qt datatypes (e.g. QByteArray). . This package is part of the KDE Development Platform PIM libraries module. - -Package: gpgmepp-dbg -Section: debug -Priority: extra -Architecture: any -Multi-Arch: same -Depends: libkf5gpgmepp5 (= ${binary:Version}) | libkf5gpgmepp-pthread5 (= ${binary:Version}) | libkf5qgpgme5 (= ${binary:Version}), - ${misc:Depends} -Description: c++ wrapper library for gpgme - debug symbols - GpgME++ is a C++ wrapper (or C++ bindings) for the GnuPG project's gpgme - (GnuPG Made Easy) library. - . - This package contains the debug symbols. diff -Nru gpgmepp-15.12.3/debian/libkf5gpgmepp5.install gpgmepp-16.04.3/debian/libkf5gpgmepp5.install --- gpgmepp-15.12.3/debian/libkf5gpgmepp5.install 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/libkf5gpgmepp5.install 2016-09-30 04:39:16.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/libKF5Gpgmepp.so.4.* +usr/lib/*/libKF5Gpgmepp.so.5.* usr/lib/*/libKF5Gpgmepp.so.5 diff -Nru gpgmepp-15.12.3/debian/libkf5gpgmepp5.symbols gpgmepp-16.04.3/debian/libkf5gpgmepp5.symbols --- gpgmepp-15.12.3/debian/libkf5gpgmepp5.symbols 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/libkf5gpgmepp5.symbols 2016-09-30 04:39:16.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 15.08.0 arm64 armel armhf hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x +# SymbolsHelper-Confirmed: 16.04.3 amd64 i386 libKF5Gpgmepp.so.5 libkf5gpgmepp5 #MINVER# _ZN5GpgME10EngineInfoC1EP18_gpgme_engine_info@Base 15.07.90 _ZN5GpgME10EngineInfoC1Ev@Base 15.07.90 @@ -273,7 +273,7 @@ _ZN5GpgME6UserIDC2Ev@Base 15.07.90 _ZN5GpgME7Context10importKeysERKNS_4DataE@Base 15.07.90 _ZN5GpgME7Context10importKeysERKSt6vectorINS_3KeyESaIS2_EE@Base 15.07.90 - _ZN5GpgME7Context10setOfflineEb@Base 15.08.1+git20150917.1103+15.10 + _ZN5GpgME7Context10setOfflineEb@Base 15.12.0 _ZN5GpgME7Context11generateKeyEPKcRNS_4DataE@Base 15.07.90 _ZN5GpgME7Context11getAuditLogERNS_4DataEj@Base 15.07.90 _ZN5GpgME7Context11setTextModeEb@Base 15.07.90 @@ -605,6 +605,7 @@ _ZNK5GpgME6Subkey6lengthEv@Base 15.07.90 _ZNK5GpgME6Subkey6parentEv@Base 15.07.90 _ZNK5GpgME6Subkey7canSignEv@Base 15.07.90 + _ZNK5GpgME6Subkey8algoNameB5cxx11Ev@Base 16.04.1 _ZNK5GpgME6Subkey8isSecretEv@Base 15.07.90 _ZNK5GpgME6Subkey9isCardKeyEv@Base 15.07.90 _ZNK5GpgME6Subkey9isExpiredEv@Base 15.07.90 @@ -667,7 +668,7 @@ _ZNK5GpgME7Context22lastCardEditInteractorEv@Base 15.07.90 _ZNK5GpgME7Context28managedByEventLoopInteractorEv@Base 15.07.90 _ZNK5GpgME7Context5armorEv@Base 15.07.90 - _ZNK5GpgME7Context7offlineEv@Base 15.08.1+git20150917.1103+15.10 + _ZNK5GpgME7Context7offlineEv@Base 15.12.0 _ZNK5GpgME7Context8protocolEv@Base 15.07.90 _ZNK5GpgME7Context8textModeEv@Base 15.07.90 _ZNK5GpgME7Context9lastErrorEv@Base 15.07.90 @@ -706,81 +707,65 @@ _ZNK5GpgME9TrustItem5keyIDEv@Base 15.07.90 _ZNK5GpgME9TrustItem6isNullEv@Base 15.07.90 _ZNK5GpgME9TrustItem6userIDEv@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED1Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x|subst)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EE17_M_default_appendE{size_t}@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED1Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED1Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED2Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32|subst)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EE17_M_default_appendE{size_t}@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED1Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED2Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el|subst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el x32|subst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|subst|arch=armel hurd-i386 kfreebsd-amd64 kfreebsd-i386)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst|arch=amd64 armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME3KeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst)_ZNSt6vectorIN5GpgME18VerificationResult7Private4NotaESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_@Base 15.12.0 (optional=templinst)_ZNSt6vectorIN5GpgME3KeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED1Ev@Base 15.08.0 - (optional=templinst|arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED2Ev@Base 15.08.0 - (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el !x32)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED1Ev@Base 15.08.0 + (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el !x32)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED2Ev@Base 15.08.0 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|subst|arch=armel hurd-i386 kfreebsd-amd64 kfreebsd-i386)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst|arch=amd64 armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 (optional=templinst|subst|arch=!mips !mipsel !powerpc !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el|subst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst|arch=armel armhf hppa hurd-i386 i386 mips mipsel powerpc)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=armel armhf hppa hurd-i386 i386 mips mipsel powerpc)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIIRKS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIIS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJRKS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE12emplace_backIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPN5GpgME19EventLoopInteractor7Private5OneFDESaIS4_EE19_M_emplace_back_auxIIS4_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPN5GpgME19EventLoopInteractor7Private5OneFDESaIS4_EE19_M_emplace_back_auxIJS4_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIIS0_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIJS0_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIS_IN5GpgME18VerificationResult7Private4NotaESaIS3_EESaIS5_EE19_M_emplace_back_auxIIS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIS_IN5GpgME18VerificationResult7Private4NotaESaIS3_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE19_M_emplace_back_auxIIS7_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE19_M_emplace_back_auxIJS7_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIIRKiEEEvDpOT_@Base 15.07.90 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIJRKiEEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIIRKjEEEvDpOT_@Base 15.07.90 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIJRKjEEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIjSaIjEEaSERKS1_@Base 15.07.90 _ZTIN5GpgME14EditInteractorE@Base 15.07.90 diff -Nru gpgmepp-15.12.3/debian/libkf5gpgmepp-pthread5.install gpgmepp-16.04.3/debian/libkf5gpgmepp-pthread5.install --- gpgmepp-15.12.3/debian/libkf5gpgmepp-pthread5.install 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/libkf5gpgmepp-pthread5.install 2016-09-30 04:39:16.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/libKF5Gpgmepp-pthread.so.4.* +usr/lib/*/libKF5Gpgmepp-pthread.so.5.* usr/lib/*/libKF5Gpgmepp-pthread.so.5 diff -Nru gpgmepp-15.12.3/debian/libkf5gpgmepp-pthread5.symbols gpgmepp-16.04.3/debian/libkf5gpgmepp-pthread5.symbols --- gpgmepp-15.12.3/debian/libkf5gpgmepp-pthread5.symbols 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/libkf5gpgmepp-pthread5.symbols 2016-09-30 04:39:16.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 15.08.0 arm64 armel armhf hppa hurd-i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x +# SymbolsHelper-Confirmed: 16.04.3 amd64 i386 libKF5Gpgmepp-pthread.so.5 libkf5gpgmepp-pthread5 #MINVER# _ZN5GpgME10EngineInfoC1EP18_gpgme_engine_info@Base 15.07.90 _ZN5GpgME10EngineInfoC1Ev@Base 15.07.90 @@ -273,7 +273,7 @@ _ZN5GpgME6UserIDC2Ev@Base 15.07.90 _ZN5GpgME7Context10importKeysERKNS_4DataE@Base 15.07.90 _ZN5GpgME7Context10importKeysERKSt6vectorINS_3KeyESaIS2_EE@Base 15.07.90 - _ZN5GpgME7Context10setOfflineEb@Base 15.08.1+git20150917.1103+15.10 + _ZN5GpgME7Context10setOfflineEb@Base 15.12.0 _ZN5GpgME7Context11generateKeyEPKcRNS_4DataE@Base 15.07.90 _ZN5GpgME7Context11getAuditLogERNS_4DataEj@Base 15.07.90 _ZN5GpgME7Context11setTextModeEb@Base 15.07.90 @@ -605,6 +605,7 @@ _ZNK5GpgME6Subkey6lengthEv@Base 15.07.90 _ZNK5GpgME6Subkey6parentEv@Base 15.07.90 _ZNK5GpgME6Subkey7canSignEv@Base 15.07.90 + _ZNK5GpgME6Subkey8algoNameB5cxx11Ev@Base 16.04.1 _ZNK5GpgME6Subkey8isSecretEv@Base 15.07.90 _ZNK5GpgME6Subkey9isCardKeyEv@Base 15.07.90 _ZNK5GpgME6Subkey9isExpiredEv@Base 15.07.90 @@ -667,7 +668,7 @@ _ZNK5GpgME7Context22lastCardEditInteractorEv@Base 15.07.90 _ZNK5GpgME7Context28managedByEventLoopInteractorEv@Base 15.07.90 _ZNK5GpgME7Context5armorEv@Base 15.07.90 - _ZNK5GpgME7Context7offlineEv@Base 15.08.1+git20150917.1103+15.10 + _ZNK5GpgME7Context7offlineEv@Base 15.12.0 _ZNK5GpgME7Context8protocolEv@Base 15.07.90 _ZNK5GpgME7Context8textModeEv@Base 15.07.90 _ZNK5GpgME7Context9lastErrorEv@Base 15.07.90 @@ -706,81 +707,65 @@ _ZNK5GpgME9TrustItem5keyIDEv@Base 15.07.90 _ZNK5GpgME9TrustItem6isNullEv@Base 15.07.90 _ZNK5GpgME9TrustItem6userIDEv@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED1Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x|subst)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EE17_M_default_appendE{size_t}@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED1Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED1Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 armel armhf hppa kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration6OptionESaIS2_EED2Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32|subst)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EE17_M_default_appendE{size_t}@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED1Ev@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME13Configuration9ComponentESaIS2_EED2Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16CreatedSignatureESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el|subst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el s390x x32)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 ppc64 ppc64el x32|subst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16DecryptionResult9RecipientESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|subst|arch=armel hurd-i386 kfreebsd-amd64 kfreebsd-i386)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst|arch=amd64 armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME16InvalidRecipientESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME17InvalidSigningKeyESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME3KeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst)_ZNSt6vectorIN5GpgME18VerificationResult7Private4NotaESaIS3_EE19_M_emplace_back_auxIJRKS3_EEEvDpOT_@Base 15.12.0 (optional=templinst)_ZNSt6vectorIN5GpgME3KeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED1Ev@Base 15.08.0 - (optional=templinst|arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED2Ev@Base 15.08.0 - (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el !x32)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED1Ev@Base 15.08.0 + (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !ppc64 !ppc64el !x32)_ZNSt6vectorIN5GpgME3KeyESaIS1_EED2Ev@Base 15.08.0 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|subst|arch=armel hurd-i386 kfreebsd-amd64 kfreebsd-i386)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst|arch=amd64 armel hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 x32)_ZNSt6vectorIN5GpgME6ImportESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6ImportESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6SubkeyESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE19_M_emplace_back_auxIIS2_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE19_M_emplace_back_auxIJS2_EEEvDpOT_@Base 15.07.90 (optional=templinst|subst|arch=!mips !mipsel !powerpc !ppc64 !ppc64el)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserID9SignatureESaIS2_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME6UserIDESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el|subst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE7reserveE{size_t}@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EE7reserveE{size_t}@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME8NotationESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst|arch=armel armhf hppa hurd-i386 i386 mips mipsel powerpc)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=armel armhf hppa hurd-i386 i386 mips mipsel powerpc)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 + (optional=templinst|subst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EE7reserveE{size_t}@Base 16.04.3 (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EED1Ev@Base 15.07.90 (optional=templinst)_ZNSt6vectorIN5GpgME9SignatureESaIS1_EED2Ev@Base 15.07.90 - (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIIRKS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIIS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJRKS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE12emplace_backIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE12emplace_backIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE19_M_emplace_back_auxIIS1_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPKcSaIS1_EE19_M_emplace_back_auxIJS1_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPN5GpgME19EventLoopInteractor7Private5OneFDESaIS4_EE19_M_emplace_back_auxIIS4_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPN5GpgME19EventLoopInteractor7Private5OneFDESaIS4_EE19_M_emplace_back_auxIJS4_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIIS0_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIPcSaIS0_EE19_M_emplace_back_auxIJS0_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorIS_IN5GpgME18VerificationResult7Private4NotaESaIS3_EESaIS5_EE19_M_emplace_back_auxIIS5_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIS_IN5GpgME18VerificationResult7Private4NotaESaIS3_EESaIS5_EE19_M_emplace_back_auxIJS5_EEEvDpOT_@Base 15.07.90 - (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE19_M_emplace_back_auxIIS7_EEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE19_M_emplace_back_auxIJS7_EEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIIRKiEEEvDpOT_@Base 15.07.90 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIiSaIiEE19_M_emplace_back_auxIJRKiEEEvDpOT_@Base 15.07.90 - (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIIRKjEEEvDpOT_@Base 15.07.90 (optional=templinst|arch=amd64 arm64 kfreebsd-amd64 ppc64 ppc64el s390x)_ZNSt6vectorIjSaIjEE19_M_emplace_back_auxIJRKjEEEvDpOT_@Base 15.07.90 (optional=templinst)_ZNSt6vectorIjSaIjEEaSERKS1_@Base 15.07.90 _ZTIN5GpgME14EditInteractorE@Base 15.07.90 diff -Nru gpgmepp-15.12.3/debian/libkf5qgpgme5.install gpgmepp-16.04.3/debian/libkf5qgpgme5.install --- gpgmepp-15.12.3/debian/libkf5qgpgme5.install 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/libkf5qgpgme5.install 2016-09-30 04:39:16.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/libKF5QGpgme.so.4.* +usr/lib/*/libKF5QGpgme.so.5.* usr/lib/*/libKF5QGpgme.so.5 diff -Nru gpgmepp-15.12.3/debian/rules gpgmepp-16.04.3/debian/rules --- gpgmepp-15.12.3/debian/rules 2016-04-14 21:55:09.000000000 +0000 +++ gpgmepp-16.04.3/debian/rules 2016-09-30 04:39:16.000000000 +0000 @@ -3,7 +3,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk override_dh_strip: - $(overridden_command) --dbg-package=gpgmepp-dbg + $(overridden_command) --ddeb-migration='gpgmepp-dbg (<= 15.12.0-1~~)' override_dh_auto_test: # Disable auto test at build time, fakeroot breaks them diff -Nru gpgmepp-15.12.3/src/config-gpgme++.h.cmake gpgmepp-16.04.3/src/config-gpgme++.h.cmake --- gpgmepp-15.12.3/src/config-gpgme++.h.cmake 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/config-gpgme++.h.cmake 2016-06-15 04:35:44.000000000 +0000 @@ -114,6 +114,9 @@ /* Define to 1 if your gpgme defines gpgme_off_t */ #cmakedefine HAVE_GPGME_OFF_T 1 +/* Define to 1 if your gpgme has gpgme_pubkey_algo_string */ +#cmakedefine HAVE_GPGME_PUBKEY_ALGO_STRING 1 + #ifndef HAVE_GPGME_GPG_ERROR_WRAPPERS # ifndef HAVE_GPG_ERR_SET_ERRNO # include diff -Nru gpgmepp-15.12.3/src/ConfigureChecks.cmake gpgmepp-16.04.3/src/ConfigureChecks.cmake --- gpgmepp-15.12.3/src/ConfigureChecks.cmake 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/ConfigureChecks.cmake 2016-06-15 04:35:44.000000000 +0000 @@ -429,7 +429,7 @@ } " HAVE_GPGME_CONF_ARG_NEW_WITH_CONST_VALUE ) -# check if gpgme has offline mode support (new in 1.5.6) +# check if gpgme has offline mode support (new in 1.6.0) check_cxx_source_compiles (" #include int main() { @@ -438,6 +438,9 @@ } " HAVE_GPGME_CTX_OFFLINE ) +# check if gpgme has pubkey_algo name mode support (new in 1.6.1) +check_function_exists ("gpgme_pubkey_algo_string" HAVE_GPGME_PUBKEY_ALGO_STRING ) + set(CMAKE_EXTRA_INCLUDE_FILES gpgme.h) # defined in gpgme versions >= 1.4.2 check_type_size(gpgme_ssize_t GPGME_SSIZE_T) diff -Nru gpgmepp-15.12.3/src/context.cpp gpgmepp-16.04.3/src/context.cpp --- gpgmepp-15.12.3/src/context.cpp 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/context.cpp 2016-06-15 04:35:44.000000000 +0000 @@ -110,14 +110,6 @@ } } -static void format_error(gpgme_error_t err, std::string &str) -{ - char buffer[ 1024 ]; - gpgme_strerror_r(err, buffer, sizeof buffer); - buffer[ sizeof buffer - 1 ] = '\0'; - str = buffer; -} - const char *Error::source() const { return gpgme_strsource((gpgme_error_t)mErr); @@ -126,7 +118,7 @@ const char *Error::asString() const { if (mMessage.empty()) { - format_error(static_cast(mErr), mMessage); + mMessage = gpgmepp_strerror_r(static_cast(mErr)); } return mMessage.c_str(); } diff -Nru gpgmepp-15.12.3/src/editinteractor.cpp gpgmepp-16.04.3/src/editinteractor.cpp --- gpgmepp-15.12.3/src/editinteractor.cpp 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/editinteractor.cpp 2016-06-15 04:35:44.000000000 +0000 @@ -25,6 +25,7 @@ #include "editinteractor.h" #include "callbacks.h" #include "error.h" +#include "util.h" #ifdef HAVE_GPGME_GPG_ERROR_WRAPPERS #include @@ -172,8 +173,9 @@ } if (ei->debug) { + std::string errMsg = gpgmepp_strerror_r(ei->error.encodedError()); std::fprintf(ei->debug, "EditInteractor: error now %u (%s)\n", - ei->error.encodedError(), gpgme_strerror(ei->error.encodedError())); + ei->error.encodedError(), errMsg.c_str()); } return ei->error.encodedError(); @@ -219,6 +221,11 @@ return d->error; } +#ifndef GPGME_STATUS_PINENTRY_LAUNCHED +// New in gpgme 1.5.0 +#define GPGME_STATUS_PINENTRY_LAUNCHED 88 +#endif + bool EditInteractor::needsNoResponse(unsigned int status) const { switch (status) { @@ -231,6 +238,7 @@ case GPGME_STATUS_USERID_HINT: case GPGME_STATUS_SIGEXPIRED: case GPGME_STATUS_KEYEXPIRED: + case GPGME_STATUS_PINENTRY_LAUNCHED: return true; default: return false; diff -Nru gpgmepp-15.12.3/src/exception.cpp gpgmepp-16.04.3/src/exception.cpp --- gpgmepp-15.12.3/src/exception.cpp 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/exception.cpp 2016-06-15 04:35:44.000000000 +0000 @@ -22,6 +22,7 @@ // -*- c++ -*- #include "exception.h" +#include "util.h" #include @@ -44,15 +45,11 @@ if (opt & MessageOnly) { return msg; } - char error_string[128]; - error_string[0] = '\0'; - gpgme_strerror_r(err.encodedError(), error_string, sizeof error_string); - error_string[sizeof error_string - 1] = '\0'; stringstream ss; ss << gpgme_strsource(err.encodedError()) << ": "; if (!msg.empty()) { ss << msg << ": "; } - ss << error_string << " (" << static_cast(err.encodedError()) << ')'; + ss << gpgmepp_strerror_r(err.encodedError()) << " (" << static_cast(err.encodedError()) << ')'; return ss.str(); } diff -Nru gpgmepp-15.12.3/src/key.cpp gpgmepp-16.04.3/src/key.cpp --- gpgmepp-15.12.3/src/key.cpp 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/key.cpp 2016-06-15 04:35:44.000000000 +0000 @@ -393,6 +393,21 @@ return gpgme_pubkey_algo_name(subkey ? subkey->pubkey_algo : (gpgme_pubkey_algo_t)0); } +std::string Subkey::algoName() const +{ +#ifndef HAVE_GPGME_PUBKEY_ALGO_STRING + return std::string(); +#else + char *gpgmeStr; + if (subkey && (gpgmeStr = gpgme_pubkey_algo_string(subkey))) { + std::string ret = std::string(gpgmeStr); + gpgme_free(gpgmeStr); + return ret; + } + return std::string(); +#endif +} + bool Subkey::canEncrypt() const { return subkey && subkey->can_encrypt; @@ -773,10 +788,7 @@ if (!sig) { return std::string(); } - char buf[ 1024 ]; - gpgme_strerror_r(sig->status, buf, sizeof buf); - buf[ sizeof buf - 1 ] = '\0'; - return std::string(buf); + return gpgmepp_strerror_r(sig->status); } GpgME::Notation UserID::Signature::notation(unsigned int idx) const diff -Nru gpgmepp-15.12.3/src/key.h gpgmepp-16.04.3/src/key.h --- gpgmepp-15.12.3/src/key.h 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/key.h 2016-06-15 04:35:44.000000000 +0000 @@ -208,8 +208,27 @@ bool isSecret() const; unsigned int publicKeyAlgorithm() const; + + /** + @brief Get the public key algorithm name. + + This only works for the pre 2.1 algorithms for ECC NULL is returned. + + @returns a statically allocated string with the name of the public + key algorithm, or NULL if that name is not known. + */ const char *publicKeyAlgorithmAsString() const; + /** + @brief Get the key algo string like GnuPG 2.1 prints it. + + This returns combinations of size and algorithm. Like + bp512 or rsa2048 + + @returns the key algorithm as string. Empty string on error. + */ + std::string algoName() const; + unsigned int length() const; const char *cardSerialNumber() const; diff -Nru gpgmepp-15.12.3/src/util.h gpgmepp-16.04.3/src/util.h --- gpgmepp-15.12.3/src/util.h 2015-10-21 05:52:38.000000000 +0000 +++ gpgmepp-16.04.3/src/util.h 2016-06-15 04:35:44.000000000 +0000 @@ -176,4 +176,15 @@ } #endif +/** @short C++ wrapper around gpgme_strerror_r */ +static inline std::string gpgmepp_strerror_r(const gpg_error_t err) +{ + char buf[1024]; + gpgme_strerror_r(err, buf, sizeof(buf)); + // the documentation for gpgme_strerror_r doesn't say anything about + // the trailing null, so better play it safe + buf[sizeof(buf) - 1] = '\0'; + return std::string(buf); +} + #endif // __GPGMEPP_UTIL_H__