Hello community, here is the log from the commit of package kpeople5 for openSUSE:Factory checked in at 2015-06-23 12:11:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpeople5 (Old) and /work/SRC/openSUSE:Factory/.kpeople5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpeople5" Changes: -------- --- /work/SRC/openSUSE:Factory/kpeople5/kpeople5.changes 2015-05-11 19:48:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kpeople5.new/kpeople5.changes 2015-06-23 12:11:07.000000000 +0200 @@ -1,0 +2,8 @@ +Sun Jun 7 19:07:50 UTC 2015 - hrvoje.sen...@gmail.com + +- Update to 5.11.0 + * Use QTemporaryFile instead of hardcoding /tmp. + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.11.0.php + +------------------------------------------------------------------- Old: ---- kpeople-5.10.0.tar.xz New: ---- kpeople-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpeople5.spec ++++++ --- /var/tmp/diff_new_pack.6Uv0NK/_old 2015-06-23 12:11:07.000000000 +0200 +++ /var/tmp/diff_new_pack.6Uv0NK/_new 2015-06-23 12:11:07.000000000 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define rname kpeople -%define _tar_path 5.10 +%define _tar_path 5.11 Name: kpeople5 -Version: 5.10.0 +Version: 5.11.0 Release: 0 %define kf5_version %{version} BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kpeople-5.10.0.tar.xz -> kpeople-5.11.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/.reviewboardrc new/kpeople-5.11.0/.reviewboardrc --- old/kpeople-5.10.0/.reviewboardrc 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/.reviewboardrc 2015-06-06 23:24:47.000000000 +0200 @@ -1,3 +1,3 @@ REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; REPOSITORY = "kpeople" -TARGET_GROUPS = "kdeframeworks, kdepim +TARGET_GROUPS = "kdeframeworks, kdepim" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/CMakeLists.txt new/kpeople-5.11.0/CMakeLists.txt --- old/kpeople-5.10.0/CMakeLists.txt 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/CMakeLists.txt 2015-06-06 23:24:47.000000000 +0200 @@ -2,11 +2,15 @@ project (KPeople) -find_package(ECM 5.10.0 REQUIRED NO_MODULE) +include(FeatureSummary) +find_package(ECM 5.11.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) -set(KF5_VERSION "5.10.0") # handled by release scripts -set(KF5_DEP_VERSION "5.10.0") # handled by release scripts +set(KF5_VERSION "5.11.0") # handled by release scripts +set(KF5_DEP_VERSION "5.11.0") # handled by release scripts set(REQUIRED_QT_VERSION 5.2.0) @@ -25,7 +29,7 @@ include(ECMPackageConfigHelpers) include(ECMGeneratePriFile) include(GenerateExportHeader) -include(FeatureSummary) + include(KDEInstallDirs) include(KDEFrameworkCompilerSettings) include(KDECMakeSettings) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/autotests/persondatatests.cpp new/kpeople-5.11.0/autotests/persondatatests.cpp --- old/kpeople-5.10.0/autotests/persondatatests.cpp 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/autotests/persondatatests.cpp 2015-06-06 23:24:47.000000000 +0200 @@ -21,6 +21,7 @@ #include <QtTest> #include <QFile> +#include <QTemporaryFile> //private includes #include "personmanager_p.h" @@ -49,8 +50,10 @@ void PersonDataTests::initTestCase() { + QVERIFY(m_database.open()); + // Called before the first testfunction is executed - PersonManager::instance(QStringLiteral("/tmp/kpeople_test_db")); + PersonManager::instance(m_database.fileName()); PersonManager::instance()->mergeContacts(QStringList() << QStringLiteral("fakesource://contact2") << QStringLiteral("fakesource://contact3")); m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction @@ -62,7 +65,7 @@ void PersonDataTests::cleanupTestCase() { // Called after the last testfunction was executed - QFile::remove(QStringLiteral("/tmp/kpeople_test_db")); + m_database.close(); } void PersonDataTests::init() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/autotests/persondatatests.h new/kpeople-5.11.0/autotests/persondatatests.h --- old/kpeople-5.10.0/autotests/persondatatests.h 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/autotests/persondatatests.h 2015-06-06 23:24:47.000000000 +0200 @@ -21,6 +21,7 @@ #define PERSONDATATESTS_H #include <QObject> +#include <QTemporaryFile> class FakeContactSource; @@ -42,6 +43,7 @@ private: FakeContactSource *m_source; + QTemporaryFile m_database; }; #endif // PERSONDATATESTS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/autotests/personsmodeltest.cpp new/kpeople-5.11.0/autotests/personsmodeltest.cpp --- old/kpeople-5.10.0/autotests/personsmodeltest.cpp 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/autotests/personsmodeltest.cpp 2015-06-06 23:24:47.000000000 +0200 @@ -21,6 +21,7 @@ #include <QtTest> #include <QFile> +#include <QTemporaryFile> #include <QVariant> //private includes @@ -45,9 +46,10 @@ void PersonsModelTest::initTestCase() { - // Called before the first testfunction is executed - PersonManager::instance(QStringLiteral("/tmp/kpeople_test_db")); + QVERIFY(m_database.open()); + // Called before the first testfunction is executed + PersonManager::instance(m_database.fileName()); m_source = new FakeContactSource(0); //don't own. PersonPluginManager removes it on destruction QHash<QString, BasePersonsDataSource *> sources; sources[QStringLiteral("fakesource")] = m_source; @@ -63,7 +65,7 @@ void PersonsModelTest::cleanupTestCase() { // Called after the last testfunction was executed - QFile::remove(QStringLiteral("/tmp/kpeople_test_db")); + m_database.close(); } void PersonsModelTest::loadModel() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/autotests/personsmodeltest.h new/kpeople-5.11.0/autotests/personsmodeltest.h --- old/kpeople-5.10.0/autotests/personsmodeltest.h 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/autotests/personsmodeltest.h 2015-06-06 23:24:47.000000000 +0200 @@ -21,6 +21,7 @@ #define PERSONSMODELTEST_H #include <QObject> +#include <QTemporaryFile> class FakeContactSource; namespace KPeople { class PersonsModel; } @@ -40,6 +41,7 @@ private: FakeContactSource *m_source; KPeople::PersonsModel* m_model; + QTemporaryFile m_database; }; #endif // PERSONSMODELTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/po/nn/kpeople5.po new/kpeople-5.11.0/po/nn/kpeople5.po --- old/kpeople-5.10.0/po/nn/kpeople5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kpeople-5.11.0/po/nn/kpeople5.po 2015-06-06 23:24:47.000000000 +0200 @@ -0,0 +1,72 @@ +# Translation of kpeople5 to Norwegian Nynorsk +# +# Karl Ove Hufthammer <k...@huftis.org>, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"PO-Revision-Date: 2015-06-01 20:32+0100\n" +"Last-Translator: Karl Ove Hufthammer <k...@huftis.org>\n" +"Language-Team: Norwegian Nynorsk <i18n...@lister.ping.uio.no>\n" +"Language: nn\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 2.0\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: match.cpp:52 +msgctxt "@title:column" +msgid "Name" +msgstr "Namn" + +#: match.cpp:55 +msgctxt "@title:column" +msgid "E-mail" +msgstr "E-postadresse" + +#: widgets/mergedelegate.cpp:99 +msgctxt "reasons join" +msgid ", " +msgstr ", " + +#: widgets/mergedelegate.cpp:99 +#, kde-format +msgctxt "name: merge reasons" +msgid "%1: %2" +msgstr "%1: %2" + +#: widgets/mergedialog.cpp:64 +msgid "Duplicates Manager" +msgstr "Duplikathandsaming" + +#: widgets/mergedialog.cpp:73 +msgid "Select contacts to be merged" +msgstr "Vel kontaktane du vil slå saman" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +msgid "Avatar" +msgstr "Avatar" + +#: widgets/plugins/emaildetailswidget.cpp:50 +msgctxt "E-mail field label" +msgid "E-mail" +msgstr "E-postadresse" + +#: widgets/plugins/mergecontactswidget.cpp:50 +msgid "Show Merge Suggestions..." +msgstr "Vis samanslåingsforslag …" + +#: widgets/plugins/mergecontactswidget.cpp:88 +msgid "Merge with Selected Contacts" +msgstr "Slå saman med merkte kontaktar" + +#: widgets/plugins/phonedetailswidget.cpp:38 +msgctxt "Phone details title" +msgid "Phone" +msgstr "Telefonnummer" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/po/zh_TW/kpeople5.po new/kpeople-5.11.0/po/zh_TW/kpeople5.po --- old/kpeople-5.10.0/po/zh_TW/kpeople5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/kpeople-5.11.0/po/zh_TW/kpeople5.po 2015-06-06 23:24:47.000000000 +0200 @@ -0,0 +1,70 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Franklin, 2015. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n"; +"POT-Creation-Date: 2015-02-27 09:45+0000\n" +"PO-Revision-Date: 2015-05-13 16:50+0800\n" +"Last-Translator: Franklin\n" +"Language-Team: Chinese Traditional <kde-i18n-...@kde.org>\n" +"Language: zh_TW\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 1.5\n" + +#: match.cpp:52 +msgctxt "@title:column" +msgid "Name" +msgstr "名字" + +#: match.cpp:55 +msgctxt "@title:column" +msgid "E-mail" +msgstr "電子郵件" + +#: widgets/mergedelegate.cpp:99 +msgctxt "reasons join" +msgid ", " +msgstr ", " + +#: widgets/mergedelegate.cpp:99 +#, kde-format +msgctxt "name: merge reasons" +msgid "%1: %2" +msgstr "%1: %2" + +#: widgets/mergedialog.cpp:64 +msgid "Duplicates Manager" +msgstr "重複管理員" + +#: widgets/mergedialog.cpp:73 +msgid "Select contacts to be merged" +msgstr "選擇要合併的聯絡人" + +#. i18n: ectx: property (text), widget (QLabel, avatarPixmapLabel) +#: widgets/person-details-presentation.ui:43 +msgid "Avatar" +msgstr "頭像" + +#: widgets/plugins/emaildetailswidget.cpp:50 +msgctxt "E-mail field label" +msgid "E-mail" +msgstr "電子郵件" + +#: widgets/plugins/mergecontactswidget.cpp:50 +msgid "Show Merge Suggestions..." +msgstr "顯示合併建議..." + +#: widgets/plugins/mergecontactswidget.cpp:88 +msgid "Merge with Selected Contacts" +msgstr "與選取的聯絡人合併" + +#: widgets/plugins/phonedetailswidget.cpp:38 +msgctxt "Phone details title" +msgid "Phone" +msgstr "電話" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/src/backends/allcontactsmonitor.cpp new/kpeople-5.11.0/src/backends/allcontactsmonitor.cpp --- old/kpeople-5.10.0/src/backends/allcontactsmonitor.cpp 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/src/backends/allcontactsmonitor.cpp 2015-06-06 23:24:47.000000000 +0200 @@ -1,22 +1,19 @@ /* - * <one line to give the library's name and an idea of what it does.> - * Copyright 2013 David Edmundson <d.edmund...@lboro.ac.uk> + * Copyright (C) 2013 David Edmundson <davidedmund...@kde.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License or (at your option) version 3 or any later version - * accepted by the membership of KDE e.V. (or its successor approved - * by the membership of KDE e.V.), which shall act as a proxy - * defined in Section 14 of version 3 of the license. + * This library is free software; you can redistribute it and/or + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/src/backends/allcontactsmonitor.h new/kpeople-5.11.0/src/backends/allcontactsmonitor.h --- old/kpeople-5.10.0/src/backends/allcontactsmonitor.h 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/src/backends/allcontactsmonitor.h 2015-06-06 23:24:47.000000000 +0200 @@ -1,21 +1,19 @@ /* - * Copyright 2013 David Edmundson <d.edmund...@lboro.ac.uk> + * Copyright (C) 2013 David Edmundson <davidedmund...@kde.org> * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License or (at your option) version 3 or any later version - * accepted by the membership of KDE e.V. (or its successor approved - * by the membership of KDE e.V.), which shall act as a proxy - * defined in Section 14 of version 3 of the license. + * This library is free software; you can redistribute it and/or + * 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 program is distributed in the hope that it will be useful, + * 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 General Public License for more details. + * 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 General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. + * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA * */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpeople-5.10.0/src/match.cpp new/kpeople-5.11.0/src/match.cpp --- old/kpeople-5.10.0/src/match.cpp 2015-05-04 20:52:01.000000000 +0200 +++ new/kpeople-5.11.0/src/match.cpp 2015-06-06 23:24:47.000000000 +0200 @@ -81,3 +81,5 @@ return ret; } + +#include "moc_match_p.cpp"
