Hello community, here is the log from the commit of package frameworkintegration for openSUSE:Factory checked in at 2014-08-16 15:41:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/frameworkintegration (Old) and /work/SRC/openSUSE:Factory/.frameworkintegration.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "frameworkintegration" Changes: -------- --- /work/SRC/openSUSE:Factory/frameworkintegration/frameworkintegration.changes 2014-07-15 10:06:35.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.frameworkintegration.new/frameworkintegration.changes 2014-08-16 15:42:15.000000000 +0200 @@ -1,0 +2,8 @@ +Sat Aug 2 10:20:07 UTC 2014 - hrvoje.sen...@gmail.com + +- Update to 5.1.0 + * For more details please see: + http://www.kde.org/announcements/kde-frameworks-5.1.php +- Add frameworkintegration-plugin Provides + +------------------------------------------------------------------- Old: ---- frameworkintegration-5.0.0.tar.xz New: ---- frameworkintegration-5.1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ frameworkintegration.spec ++++++ --- /var/tmp/diff_new_pack.uaCHwN/_old 2014-08-16 15:42:15.000000000 +0200 +++ /var/tmp/diff_new_pack.uaCHwN/_new 2014-08-16 15:42:15.000000000 +0200 @@ -18,11 +18,11 @@ %define lname libKF5Style5 Name: frameworkintegration -Version: 5.0.0 +Version: 5.1.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 -BuildRequires: extra-cmake-modules >= 1.0.0 +BuildRequires: extra-cmake-modules >= 1.1.0 BuildRequires: fdupes BuildRequires: kconfig-devel >= %{kf5_version} BuildRequires: kconfigwidgets-devel >= %{kf5_version} @@ -57,6 +57,7 @@ Summary: Plugins responsible for better integration of Qt applications in KDE Workspace Group: System/GUI/KDE Obsoletes: libKF5Style4 +Provides: frameworkintegration-plugin Recommends: %lname-lang = %{version} %description -n %lname ++++++ frameworkintegration-5.0.0.tar.xz -> frameworkintegration-5.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/CMakeLists.txt new/frameworkintegration-5.1.0/CMakeLists.txt --- old/frameworkintegration-5.0.0/CMakeLists.txt 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/CMakeLists.txt 2014-08-02 10:59:14.000000000 +0200 @@ -2,7 +2,7 @@ project(FrameworkIntegration) -find_package(ECM 1.0.0 REQUIRED NO_MODULE) +find_package(ECM 1.1.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) @@ -19,8 +19,8 @@ set(REQUIRED_QT_VERSION 5.2.0) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets DBus) -set(KF5_VERSION "5.0.0") # handled by release scripts -set(KF5_DEP_VERSION "5.0.0") # handled by release scripts +set(KF5_VERSION "5.1.0") # handled by release scripts +set(KF5_DEP_VERSION "5.1.0") # handled by release scripts ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX FRAMEWORKINTEGRATION VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/frameworkintegration_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/ar/frameworkintegration5.po new/frameworkintegration-5.1.0/po/ar/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/ar/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/ar/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -9,11 +9,12 @@ "PO-Revision-Date: 2014-06-24 09:35+0300\n" "Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" "Language-Team: Arabic <d...@arabeyes.org>\n" -"Language: arMIME-Version: 1.0\n" +"Language: ar\n" +"MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " -"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" +"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" "X-Generator: Lokalize 1.5\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:216 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/en_GB/frameworkintegration5.po new/frameworkintegration-5.1.0/po/en_GB/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/en_GB/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/en_GB/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -15,7 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" #: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/pa/frameworkintegration5.po new/frameworkintegration-5.1.0/po/pa/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/pa/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/pa/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -7,7 +7,7 @@ "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-06-19 07:59+0000\n" -"PO-Revision-Date: 2014-06-28 22:32-0500\n" +"PO-Revision-Date: 2014-07-08 14:13-0500\n" "Last-Translator: A S Alam <aa...@users.sf.net>\n" "Language-Team: Punjabi/Panjabi <punjabi-us...@lists.sf.net>\n" "Language: pa\n" @@ -19,11 +19,11 @@ #: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." -msgstr "" +msgstr "...ਖੋਲ੍ਹਿਆ ਜਾਂਦਾ ਹੈ" #: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." -msgstr "" +msgstr "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ" #: platformtheme/kdirselectdialog.cpp:132 msgctxt "folder name" @@ -42,11 +42,13 @@ "Create new folder in:\n" "%1" msgstr "" +"ਇਸ ਵਿੱਚ ਨਵਾਂ ਫੋਲਡਰ ਬਣਾਓ:\n" +"%1" #: platformtheme/kdirselectdialog.cpp:168 #, kde-format msgid "A file or folder named %1 already exists." -msgstr "" +msgstr "%1 ਨਾਂ ਨਾਲ ਫੋਲਡਰ ਜਾਂ ਫਾਈਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ।" #: platformtheme/kdirselectdialog.cpp:171 msgid "You do not have permission to create that folder." @@ -89,4 +91,4 @@ #: platformtheme/kfiletreeview.cpp:192 msgid "Show Hidden Folders" -msgstr "" +msgstr "ਲੁਕਵੇਂ ਫੋਲਡਰ ਵੇਖੋ" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/sr/frameworkintegration5.po new/frameworkintegration-5.1.0/po/sr/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/sr/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/sr/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/sr@ijekavian/frameworkintegration5.po new/frameworkintegration-5.1.0/po/sr@ijekavian/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/sr@ijekavian/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/sr@ijekavian/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Отварам..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Уписујем..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/sr@ijekavianlatin/frameworkintegration5.po new/frameworkintegration-5.1.0/po/sr@ijekavianlatin/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/sr@ijekavianlatin/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/sr@latin/frameworkintegration5.po new/frameworkintegration-5.1.0/po/sr@latin/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/sr@latin/frameworkintegration5.po 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/po/sr@latin/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: frameworkintegration5\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-05-05 07:59+0000\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" "PO-Revision-Date: 2014-05-19 22:29+0200\n" "Last-Translator: Chusslove Illich <caslav.i...@gmx.net>\n" "Language-Team: Serbian <kde-i18n...@kde.org>\n" @@ -18,11 +18,11 @@ "X-Text-Markup: kde4\n" "X-Environment: kde\n" -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Opening..." msgstr "Otvaram..." -#: platformtheme/kdeplatformfiledialoghelper.cpp:211 +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 msgid "Saving..." msgstr "Upisujem..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/po/zh_CN/frameworkintegration5.po new/frameworkintegration-5.1.0/po/zh_CN/frameworkintegration5.po --- old/frameworkintegration-5.0.0/po/zh_CN/frameworkintegration5.po 1970-01-01 01:00:00.000000000 +0100 +++ new/frameworkintegration-5.1.0/po/zh_CN/frameworkintegration5.po 2014-08-02 10:59:14.000000000 +0200 @@ -0,0 +1,94 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Weng Xuetian <wen...@gmail.com>, 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-19 07:59+0000\n" +"PO-Revision-Date: 2014-07-16 15:21-0400\n" +"Last-Translator: Weng Xuetian <wen...@gmail.com>\n" +"Language-Team: Chinese Simplified <kde-i18n-...@kde.org>\n" +"Language: zh_CN\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" + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Opening..." +msgstr "正在打开..." + +#: platformtheme/kdeplatformfiledialoghelper.cpp:216 +msgid "Saving..." +msgstr "正在保存..." + +#: platformtheme/kdirselectdialog.cpp:132 +msgctxt "folder name" +msgid "New Folder" +msgstr "新文件夹" + +#: platformtheme/kdirselectdialog.cpp:137 +msgctxt "@title:window" +msgid "New Folder" +msgstr "新建文件夹" + +#: platformtheme/kdirselectdialog.cpp:138 +#, kde-format +msgctxt "@label:textbox" +msgid "" +"Create new folder in:\n" +"%1" +msgstr "" +"创建新文件夹的位置:\n" +"%1" + +#: platformtheme/kdirselectdialog.cpp:168 +#, kde-format +msgid "A file or folder named %1 already exists." +msgstr "名为 %1 的文件或文件夹已存在。" + +#: platformtheme/kdirselectdialog.cpp:171 +msgid "You do not have permission to create that folder." +msgstr "您没有创建该文件夹的权限。" + +#: platformtheme/kdirselectdialog.cpp:285 +msgctxt "@title:window" +msgid "Select Folder" +msgstr "选择文件夹" + +#: platformtheme/kdirselectdialog.cpp:294 +msgctxt "@action:button" +msgid "New Folder..." +msgstr "新建文件夹..." + +#: platformtheme/kdirselectdialog.cpp:340 +msgctxt "@action:inmenu" +msgid "New Folder..." +msgstr "新建文件夹..." + +#: platformtheme/kdirselectdialog.cpp:347 +msgctxt "@action:inmenu" +msgid "Move to Trash" +msgstr "移至回收站" + +#: platformtheme/kdirselectdialog.cpp:354 +msgctxt "@action:inmenu" +msgid "Delete" +msgstr "删除" + +#: platformtheme/kdirselectdialog.cpp:363 +msgctxt "@option:check" +msgid "Show Hidden Folders" +msgstr "显示隐藏文件夹" + +#: platformtheme/kdirselectdialog.cpp:370 +msgctxt "@action:inmenu" +msgid "Properties" +msgstr "属性" + +#: platformtheme/kfiletreeview.cpp:192 +msgid "Show Hidden Folders" +msgstr "显示隐藏文件夹" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/src/platformtheme/kfontsettingsdata.cpp new/frameworkintegration-5.1.0/src/platformtheme/kfontsettingsdata.cpp --- old/frameworkintegration-5.0.0/src/platformtheme/kfontsettingsdata.cpp 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/src/platformtheme/kfontsettingsdata.cpp 2014-08-02 10:59:14.000000000 +0200 @@ -47,13 +47,13 @@ } } -// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp +// NOTE: keep in sync with plasma-desktop/kcms/fonts/fonts.cpp static const char GeneralId[] = "General"; -static const char DefaultFont[] = "Sans Serif"; +static const char DefaultFont[] = "Oxygen-Sans"; static const KFontData DefaultFontData[KFontSettingsData::FontTypesCount] = { { GeneralId, "font", DefaultFont, 10, -1, QFont::SansSerif }, - { GeneralId, "fixed", "Oxygen Mono", 9, -1, QFont::TypeWriter }, + { GeneralId, "fixed", "Oxygen Mono", 9, -1, QFont::Monospace }, { GeneralId, "toolBarFont", DefaultFont, 9, -1, QFont::SansSerif }, { GeneralId, "menuFont", DefaultFont, 10, -1, QFont::SansSerif }, { "WM", "activeFont", DefaultFont, 10, -1, QFont::SansSerif }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/frameworkintegration-5.0.0/src/platformtheme/khintssettings.cpp new/frameworkintegration-5.1.0/src/platformtheme/khintssettings.cpp --- old/frameworkintegration-5.0.0/src/platformtheme/khintssettings.cpp 2014-07-01 20:26:12.000000000 +0200 +++ new/frameworkintegration-5.1.0/src/platformtheme/khintssettings.cpp 2014-08-02 10:59:14.000000000 +0200 @@ -59,7 +59,7 @@ m_hints[QPlatformTheme::ToolBarIconSize] = cgToolbarIcon.readEntry("Size", 22); m_hints[QPlatformTheme::ItemViewActivateItemOnSingleClick] = cg.readEntry("SingleClick", true); KConfigGroup cgIcons(mKdeGlobals, "Icons"); - m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "oxygen"); + m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "breeze"); m_hints[QPlatformTheme::SystemIconFallbackThemeName] = "hicolor"; m_hints[QPlatformTheme::IconThemeSearchPaths] = xdgIconThemePaths(); m_hints[QPlatformTheme::StyleNames] = (QStringList() << cg.readEntry("widgetStyle", QString()) @@ -102,8 +102,9 @@ } QString xdgDirString = QFile::decodeName(qgetenv("XDG_DATA_DIRS")); + if (xdgDirString.isEmpty()) { - xdgDirString = QLatin1String("/usr/local/share/:/usr/share/"); + xdgDirString = QLatin1String("/usr/local/share:/usr/share"); } foreach (const QString &xdgDir, xdgDirString.split(QLatin1Char(':'))) { @@ -204,7 +205,7 @@ KIconLoader::Group iconGroup = (KIconLoader::Group) group; if (iconGroup != KIconLoader::MainToolbar) { KConfigGroup cgIcons(mKdeGlobals, "Icons"); - m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "oxygen"); + m_hints[QPlatformTheme::SystemIconThemeName] = cgIcons.readEntry("Theme", "breeze"); return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org