diff -Nru ktnef-17.12.3/CMakeLists.txt ktnef-18.04.1/CMakeLists.txt --- ktnef-17.12.3/CMakeLists.txt 2018-03-06 00:28:18.000000000 +0000 +++ ktnef-18.04.1/CMakeLists.txt 2018-05-08 00:21:25.000000000 +0000 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.3") +set(PIM_VERSION "5.8.1") project(KTnef VERSION ${PIM_VERSION}) -set(KF5_VERSION "5.39.0") +set(KF5_VERSION "5.44.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -23,9 +23,9 @@ set(KTNEF_LIB_VERSION ${PIM_VERSION}) -set(CALENDARCORE_LIB_VERSION "5.7.3") -set(CALENDARUTILS_LIB_VERSION "5.7.3") -set(KCONTACTS_LIB_VERSION "5.7.3") +set(CALENDARCORE_LIB_VERSION "5.8.1") +set(CALENDARUTILS_LIB_VERSION "5.8.1") +set(KCONTACTS_LIB_VERSION "5.8.1") set(QT_REQUIRED_VERSION "5.8.0") ecm_setup_version(PROJECT VARIABLE_PREFIX KTNEF VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ktnef_version.h" @@ -81,5 +81,7 @@ add_subdirectory(autotests) endif() +install( FILES ktnef.renamecategories ktnef.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) ki18n_install(po) diff -Nru ktnef-17.12.3/debian/changelog ktnef-18.04.1/debian/changelog --- ktnef-17.12.3/debian/changelog 2018-03-12 21:30:46.000000000 +0000 +++ ktnef-18.04.1/debian/changelog 2018-05-08 12:29:21.000000000 +0000 @@ -1,8 +1,18 @@ -ktnef (4:17.12.3-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium +ktnef (4:18.04.1-0ubuntu1~ubuntu18.04~ppa1) bionic; urgency=medium + + * Update symbols + * New upstream release (18.03.80) + * Install debug categories files + * New upstream release (18.04.0) + * New upstream release (18.04.1) + + -- Rik Mills Tue, 08 May 2018 13:29:21 +0100 + +ktnef (4:17.12.3-0ubuntu1) bionic; urgency=medium * New upstream release (17.12.3) - -- Rik Mills Mon, 12 Mar 2018 21:30:46 +0000 + -- Rik Mills Fri, 16 Mar 2018 13:31:01 +0000 ktnef (4:17.12.2-0ubuntu1) bionic; urgency=medium diff -Nru ktnef-17.12.3/debian/control ktnef-18.04.1/debian/control --- ktnef-17.12.3/debian/control 2018-03-12 21:30:46.000000000 +0000 +++ ktnef-18.04.1/debian/control 2018-05-08 12:29:21.000000000 +0000 @@ -6,9 +6,9 @@ Build-Depends: cmake (>= 2.8.12~), debhelper (>= 9), extra-cmake-modules (>= 5.31.0~), - libkf5calendarcore-dev (>= 4:17.12.3~), - libkf5calendarutils-dev (>= 4:17.12.3~), - libkf5contacts-dev (>= 4:17.12.3~), + libkf5calendarcore-dev (>= 4:18.04.1~), + libkf5calendarutils-dev (>= 4:18.04.1~), + libkf5contacts-dev (>= 4:18.04.1~), libkf5kdelibs4support-dev (>= 5.31.0~), pkg-kde-tools (>> 0.15.15), qtbase5-dev (>= 5.6.1~) @@ -21,7 +21,7 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libkf5calendarcore-dev (>= 4:17.12.3~), +Depends: libkf5calendarcore-dev (>= 4:18.04.1~), libkf5tnef5 (= ${binary:Version}), ${misc:Depends} Description: library for handling TNEF data - development files diff -Nru ktnef-17.12.3/debian/libkf5tnef5.symbols ktnef-18.04.1/debian/libkf5tnef5.symbols --- ktnef-17.12.3/debian/libkf5tnef5.symbols 2018-03-12 21:30:46.000000000 +0000 +++ ktnef-18.04.1/debian/libkf5tnef5.symbols 2018-05-08 12:29:21.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 4:16.04.3 amd64 i386 +# SymbolsHelper-Confirmed: 4:18.03.70+git20171230 amd64 libKF5Tnef.so.5 libkf5tnef5 #MINVER# _ZN5KTnef11KTNEFAttach10setMimeTagERK7QString@Base 15.07.90 _ZN5KTnef11KTNEFAttach11setFileNameERK7QString@Base 15.07.90 @@ -119,4 +119,3 @@ _ZNK5KTnef16KTNEFPropertySet8propertyEi@Base 15.07.90 _ZNK5KTnef16KTNEFPropertySet9attributeEi@Base 15.07.90 (optional=templinst|arch=i386)_ZSt4swapIN8QVariant7PrivateEENSt9enable_ifIXsrSt6__and_IJSt21is_move_constructibleIT_ESt18is_move_assignableIS5_EEE5valueEvE4typeERS5_SC_@Base 4:16.04.3 - _ZZZN5KTnef11KTNEFParser13ParserPrivateC4EvENKUlvE_clEvE15qstring_literal@Base 15.12.0 diff -Nru ktnef-17.12.3/debian/libkf5tnef-data.install ktnef-18.04.1/debian/libkf5tnef-data.install --- ktnef-17.12.3/debian/libkf5tnef-data.install 2018-03-12 21:30:46.000000000 +0000 +++ ktnef-18.04.1/debian/libkf5tnef-data.install 2018-05-08 12:29:21.000000000 +0000 @@ -1 +1,3 @@ +etc/xdg/ktnef.categories +etc/xdg/ktnef.renamecategories usr/share/locale/* diff -Nru ktnef-17.12.3/ktnef.categories ktnef-18.04.1/ktnef.categories --- ktnef-17.12.3/ktnef.categories 1970-01-01 00:00:00.000000000 +0000 +++ ktnef-18.04.1/ktnef.categories 2018-04-30 14:17:47.000000000 +0000 @@ -0,0 +1 @@ +org.kde.pim.ktnef ktnef (pim lib) diff -Nru ktnef-17.12.3/ktnef.renamecategories ktnef-18.04.1/ktnef.renamecategories --- ktnef-17.12.3/ktnef.renamecategories 1970-01-01 00:00:00.000000000 +0000 +++ ktnef-18.04.1/ktnef.renamecategories 2018-04-30 14:17:47.000000000 +0000 @@ -0,0 +1 @@ +log_ktnef org.kde.pim.ktnef diff -Nru ktnef-17.12.3/po/ca@valencia/libktnef5.po ktnef-18.04.1/po/ca@valencia/libktnef5.po --- ktnef-17.12.3/po/ca@valencia/libktnef5.po 2018-03-06 00:28:18.000000000 +0000 +++ ktnef-18.04.1/po/ca@valencia/libktnef5.po 2018-05-08 00:21:24.000000000 +0000 @@ -91,7 +91,7 @@ #: mapi.cpp:51 #, kde-format msgid "Sent Representing Search Key" -msgstr "S'ha enviat la clau de busca del representant" +msgstr "S'ha enviat la clau de cerca del representant" #: mapi.cpp:52 #, kde-format @@ -166,7 +166,7 @@ #: mapi.cpp:66 #, kde-format msgid "Sender Search Key" -msgstr "Clau de busca del remitent" +msgstr "Clau de cerca del remitent" #: mapi.cpp:67 #, kde-format @@ -276,12 +276,12 @@ #: mapi.cpp:88 #, kde-format msgid "Record Key" -msgstr "Tecla d'gravació\t" +msgstr "Tecla d'enregistrament" #: mapi.cpp:89 #, kde-format msgid "Store Record Key" -msgstr "Guarda la tecla d'gravació\t" +msgstr "Guarda la tecla d'enregistrament" #: mapi.cpp:90 #, kde-format @@ -381,7 +381,7 @@ #: mapi.cpp:109 #, kde-format msgid "Search Key" -msgstr "Clau de busca" +msgstr "Clau de cerca" #: mapi.cpp:110 #, kde-format @@ -692,7 +692,7 @@ #: mapi.cpp:188 #, kde-format msgid "Appointment Duration" -msgstr "Duració de la cita" +msgstr "Durada de la cita" #: mapi.cpp:189 #, kde-format diff -Nru ktnef-17.12.3/po/zh_CN/libktnef5.po ktnef-18.04.1/po/zh_CN/libktnef5.po --- ktnef-17.12.3/po/zh_CN/libktnef5.po 2018-03-06 00:28:18.000000000 +0000 +++ ktnef-18.04.1/po/zh_CN/libktnef5.po 2018-05-08 00:21:25.000000000 +0000 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2017-09-14 03:27+0200\n" -"PO-Revision-Date: 2018-02-28 02:28-0500\n" +"PO-Revision-Date: 2018-04-26 06:08-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru ktnef-17.12.3/src/ktnefparser.cpp ktnef-18.04.1/src/ktnefparser.cpp --- ktnef-17.12.3/src/ktnefparser.cpp 2018-02-26 05:43:01.000000000 +0000 +++ ktnef-18.04.1/src/ktnefparser.cpp 2018-04-30 14:17:47.000000000 +0000 @@ -46,6 +46,7 @@ #include #include #include +#include using namespace KTnef; @@ -87,7 +88,7 @@ public: ParserPrivate() { - defaultdir_ = QStringLiteral("/tmp/"); + defaultdir_ = QStandardPaths::writableLocation(QStandardPaths::TempLocation); current_ = nullptr; deleteDevice_ = false; device_ = nullptr;