diff -Nru kmbox-15.12.3/autotests/mboxtest.cpp kmbox-16.04.3/autotests/mboxtest.cpp --- kmbox-15.12.3/autotests/mboxtest.cpp 2015-11-07 12:04:19.000000000 +0000 +++ kmbox-16.04.3/autotests/mboxtest.cpp 2016-06-15 04:39:43.000000000 +0000 @@ -77,13 +77,13 @@ { MBox mbox1; - if (!QStandardPaths::findExecutable(QLatin1String("lockfile")).isEmpty()) { + if (!QStandardPaths::findExecutable(QStringLiteral("lockfile")).isEmpty()) { QVERIFY(mbox1.setLockType(MBox::ProcmailLockfile)); } else { QVERIFY(!mbox1.setLockType(MBox::ProcmailLockfile)); } - if (!QStandardPaths::findExecutable(QLatin1String("mutt_dotlock")).isEmpty()) { + if (!QStandardPaths::findExecutable(QStringLiteral("mutt_dotlock")).isEmpty()) { QVERIFY(mbox1.setLockType(MBox::MuttDotlock)); QVERIFY(mbox1.setLockType(MBox::MuttDotlockPrivileged)); } else { @@ -99,12 +99,12 @@ // Should fail because it's not known which file to lock. MBox mbox; - if (!QStandardPaths::findExecutable(QLatin1String("lockfile")).isEmpty()) { + if (!QStandardPaths::findExecutable(QStringLiteral("lockfile")).isEmpty()) { QVERIFY(mbox.setLockType(MBox::ProcmailLockfile)); QVERIFY(!mbox.lock()); } - if (!QStandardPaths::findExecutable(QLatin1String("mutt_dotlock")).isEmpty()) { + if (!QStandardPaths::findExecutable(QStringLiteral("mutt_dotlock")).isEmpty()) { QVERIFY(mbox.setLockType(MBox::MuttDotlock)); QVERIFY(!mbox.lock()); QVERIFY(mbox.setLockType(MBox::MuttDotlockPrivileged)); diff -Nru kmbox-15.12.3/CMakeLists.txt kmbox-16.04.3/CMakeLists.txt --- kmbox-15.12.3/CMakeLists.txt 2015-11-07 12:04:19.000000000 +0000 +++ kmbox-16.04.3/CMakeLists.txt 2016-06-15 04:39:43.000000000 +0000 @@ -3,7 +3,7 @@ project(KMbox) # ECM setup -find_package(ECM 5.14.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -14,12 +14,12 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) -set(KF5_VERSION "5.12.0") -set(KMBOX_LIB_VERSION "4.79.0") -set(KMIME_LIB_VERSION "4.79.0") +set(KF5_VERSION "5.19.0") +set(KMBOX_LIB_VERSION "5.2.3") +set(KMIME_LIB_VERSION "5.2.0") ecm_setup_version(${KMBOX_LIB_VERSION} VARIABLE_PREFIX KMBOX VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h" diff -Nru kmbox-15.12.3/debian/changelog kmbox-16.04.3/debian/changelog --- kmbox-15.12.3/debian/changelog 2016-04-14 22:33:42.000000000 +0000 +++ kmbox-16.04.3/debian/changelog 2016-09-30 04:37:21.000000000 +0000 @@ -1,3 +1,22 @@ +kmbox (16.04.3-0ubuntu1) yakkety; urgency=medium + + [ Scarlett Clark ] + * New upstream release + + [ Philip Muškovac ] + * Update the Vcs URLs now that the repositories are hosted on + Launchpad + + [ Scarlett Clark ] + * Bump SO version install file + * New upstream bugfix release + + [ Clive Johnston ] + * New upstream release (16.04.2) + * New upstream release (16.04.3) + + -- José Manuel Santamaría Lema Fri, 30 Sep 2016 06:37:21 +0200 + kmbox (15.12.3-0ubuntu1) xenial; urgency=medium * New upstream bugfix release @@ -13,6 +32,12 @@ -- Scarlett Clark Wed, 09 Mar 2016 10:51:58 +0100 +kmbox (15.12.0-2) experimental; urgency=medium + + * Update symbols files from buildds logs (15.12.0-1). + + -- Maximiliano Curia Tue, 09 Feb 2016 20:56:28 +0100 + kmbox (15.12.0-1) experimental; urgency=medium * New upstream release (15.12.0). diff -Nru kmbox-15.12.3/debian/control kmbox-16.04.3/debian/control --- kmbox-15.12.3/debian/control 2016-04-14 22:33:42.000000000 +0000 +++ kmbox-16.04.3/debian/control 2016-09-30 04:37:21.000000000 +0000 @@ -5,23 +5,23 @@ Uploaders: Maximiliano Curia Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), - extra-cmake-modules (>= 5.14.0~), + extra-cmake-modules (>= 5.24.0~), libboost-dev, - libkf5kdelibs4support-dev (>= 5.12.0~), - libkf5mime-dev (>= 15.12.1~), + libkf5kdelibs4support-dev (>= 5.24.0~), + libkf5mime-dev (>= 16.04.3~), pkg-kde-tools (>> 0.15.15), - qtbase5-dev + qtbase5-dev (>= 5.6.1~) Standards-Version: 3.9.6 Homepage: https://projects.kde.org/projects/kde/pim/kmbox -Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/kmbox.git -Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/kmbox.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmbox +Vcs-Git: git://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kmbox Package: libkf5mbox-dev Section: libdevel Architecture: any Multi-Arch: foreign Depends: libkf5mbox5 (= ${binary:Version}), - libkf5mime-dev (>= 4.79.0~), + libkf5mime-dev (>= 16.04.3~), qtbase5-dev, ${misc:Depends} Description: library for handling mbox mailboxes - development files diff -Nru kmbox-15.12.3/debian/libkf5mbox5.install kmbox-16.04.3/debian/libkf5mbox5.install --- kmbox-15.12.3/debian/libkf5mbox5.install 2016-04-14 22:33:42.000000000 +0000 +++ kmbox-16.04.3/debian/libkf5mbox5.install 2016-09-30 04:37:21.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/libKF5Mbox.so.4.* +usr/lib/*/libKF5Mbox.so.5.* usr/lib/*/libKF5Mbox.so.5 diff -Nru kmbox-15.12.3/debian/libkf5mbox5.symbols kmbox-16.04.3/debian/libkf5mbox5.symbols --- kmbox-15.12.3/debian/libkf5mbox5.symbols 2016-04-14 22:33:42.000000000 +0000 +++ kmbox-16.04.3/debian/libkf5mbox5.symbols 2016-09-30 04:37:21.000000000 +0000 @@ -1,10 +1,11 @@ -# SymbolsHelper-Confirmed: 15.12.0 amd64 +# SymbolsHelper-Confirmed: 15.12.0 amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 mips mips64el mipsel powerpc ppc64el s390x libKF5Mbox.so.5 libkf5mbox5 #MINVER# _ZN5KMBox4MBox11readMessageERKNS_9MBoxEntryE@Base 15.07.90 _ZN5KMBox4MBox11setLockFileERK7QString@Base 15.07.90 _ZN5KMBox4MBox11setLockTypeENS0_8LockTypeE@Base 15.07.90 _ZN5KMBox4MBox11setReadOnlyEb@Base 15.07.90 - _ZN5KMBox4MBox13appendMessageERK14QSharedPointerIN5KMime7MessageEE@Base 15.12.0 + (optional=boost)_ZN5KMBox4MBox13appendMessageERK14QSharedPointerIN5KMime7MessageEE@Base 15.12.0 + (optional=boost)_ZN5KMBox4MBox13appendMessageERKN5boost10shared_ptrIN5KMime7MessageEEE@Base 15.12.0 _ZN5KMBox4MBox14readRawMessageERKNS_9MBoxEntryE@Base 15.07.90 _ZN5KMBox4MBox16setUnlockTimeoutEi@Base 15.07.90 _ZN5KMBox4MBox18readMessageHeadersERKNS_9MBoxEntryE@Base 15.07.90