August 2017 - openSUSE Commits - openSUSE Mailing Lists

commit kgeography for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kgeography for openSUSE:Factory checked in at 2017-08-28 15:06:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kgeography (Old) and /work/SRC/openSUSE:Factory/.kgeography.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kgeography" Mon Aug 28 15:06:50 2017 rev:86 rq:516362 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kgeography/kgeography.changes 2017-07-29 08:57:30.633862378 +0200 +++ /work/SRC/openSUSE:Factory/.kgeography.new/kgeography.changes 2017-08-28 15:07:04.369875105 +0200 @@ -1,0 +2,20 @@ +Fri Aug 11 22:45:29 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use override + * Use Q_DECLARE_OVERRIDE + * No need for a new function, just make the old one public + * Add location name in results table + +------------------------------------------------------------------- +Sat Aug 5 18:17:44 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kgeography-17.04.3.tar.xz New: ---- kgeography-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kgeography.spec ++++++ --- /var/tmp/diff_new_pack.lXXXdM/_old 2017-08-28 15:07:05.393731085 +0200 +++ /var/tmp/diff_new_pack.lXXXdM/_new 2017-08-28 15:07:05.397730523 +0200 @@ -1,7 +1,7 @@ # # spec file for package kgeography # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kgeography -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Geography Trainer License: GPL-2.0+ @@ -46,7 +47,9 @@ BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -76,13 +79,13 @@ %files %defattr(-,root,root) -%{_kf5_bindir}/kgeography +%dir %{_kf5_configkcfgdir} +%doc %lang(en) %{_kf5_htmldir}/en/kgeography/ %{_kf5_applicationsdir}/org.kde.kgeography.desktop -%{_kf5_htmldir}/en/kgeography/ -%{_kf5_iconsdir}/hicolor/*/apps/kgeography.* %{_kf5_appsdir}/kgeography/ -%dir %{_kf5_configkcfgdir} +%{_kf5_bindir}/kgeography %{_kf5_configkcfgdir}/kgeography.kcfg +%{_kf5_iconsdir}/hicolor/*/apps/kgeography.* %{_kf5_kxmlguidir}/kgeography/ %if %{with lang} ++++++ kgeography-17.04.3.tar.xz -> kgeography-17.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kgeography/kgeography-17.04.3.tar.xz /work/SRC/openSUSE:Factory/.kgeography.new/kgeography-17.08.0.tar.xz differ: char 26, line 1

1 0

commit kfourinline for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kfourinline for openSUSE:Factory checked in at 2017-08-28 15:06:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfourinline (Old) and /work/SRC/openSUSE:Factory/.kfourinline.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfourinline" Mon Aug 28 15:06:48 2017 rev:65 rq:516361 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfourinline/kfourinline.changes 2017-07-29 08:57:28.470168070 +0200 +++ /work/SRC/openSUSE:Factory/.kfourinline.new/kfourinline.changes 2017-08-28 15:07:01.354299286 +0200 @@ -1,0 +2,27 @@ +Fri Aug 11 22:45:28 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use Q_DECLARE_OVERRIDE + * Silence unused variable warnings. + * Do not require KCompletion. + * Port away from KDELibs4Support. + * Port away from KFileDialog. + * Port from KDialog to QDialog + * Port away from KButtonGroup. + * Port away from KStandardDirs. + * Port away from KVBox. + * Convert KF5 includes to camelCase. + * remove obsolete LSM file + +------------------------------------------------------------------- +Sat Aug 5 18:17:43 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kfourinline-17.04.3.tar.xz New: ---- kfourinline-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfourinline.spec ++++++ --- /var/tmp/diff_new_pack.dYuwXy/_old 2017-08-28 15:07:02.118191834 +0200 +++ /var/tmp/diff_new_pack.dYuwXy/_new 2017-08-28 15:07:02.122191272 +0200 @@ -1,7 +1,7 @@ # # spec file for package kfourinline # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,36 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kfourinline -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Four Wins game License: LGPL-2.0+ Group: Amusements/Toys/Other Url: http://www.kde.org Source0: kfourinline-%{version}.tar.xz -BuildRequires: libkdegames-devel BuildRequires: extra-cmake-modules -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: kcompletion-devel BuildRequires: kconfig-devel +BuildRequires: kconfigwidgets-devel BuildRequires: kcoreaddons-devel BuildRequires: kcrash-devel -BuildRequires: ki18n-devel +BuildRequires: kdelibs4support-devel BuildRequires: kdnssd-framework-devel -BuildRequires: kconfigwidgets-devel -BuildRequires: kcompletion-devel +BuildRequires: ki18n-devel BuildRequires: kxmlgui-devel -BuildRequires: kdelibs4support-devel +BuildRequires: libkdegames-devel BuildRequires: update-desktop-files +BuildRequires: pkgconfig(Qt5Svg) +BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,14 +76,14 @@ %files %defattr(-,root,root) %doc COPYING COPYING.DOC -%{_kf5_bindir}/kfourinline -%{_kf5_bindir}/kfourinlineproc +%dir %{_kf5_configkcfgdir} +%doc %lang(en) %{_kf5_htmldir}/en/kfourinline/ %{_kf5_applicationsdir}/org.kde.kfourinline.desktop -%{_kf5_htmldir}/en/kfourinline/ %{_kf5_appsdir}/kfourinline/ -%{_kf5_iconsdir}/hicolor/*/*/kfourinline.* -%dir %{_kf5_configkcfgdir} +%{_kf5_bindir}/kfourinline +%{_kf5_bindir}/kfourinlineproc %{_kf5_configkcfgdir}/kwin4.kcfg +%{_kf5_iconsdir}/hicolor/*/*/kfourinline.* %{_kf5_kxmlguidir}/kfourinline/ %if %{with lang} ++++++ kfourinline-17.04.3.tar.xz -> kfourinline-17.08.0.tar.xz ++++++ ++++ 25812 lines of diff (skipped)

1 0

commit kfind for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kfind for openSUSE:Factory checked in at 2017-08-28 15:06:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfind (Old) and /work/SRC/openSUSE:Factory/.kfind.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfind" Mon Aug 28 15:06:45 2017 rev:9 rq:516359 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfind/kfind.changes 2017-07-29 08:57:19.923375580 +0200 +++ /work/SRC/openSUSE:Factory/.kfind.new/kfind.changes 2017-08-28 15:06:57.786801102 +0200 @@ -1,0 +2,30 @@ +Fri Aug 11 22:45:27 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Fix duplicate code + * Remove some kdelibs4support class + * Port to QFileDialog + * Port to debug categories + * Minor + * Increase minimum version + * Use explicit + * Fix open regexpeditor + * Coding style + * Ignore files + * Fix clazy warning + * Fix indent + * Update copyright + * Use KDE_APPLICATIONS_VERSION + +------------------------------------------------------------------- +Sat Aug 5 18:17:41 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kfind-17.04.3.tar.xz New: ---- kfind-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfind.spec ++++++ --- /var/tmp/diff_new_pack.q9FaJL/_old 2017-08-28 15:06:58.602686337 +0200 +++ /var/tmp/diff_new_pack.q9FaJL/_new 2017-08-28 15:06:58.606685774 +0200 @@ -19,15 +19,15 @@ %bcond_without lang Name: kfind -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE Find File Utility License: GPL-2.0+ Group: Productivity/File utilities -Url: http://www.kde.org +Url: http://www.kde.org/ Source: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: hicolor-icon-theme @@ -36,7 +36,9 @@ BuildRequires: kdoctools-devel >= 5.7.0 BuildRequires: kf5-filesystem BuildRequires: update-desktop-files +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,16 +76,17 @@ %files %defattr(-,root,root) -#doc COPYING* README -%{_kf5_bindir}/kfind -%{_kf5_applicationsdir}/org.kde.kfind.desktop +%doc COPYING* +%config %{_kf5_configdir}/*.categories %dir %{_kf5_appstreamdir} -%{_kf5_appstreamdir}/org.kde.kfind.appdata.xml -%{_kf5_iconsdir}/hicolor/*/apps/kfind.* -%dir %{_kf5_htmldir}/en %dir %{_kf5_htmldir} -%doc %{_kf5_htmldir}/en/kfind/ +%dir %{_kf5_htmldir}/en +%doc %lang(en) %{_kf5_htmldir}/en/kfind/ %doc %{_kf5_mandir}/man1/kfind.* +%{_kf5_applicationsdir}/org.kde.kfind.desktop +%{_kf5_appstreamdir}/org.kde.kfind.appdata.xml +%{_kf5_bindir}/kfind +%{_kf5_iconsdir}/hicolor/*/apps/kfind.* %if %{with lang} %files lang -f %{name}.lang ++++++ kfind-17.04.3.tar.xz -> kfind-17.08.0.tar.xz ++++++ ++++ 46073 lines of diff (skipped)

1 0

commit kfilereplace for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kfilereplace for openSUSE:Factory checked in at 2017-08-28 15:06:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kfilereplace (Old) and /work/SRC/openSUSE:Factory/.kfilereplace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kfilereplace" Mon Aug 28 15:06:41 2017 rev:9 rq:516358 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kfilereplace/kfilereplace.changes 2017-07-29 08:57:16.847810103 +0200 +++ /work/SRC/openSUSE:Factory/.kfilereplace.new/kfilereplace.changes 2017-08-28 15:06:56.211022756 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:45:27 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * None + +------------------------------------------------------------------- +Sat Aug 5 18:17:40 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kfilereplace-17.04.3.tar.xz New: ---- kfilereplace-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kfilereplace.spec ++++++ --- /var/tmp/diff_new_pack.uCkang/_old 2017-08-28 15:06:57.002911367 +0200 +++ /var/tmp/diff_new_pack.uCkang/_new 2017-08-28 15:06:57.030907428 +0200 @@ -17,10 +17,10 @@ Name: kfilereplace -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Search & Replace Tool License: GPL-2.0+ ++++++ kfilereplace-17.04.3.tar.xz -> kfilereplace-17.08.0.tar.xz ++++++

1 0

commit keditbookmarks for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package keditbookmarks for openSUSE:Factory checked in at 2017-08-28 15:06:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/keditbookmarks (Old) and /work/SRC/openSUSE:Factory/.keditbookmarks.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "keditbookmarks" Mon Aug 28 15:06:38 2017 rev:9 rq:516357 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/keditbookmarks/keditbookmarks.changes 2017-07-29 08:57:15.723968881 +0200 +++ /work/SRC/openSUSE:Factory/.keditbookmarks.new/keditbookmarks.changes 2017-08-28 15:06:54.119316982 +0200 @@ -1,0 +2,18 @@ +Fri Aug 11 22:45:26 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Update copyright + fix hdpi support + * Fix clazy warning + +------------------------------------------------------------------- +Sat Aug 5 18:17:39 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- keditbookmarks-17.04.3.tar.xz New: ---- keditbookmarks-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ keditbookmarks.spec ++++++ --- /var/tmp/diff_new_pack.HVjytb/_old 2017-08-28 15:06:54.911205592 +0200 +++ /var/tmp/diff_new_pack.HVjytb/_new 2017-08-28 15:06:54.919204467 +0200 @@ -19,15 +19,15 @@ %bcond_without lang Name: keditbookmarks -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: KDE Bookmark Editor License: GPL-2.0 Group: System/GUI/KDE -Url: http://www.kde.org +Url: http://www.kde.org/ Source: %{name}-%{version}.tar.xz BuildRequires: extra-cmake-modules BuildRequires: kbookmarks-devel >= 5.24.0 @@ -43,7 +43,9 @@ BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) >= 5.4.0 BuildRequires: pkgconfig(Qt5Test) >= 5.4.0 +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -73,15 +75,15 @@ %files %defattr(-,root,root) %doc COPYING* +%dir %{_kf5_configkcfgdir} +%doc %lang(en) %{_kf5_htmldir}/en/keditbookmarks/ +%{_kf5_applicationsdir}/org.kde.keditbookmarks.desktop %{_kf5_bindir}/kbookmarkmerger %{_kf5_bindir}/keditbookmarks -%{_kf5_applicationsdir}/org.kde.keditbookmarks.desktop +%{_kf5_configkcfgdir}/keditbookmarks*.kcfg %{_kf5_libdir}/libkbookmarkmodel_private.so* %{_kf5_sharedir}/kxmlgui5/keditbookmarks/ -%dir %{_kf5_configkcfgdir} -%{_kf5_configkcfgdir}/keditbookmarks*.kcfg -%{_kf5_htmldir}/en/keditbookmarks/ -%{_mandir}/man1/kbookmarkmerger.1%{ext_man} +%{_kf5_mandir}/man1/kbookmarkmerger.1%{ext_man} %if %{with lang} %files lang -f %{name}.lang ++++++ keditbookmarks-17.04.3.tar.xz -> keditbookmarks-17.08.0.tar.xz ++++++ ++++ 11235 lines of diff (skipped)

1 0

commit kdiamond for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kdiamond for openSUSE:Factory checked in at 2017-08-28 15:06:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiamond (Old) and /work/SRC/openSUSE:Factory/.kdiamond.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdiamond" Mon Aug 28 15:06:34 2017 rev:64 rq:516355 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdiamond/kdiamond.changes 2017-07-29 08:57:13.000353680 +0200 +++ /work/SRC/openSUSE:Factory/.kdiamond.new/kdiamond.changes 2017-08-28 15:06:49.851917246 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:45:25 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Use Q_DECLARE_OVERRIDE + +------------------------------------------------------------------- +Sat Aug 5 18:17:38 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kdiamond-17.04.3.tar.xz New: ---- kdiamond-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiamond.spec ++++++ --- /var/tmp/diff_new_pack.MJZAlB/_old 2017-08-28 15:06:50.919767040 +0200 +++ /var/tmp/diff_new_pack.MJZAlB/_new 2017-08-28 15:06:50.967760289 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdiamond # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kdiamond -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Single player puzzle game License: GPL-2.0+ @@ -48,7 +49,9 @@ BuildRequires: pkgconfig(Qt5Widgets) Obsoletes: %{name}5 < %{version} Provides: %{name}5 = %{version} +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -74,16 +77,16 @@ %files %defattr(-,root,root) -%doc COPYING COPYING.DOC -%{_kf5_bindir}/kdiamond +%doc COPYING* +%doc %lang(en) %{_kf5_htmldir}/en/kdiamond/ %{_kf5_applicationsdir}/org.kde.kdiamond.desktop -%{_kf5_htmldir}/en/kdiamond/ +%{_kf5_bindir}/kdiamond +%config %{_kf5_configdir}/kdiamond.knsrc %{_kf5_iconsdir}/hicolor/*/apps/kdiamond.* -%{_datadir}/kdiamond/ -%{_kf5_configdir}/kdiamond.knsrc -%{_datadir}/sounds/KDiamond-* -%{_datadir}/knotifications5/kdiamond.notifyrc -%{_datadir}/kxmlgui5/kdiamond/ +%{_kf5_kxmlguidir}/kdiamond/ +%{_kf5_notifydir}/kdiamond.notifyrc +%{_kf5_sharedir}/kdiamond/ +%{_kf5_sharedir}/sounds/KDiamond-* %if %{with lang} %files lang -f %{name}.lang ++++++ kdiamond-17.04.3.tar.xz -> kdiamond-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/de/docs/kdiamond/index.docbook new/kdiamond-17.08.0/po/de/docs/kdiamond/index.docbook --- old/kdiamond-17.04.3/po/de/docs/kdiamond/index.docbook 2017-07-11 02:21:42.000000000 +0200 +++ new/kdiamond-17.08.0/po/de/docs/kdiamond/index.docbook 2017-08-11 02:39:30.000000000 +0200 @@ -345,7 +345,7 @@ >Hilfe</guimenu >, weitere Informationen dazu finden Sie in den Abschnitten über die Menüs <ulink url="help:/fundamentals/ui.html#menus-settings" >Einstellungen</ulink -> und <ulink url="help:/fundamentals/uihtml#menus-help" +> und <ulink url="help:/fundamentals/ui.html#menus-help" >Hilfe</ulink > der &kde;-Grundlagen. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/pt/docs/kdiamond/index.docbook new/kdiamond-17.08.0/po/pt/docs/kdiamond/index.docbook --- old/kdiamond-17.04.3/po/pt/docs/kdiamond/index.docbook 2017-07-11 02:21:42.000000000 +0200 +++ new/kdiamond-17.08.0/po/pt/docs/kdiamond/index.docbook 2017-08-11 02:39:30.000000000 +0200 @@ -1,12 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ -<!ENTITY kdiamond "<application ->KDiamond</application ->"> -<!ENTITY kappname "&kdiamond;"> -<!ENTITY package "kdegames"> -<!ENTITY % Portuguese "INCLUDE" -> +<!ENTITY % Portuguese "INCLUDE"> <!ENTITY % addindex "IGNORE"> ]> @@ -51,14 +45,14 @@ <holder >Stefan Majewsky</holder> </copyright> - + <legalnotice >&FDLNotice;</legalnotice> <date ->2010-01-21</date> +>2016-05-09</date> <releaseinfo ->1.3.1</releaseinfo> +>1.5 (Aplicações 16.04)</releaseinfo> <abstract> <para @@ -86,6 +80,18 @@ <para >O &kdiamond; é um jogo de 'puzzle' apenas para um jogador. </para> +<screenshot> +<mediaobject> +<imageobject> +<imagedata fileref="gameboard.png" format="PNG"/> +</imageobject> +<textobject> +<phrase +>Tabuleiro de jogo do &kdiamond;</phrase> +</textobject> +</mediaobject> +</screenshot> + <para >O objectivo do jogo é criar linhas com três diamantes semelhantes. </para> </chapter> @@ -141,11 +147,9 @@ <title >Apresentação à Interface</title> -<sect1 id="game-menu"> - <title ->O Menu <guimenu ->Jogo</guimenu -></title> +<sect1 id="menu"> +<title +>Opções do Menu</title> <variablelist> <varlistentry> @@ -180,7 +184,7 @@ >Jogo</guimenu > <guimenuitem >Pausa</guimenuitem -></menuchoice +> </menuchoice ></term> <listitem> <para @@ -201,7 +205,7 @@ >Jogo</guimenu > <guimenuitem >Mostrar os Recordes</guimenuitem -></menuchoice +> </menuchoice ></term> <listitem> <para @@ -229,17 +233,7 @@ >Sai do programa. </para> </listitem> </varlistentry> -</variablelist> - -</sect1> - -<sect1 id="move-menu"> -<title ->O Menu <guimenu ->Mover</guimenu -></title> -<variablelist> <varlistentry> <term ><menuchoice @@ -258,47 +252,6 @@ >Realça um diamante que poderá ser movido. </para> </listitem> </varlistentry> -</variablelist> - -</sect1> - -<sect1 id="settings-menu"> -<title ->O Menu <guimenu ->Configuração</guimenu -></title> - -<variablelist> - -<varlistentry> -<term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Mostrar a Barra de Ferramentas</guimenuitem -> </menuchoice -></term> -<listitem> -<para ->Activa ou desactiva a visibilidade da barra de ferramentas. </para> -</listitem> -</varlistentry> - -<varlistentry> -<term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Mostrar a Barra de Estado</guimenuitem -> </menuchoice -></term> -<listitem> -<para ->Activa ou desactiva a visibilidade da barra de estado. </para> -</listitem> -</varlistentry> <varlistentry> <term @@ -355,40 +308,8 @@ ><guimenu >Configuração</guimenu > <guimenuitem ->Configurar os Atalhos...</guimenuitem -> </menuchoice -></term> -<listitem -><para> -<action ->Abre uma janela que lhe permite definir de novo todos os atalhos de teclado.</action> -</para -></listitem> -</varlistentry> - -<varlistentry> -<term -><menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Configurar as Barras de Ferramentas...</guimenuitem -> </menuchoice -></term> -<listitem -><para ->Mostra a janela normal do &kde; para configurar os ícones da barra de ferramentas.</para -></listitem> -</varlistentry> - -<varlistentry> -<term -><menuchoice -><guimenu ->Configuração</guimenu -><guimenuitem >Configurar as Notificações...</guimenuitem -></menuchoice +> </menuchoice ></term> <listitem ><para @@ -412,14 +333,19 @@ </varlistentry> </variablelist> -</sect1> -<sect1 id="help"> -<title ->O Menu <guimenu +<para +>Para além disso, o &kdiamond; tem os menus de <guimenu +>Configuração</guimenu +> e <guimenu >Ajuda</guimenu -></title> -&help.menu.documentation; </sect1> +> normais do &kde;; para mais informações, leia as secções acerca dos menus de <ulink url="help:/fundamentals/ui.html#menus-settings" +>Configuração</ulink +> e <ulink url="help:/fundamentals/ui.html#menus-help" +>Ajuda</ulink +> dos Fundamentos do &kde;. </para> + +</sect1> <sect1 id="keybindings"> <title id="keybindings-title" @@ -529,23 +455,7 @@ > &underFDL; &underGPL; </chapter> -<appendix id="installation"> -<title ->Instalação</title> - -<sect1 id="getting-kdiamond"> -<title ->Como obter o &kdiamond;</title> -&install.intro.documentation; </sect1> - -<sect1 id="compilation"> -<title ->Compilação e Instalação</title> -&install.compile.documentation; </sect1> -</appendix> - - -&documentation.index; +&documentation.index; </book> <!-- Local Variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/tr/kdiamond.po new/kdiamond-17.08.0/po/tr/kdiamond.po --- old/kdiamond-17.04.3/po/tr/kdiamond.po 2017-07-11 02:21:42.000000000 +0200 +++ new/kdiamond-17.08.0/po/tr/kdiamond.po 2017-08-11 02:39:30.000000000 +0200 @@ -13,8 +13,8 @@ "POT-Creation-Date: 2016-11-19 20:14+0100\n" "PO-Revision-Date: 2014-06-08 13:55+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" -"Language-Team: Turkish " -"(http://www.transifex.com/projects/p/kdegames-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/kdegames-k-tr/" +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -191,6 +191,6 @@ "or multiple lines at one time.</p>" msgstr "" "<h3>Oyun Kuralları</h3><p>Amacınız en az üç benzer elmastan oluşan diziler " -"oluşturmaktır. Yerlerini değiştirmek için iki komşu elmas üzerine " -"tıklayın.</p><p>Katlar inşa ederek fazladan puan ve aynı anda uzun dizeler " -"ya da çoklu dizeler oluşturarak fazladan saniyeler kazanın.</p>" +"oluşturmaktır. Yerlerini değiştirmek için iki komşu elmas üzerine tıklayın.</" +"p><p>Katlar inşa ederek fazladan puan ve aynı anda uzun dizeler ya da çoklu " +"dizeler oluşturarak fazladan saniyeler kazanın.</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/po/zh_CN/kdiamond.po new/kdiamond-17.08.0/po/zh_CN/kdiamond.po --- old/kdiamond-17.04.3/po/zh_CN/kdiamond.po 2017-07-11 02:21:42.000000000 +0200 +++ new/kdiamond-17.08.0/po/zh_CN/kdiamond.po 2017-08-11 02:39:30.000000000 +0200 @@ -1,22 +1,20 @@ -# translation of kdiamond.po to 简体中文 -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Ni Hui <shuizhuyuanluo(a)126.com>, 2008, 2010. msgid "" msgstr "" -"Project-Id-Version: kdiamond\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:14+0100\n" -"PO-Revision-Date: 2010-07-27 21:41+0800\n" -"Last-Translator: Ni Hui <shuizhuyuanluo(a)126.com>\n" -"Language-Team: Chinese Simplified <kde-china(a)kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:35-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" +"Language-Team: Chinese Simplified\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.1\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdegames/kdiamond.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -190,52 +188,3 @@ "<h3>游戏规则</h3><p>您的目标就是将至少三个相同钻石连成线。在两颗钻石上分别点" "击便能交换它们。</p><p>建立连锁消去能赢得额外的分数，一次连成长串或多行钻石可" "赢得额外时间。</p>" - -#~ msgid "Theme" -#~ msgstr "主题" - -#~ msgid "The graphical theme to be used." -#~ msgstr "要使用的图形主题。" - -#~ msgid "Start with Very Easy difficulty level" -#~ msgstr "以非常简单难度开始" - -#~ msgid "Start with Easy difficulty level" -#~ msgstr "以简单难度开始" - -#~ msgid "Start with Medium difficulty level" -#~ msgstr "以中等难度开始" - -#~ msgid "Start with Hard difficulty level" -#~ msgstr "以困难难度开始" - -#~ msgid "Start with Very Hard difficulty level" -#~ msgstr "以非常困难难度开始" - -#~ msgid "The difficulty level." -#~ msgstr "难度级别。" - -#~ msgid "Failed to load \"%1\" theme. Please check your installation." -#~ msgstr "装入“%1”主题失败。请检查您的安装。" - -#~ msgid "Time left: 1 second" -#~ msgid_plural "Time left: %1 seconds" -#~ msgstr[0] "剩余时间：%1 秒" - -#~ msgid "1 second" -#~ msgid_plural "%1 seconds" -#~ msgstr[0] "%1 秒" - -#~ msgid "1 minute" -#~ msgid_plural "%1 minutes" -#~ msgstr[0] "%1 分钟" - -#~ msgctxt "The two parameters are strings like '2 minutes' or '1 second'." -#~ msgid "Time left: %1, %2" -#~ msgstr "剩余时间：%1，%2" - -#~ msgid "Show minutes on timer" -#~ msgstr "在计时器中显示分钟数" - -#~ msgid "Show minutes separately on the timer." -#~ msgstr "在计时器中单独显示分钟数。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/board.h new/kdiamond-17.08.0/src/board.h --- old/kdiamond-17.04.3/src/board.h 2017-06-18 05:31:54.000000000 +0200 +++ new/kdiamond-17.08.0/src/board.h 2017-07-15 16:14:38.000000000 +0200 @@ -49,8 +49,8 @@ KGameRenderer *renderer() const; - virtual QRectF boundingRect() const; - virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0); + QRectF boundingRect() const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0) Q_DECL_OVERRIDE; public Q_SLOTS: void setPaused(bool paused); Q_SIGNALS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/diamond.h new/kdiamond-17.08.0/src/diamond.h --- old/kdiamond-17.04.3/src/diamond.h 2017-06-18 05:31:54.000000000 +0200 +++ new/kdiamond-17.08.0/src/diamond.h 2017-07-15 16:14:38.000000000 +0200 @@ -49,9 +49,9 @@ void clicked(); void dragged(const QPoint &direction); protected: - virtual void mousePressEvent(QGraphicsSceneMouseEvent *); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *); + void mousePressEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *) Q_DECL_OVERRIDE; private: KDiamond::Color m_color; bool m_mouseDown; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/game-state.h new/kdiamond-17.08.0/src/game-state.h --- old/kdiamond-17.04.3/src/game-state.h 2017-06-18 05:31:54.000000000 +0200 +++ new/kdiamond-17.08.0/src/game-state.h 2017-07-15 16:14:38.000000000 +0200 @@ -65,7 +65,7 @@ void pointsChanged(int points); void leftTimeChanged(int seconds); protected: - virtual void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; private: GameStatePrivate *p; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/game.h new/kdiamond-17.08.0/src/game.h --- old/kdiamond-17.04.3/src/game.h 2017-06-18 05:31:54.000000000 +0200 +++ new/kdiamond-17.08.0/src/game.h 2017-07-15 16:14:38.000000000 +0200 @@ -62,7 +62,7 @@ void numberMoves(int moves); void pendingAnimationsFinished(); protected: - virtual void timerEvent(QTimerEvent *event); + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; private: QList<QPoint> findCompletedRows(); void getMoves(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdiamond-17.04.3/src/view.h new/kdiamond-17.08.0/src/view.h --- old/kdiamond-17.04.3/src/view.h 2017-06-18 05:31:54.000000000 +0200 +++ new/kdiamond-17.08.0/src/view.h 2017-07-15 16:14:38.000000000 +0200 @@ -31,8 +31,8 @@ void setScene(QGraphicsScene *scene); protected: - virtual void resizeEvent(QResizeEvent *event); - virtual void wheelEvent(QWheelEvent *event); + void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; }; }

1 0

commit kdf for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kdf for openSUSE:Factory checked in at 2017-08-28 15:06:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdf (Old) and /work/SRC/openSUSE:Factory/.kdf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdf" Mon Aug 28 15:06:28 2017 rev:75 rq:516353 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdf/kdf.changes 2017-07-29 08:57:01.413990628 +0200 +++ /work/SRC/openSUSE:Factory/.kdf.new/kdf.changes 2017-08-28 15:06:48.224146214 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:45:24 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Fix filesytem type detection on FreeBSD + +------------------------------------------------------------------- +Sat Aug 5 18:17:36 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kdf-17.04.3.tar.xz New: ---- kdf-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdf.spec ++++++ --- /var/tmp/diff_new_pack.ZMLK4g/_old 2017-08-28 15:06:48.956043262 +0200 +++ /var/tmp/diff_new_pack.ZMLK4g/_new 2017-08-28 15:06:48.964042138 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdf # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kdf -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Disk Usage Viewer License: GPL-2.0+ @@ -44,7 +45,9 @@ BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5Gui) BuildRequires: cmake(Qt5Widgets) +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -83,23 +86,23 @@ %files %defattr(-,root,root) %doc COPYING* -%{_kf5_bindir}/kdf -%{_kf5_plugindir}/libkcm_kdf.so -%{_kf5_applicationsdir}/org.kde.kdf.desktop -%{_kf5_htmldir}/en/kdf/ %dir %{_kf5_htmldir}/en/kcontrol/ -%{_kf5_htmldir}/en/kcontrol/blockdevices/ -%{_kf5_iconsdir}/hicolor/*/*/kdf.png +%doc %lang(en) %{_kf5_htmldir}/en/kcontrol/blockdevices/ +%doc %lang(en) %{_kf5_htmldir}/en/kdf/ +%{_kf5_applicationsdir}/org.kde.kdf.desktop +%{_kf5_bindir}/kdf %{_kf5_iconsdir}/hicolor/*/*/kcmdf.png -%{_kf5_sharedir}/kxmlgui5/kdf/ -%{_kf5_servicesdir}/kcmdf.desktop +%{_kf5_iconsdir}/hicolor/*/*/kdf.png %{_kf5_libdir}/libkdfprivate.so.* +%{_kf5_plugindir}/libkcm_kdf.so +%{_kf5_servicesdir}/kcmdf.desktop +%{_kf5_kxmlguidir}/kdf/ %files -n kwikdisk %defattr(-,root,root) %doc COPYING* -%{_kf5_bindir}/kwikdisk %{_kf5_applicationsdir}/org.kde.kwikdisk.desktop +%{_kf5_bindir}/kwikdisk %{_kf5_iconsdir}/hicolor/*/*/kwikdisk.png %if %{with lang} ++++++ kdf-17.04.3.tar.xz -> kdf-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/CMakeLists.txt new/kdf-17.08.0/CMakeLists.txt --- old/kdf-17.04.3/CMakeLists.txt 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/CMakeLists.txt 2017-08-11 02:34:45.000000000 +0200 @@ -4,8 +4,8 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "17") -set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") if(NOT UNIX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/bg/kdf.po new/kdf-17.08.0/po/bg/kdf.po --- old/kdf-17.04.3/po/bg/kdf.po 2017-07-11 02:19:34.000000000 +0200 +++ new/kdf-17.08.0/po/bg/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -1,8 +1,5 @@ -# translation of kdf.po to Bulgarian -# Bulgarian translation of KDE. -# This file is licensed under the GPL. -# -# $Id: kdf.po 1475095 2016-11-19 20:01:24Z scripty $ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. # # Zlatko Popov <zlatkopopov(a)fsa-bg.org>, 2006, 2007. # Yasen Pramatarov <yasen(a)lindeas.com>, 2011. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/de/docs/kdf/index.docbook new/kdf-17.08.0/po/de/docs/kdf/index.docbook --- old/kdf-17.04.3/po/de/docs/kdf/index.docbook 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/po/de/docs/kdf/index.docbook 2017-08-11 02:34:45.000000000 +0200 @@ -266,7 +266,7 @@ >Hilfe</guimenu >, weitere Informationen dazu finden Sie in den Abschnitten über die Menüs <ulink url="help:/fundamentals/ui.html#menus-settings" >Einstellungen</ulink -> und <ulink url="help:/fundamentals/uihtml#menus-help" +> und <ulink url="help:/fundamentals/ui.html#menus-help" >Hilfe</ulink > der &kde;-Grundlagen. </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/he/kdf.po new/kdf-17.08.0/po/he/kdf.po --- old/kdf-17.04.3/po/he/kdf.po 2017-07-11 02:19:34.000000000 +0200 +++ new/kdf-17.08.0/po/he/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -410,51 +410,3 @@ #, kde-format msgid "Mount Commands" msgstr "פקודות חיבור" - -#~ msgid "A test application" -#~ msgstr "יישום ניסיון." - -#, fuzzy -#~ msgid "" -#~ "<h3>Hardware Information</h3><br /> All the information modules return " -#~ "information about a certain aspect of your computer hardware or your " -#~ "operating system. Not all modules are available on all hardware " -#~ "architectures and/or operating systems." -#~ msgstr "" -#~ "<h1>מידע חומרה</h1> כל מודולי המידע מספקים פרטים על צדדים שונים של החומרה " -#~ "של המחשב שלך או על מערכת ההפעלה שלך. לא כל המודולים זמינים בכל " -#~ "ארכיטקטורות החומרה ו\\או מערכות ההפעלה." - -#~ msgid "Update frequency [seconds]. The value 0 disables update" -#~ msgstr "תדירות עידכון [בשניות]. הערך 0 מבטל עידכונים" - -#, fuzzy -#~ msgid "Mount command:" -#~ msgstr "פקודת חיבור" - -#, fuzzy -#~ msgid "Unmount command:" -#~ msgstr "פקודת ניתוק" - -#~ msgid "" -#~ "This filename is not valid: %1\n" -#~ "It must end with \"_mount\" or \"_unmount\"." -#~ msgstr "" -#~ "שם קובץ זה אינו תקף: %1\n" -#~ "עליו להסתיים ב-\"_mount\" או \"_unmount\"." - -#~ msgid "%1 (%2) %3 on %4" -#~ msgstr "%1 (%2) %3 on %4" - -#, fuzzy -#~ msgctxt "Storage device icon" -#~ msgid "Icon" -#~ msgstr "סמל" - -#, fuzzy -#~ msgctxt "Item on the device information column is visible" -#~ msgid "visible" -#~ msgstr "גלוי" - -#~ msgid "Get Unmount Command" -#~ msgstr "בחר פקודת ניתוק" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/hu/kdf.po new/kdf-17.08.0/po/hu/kdf.po --- old/kdf-17.04.3/po/hu/kdf.po 2017-07-11 02:19:34.000000000 +0200 +++ new/kdf-17.08.0/po/hu/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -11,7 +11,7 @@ "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/is/kdf.po new/kdf-17.08.0/po/is/kdf.po --- old/kdf-17.04.3/po/is/kdf.po 2017-07-11 02:19:34.000000000 +0200 +++ new/kdf-17.08.0/po/is/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -1,19 +1,19 @@ # translation of kdf.po to Icelandic # Pjetur G. Hjaltason <pjetur(a)pjetur.net>, 2003. -# Sveinn í Felli <sveinki(a)nett.is>, 2009, 2010, 2017. +# Sveinn í Felli <sveinki(a)nett.is>, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: kdf\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2017-05-10 14:59+0000\n" -"Last-Translator: Sveinn í Felli <sv1(a)fellsnet.is>\n" -"Language-Team: Icelandic <translation-team-is(a)lists.sourceforge.net>\n" +"PO-Revision-Date: 2010-05-31 12:34+0000\n" +"Last-Translator: Sveinn í Felli <sveinki(a)nett.is>\n" +"Language-Team: Icelandic <kde-isl(a)molar.is>\n" "Language: is\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: KBabel 1.11.4\n" "Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n" "\n" "\n" @@ -201,7 +201,7 @@ #, kde-format msgctxt "Disk percentage" msgid "%1%" -msgstr "%1%" +msgstr "" #: src/kdfwidget.cpp:72 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/pl/kdf.po new/kdf-17.08.0/po/pl/kdf.po --- old/kdf-17.04.3/po/pl/kdf.po 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/po/pl/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -1,5 +1,5 @@ # translation of kdf.po to -# Version: $Revision: 1485886 $ +# Version: $Revision: 1487943 $ # translation of kdf.po to Polish # KTranslator Generated File # Michał Rudolf <mrudolf(a)kdewebdev.org>, 2002. @@ -11,7 +11,7 @@ "Project-Id-Version: kdf\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2017-03-25 06:16+0100\n" +"PO-Revision-Date: 2017-04-22 07:34+0100\n" "Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" @@ -65,8 +65,8 @@ "A right mouse button click opens a context menu to mount/unmount a device or " "to open it in the file manager." msgstr "" -"Prawy przycisk myszy otwiera menu podręczne do podpięcia/odmontowywania " -"urządzeń i otwierania ich w przeglądarce plików." +"Prawy przycisk myszy otwiera menu podręczne do podpięcia/odpięcia urządzeń i " +"otwierania ich w przeglądarce plików." #: src/kdf.cpp:37 #, kde-format @@ -122,7 +122,7 @@ #, kde-format msgctxt "Mount point of the storage" msgid "Mount Point" -msgstr "Punkt podpięcia" +msgstr "Punkt podpięca" #: src/kdfconfig.cpp:56 src/kdfwidget.cpp:73 #, kde-format @@ -188,7 +188,7 @@ #: src/kdfconfig.ui:55 #, kde-format msgid "Open file manager automatically on mount" -msgstr "Otwieraj przeglądarkę plików po podpięciu" +msgstr "Otwórz przeglądarkę plików po podpięciu" #. i18n: ectx: property (text), widget (QCheckBox, mPopupFullCheck) #: src/kdfconfig.ui:62 @@ -248,7 +248,7 @@ #: src/kdfwidget.cpp:438 src/kdfwidget.cpp:441 #, kde-format msgid "MOUNTING" -msgstr "Podpinanie" +msgstr "PODPINANIE" #: src/kwikdisk.cpp:58 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/pt/docs/kcontrol/blockdevices/index.docbook new/kdf-17.08.0/po/pt/docs/kcontrol/blockdevices/index.docbook --- old/kdf-17.04.3/po/pt/docs/kcontrol/blockdevices/index.docbook 1970-01-01 01:00:00.000000000 +0100 +++ new/kdf-17.08.0/po/pt/docs/kcontrol/blockdevices/index.docbook 2017-08-11 02:34:45.000000000 +0200 @@ -0,0 +1,135 @@ +<?xml version="1.0" ?> +<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ +<!ENTITY % addindex "IGNORE"> +<!ENTITY % Portuguese "INCLUDE" +>  +]> + +<article id="block-devices" lang="&language;"> +<title +>Dispositivos de Bloco</title> + +<articleinfo> + +<authorgroup> +<author +><firstname +>Mike</firstname +> <surname +>McBride</surname +> </author> +<othercredit role="translator" +><firstname +>José</firstname +><surname +>Pires</surname +><affiliation +><address +><email +>zepires(a)gmail.com</email +></address +></affiliation +><contrib +>Tradução</contrib +></othercredit +> +</authorgroup> + +<date +>2016-04-14</date> +<releaseinfo +>Aplicações 16.04</releaseinfo> + +<keywordset> +<keyword +>KDE</keyword> +<keyword +>KControl</keyword> +<keyword +>Dispositivos de Bloco</keyword> +<keyword +>Espaço em disco</keyword> +</keywordset> +</articleinfo> + +<sect1> +<title +>Dispositivos de Armazenamento</title> + +<para +>A janela do módulo mostra os dispositivos de ficheiros disponíveis e alguma informação sobre cada dispositivo. Também lhe permite controlar os pontos de montagem e os dispositivos de montagem/desmontagem. </para> + +<para +>Normalmente, são mostradas as seguintes informações nesta secção: </para> + +<itemizedlist> +<listitem +><para +>um ícone que representa o tipo de armazenamento</para +></listitem> +<listitem +><para +>o nome do dispositivo</para +></listitem> +<listitem +><para +>tipo de sistema de ficheiros</para +></listitem> +<listitem +><para +>o tamanho total</para +></listitem> +<listitem +><para +>o ponto de montagem</para +></listitem> +<listitem +><para +>o espaço livre em disco</para +></listitem> +<listitem +><para +>a percentagem de espaço usado, em número e como um gráfico.</para +></listitem> +</itemizedlist> + +<para +>Se carregar com o botão <mousebutton +>esquerdo</mousebutton +> no cabeçalho duma determinada coluna, irá ordenar os dispositivos de acordo com essa variável. Se carregar uma segunda vez com o mesmo botão, ordena na ordem inversa. </para> + +<para +>Se carregar com o botão <mousebutton +>direito</mousebutton +> numa linha, fará aparecer um menu. Se esse dispositivo não estiver montado no momento, a opção <guimenuitem +>Montar o Dispositivo</guimenuitem +> estará disponível. Se o dispositivo estiver montado, poderá ser desmontado ao escolher a opção <guimenuitem +>Desmontar Dispositivo</guimenuitem +>. Se seleccionar a opção <guimenuitem +>Abrir no Gestor de Ficheiros</guimenuitem +>, irá abrir uma nova janela com uma vista gráfica dos ficheiros nesse dispositivo. </para> + +<para +>Os comandos de montagem e desmontagem apropriados, bem como o modo como o gestor de ficheiros é aberto, a partir do menu de contexto, podem ser configurados na aplicação &kdiskfree;. </para> + +<sect2> +<title +>Autor da Secção</title> + +<para +>Esta secção é modificada a partir da documentação do <application +>kdf</application +> que foi criada por &Jonathan.Singer; &Jonathan.Singer.mail;</para> + +<para +>Modificada para o &kde; 2.0 por &Mike.McBride; &Mike.McBride.mail;</para> +<para +>Tradução de José Nuno Pires <email +>zepires(a)gmail.com</email +></para +> + +</sect2> +</sect1> +</article> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/pt/docs/kdf/index.docbook new/kdf-17.08.0/po/pt/docs/kdf/index.docbook --- old/kdf-17.04.3/po/pt/docs/kdf/index.docbook 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/po/pt/docs/kdf/index.docbook 2017-08-11 02:34:45.000000000 +0200 @@ -1,7 +1,6 @@ <?xml version="1.0" ?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ <!ENTITY kappname "&kdiskfree;"> - <!ENTITY package "kdeutils"> <!ENTITY % Portuguese "INCLUDE" >  <!ENTITY % addindex "IGNORE"> @@ -49,9 +48,9 @@ >&FDLNotice;</legalnotice> <date ->2010-01-12</date> +>2016-04-13</date> <releaseinfo ->v0.11 (&kde; 4.4)</releaseinfo> +>Aplicações 16.08</releaseinfo> <abstract ><para @@ -83,12 +82,10 @@ >Introdução</title> <para ->O &kdiskfree; mostra os sistemas de ficheiros disponíveis (partições de discos rígidos, disquetes e &CD; ROMs, <abbrev ->etc.</abbrev ->) juntamente com informações das sua capacidade, espaço livre, tipo e ponto de montagem. Também lhe permite a montagem e desmontagem de discos e visualizá-los num gestor de ficheiros.</para> +>O &kdiskfree; mostra os sistemas de ficheiros disponíveis (partições de discos rígidos, disquetes e &CD; ROMs, unidades USB, &etc;) juntamente com informações das sua capacidade, espaço livre, tipo e ponto de montagem. Também lhe permite a montagem e desmontagem de discos e visualizá-los num gestor de ficheiros.</para> <para ->O &kdiskfree; é parecido com o módulo de Partições do &kinfocenter; mas ocupa menos espaço no ecrã. É útil se quer ter sempre uma janela do &kdiskfree; disponível que o informa do espaço livre.</para> +>O &kdiskfree; é parecido com o módulo de Dispositivos de Armazenamento do &systemsettings;, mas ocupa menos espaço no ecrã. É útil se quer ter sempre uma janela do &kdiskfree; disponível que o informa do espaço livre.</para> </chapter> @@ -107,10 +104,10 @@ >kdf</command ></userinput > na linha de comandos ou seleccione <guimenuitem ->Disk Free</guimenuitem +>KDiskFree</guimenuitem > do grupo <guisubmenu >Sistema</guisubmenu -> no lançador de aplicações. Os comandos padrão do &kde; e &Qt; estão disponíveis, e podem ser listados introduzindo:<userinput +> no lançador de aplicações. Os comandos padrão do &kde; e &Qt; estão disponíveis, e podem ser listados introduzindo <userinput ><command >kdf</command > <option @@ -118,6 +115,19 @@ ></userinput > na linha de comandos.</para> +<para +>Para executar a aplicação como uma 'applet' na bandeja do sistema, use a opção <menuchoice +><guisubmenu +>Sistema</guisubmenu +><guimenuitem +>KwikDisk</guimenuitem +></menuchoice +> no lançador de aplicações.</para> + +<para +>As funcionalidades do &kdiskfree; também estão disponíveis no módulo <guilabel +>Dispositivos de Armazenamento</guilabel +> do &systemsettings; .</para> </sect1> <sect1 id="main-window"> @@ -174,14 +184,6 @@ ></listitem> </itemizedlist> - <para >Se carregar com o botão <mousebutton >esquerdo</mousebutton @@ -195,24 +197,29 @@ >. Seleccionando <guimenuitem >Abrir no Gestor de Ficheiros</guimenuitem > abre uma nova janela com uma vista gráfica dos ficheiros nesse dispositivo.</para> - +<para +>A configuração do gestor de ficheiros usado pelo &kdiskfree; é independente da escola no módulo <guilabel +>Aplicações Predefinidas</guilabel +> do &systemsettings;.</para> </sect1> -<sect1 id="the-menus"> +<sect1 id="menus-and-configuration"> <title ->O menu do &kdiskfree;</title> +>Barra do Menu e Configuração</title> <sect2> <title ->O Menu <guimenu ->Ficheiro</guimenu -></title> +>O Menu Ficheiro</title> <variablelist> <varlistentry> <term> <menuchoice -><guimenu +><shortcut +><keycap +>F5</keycap +></shortcut +> <guimenu >Ficheiro</guimenu > <guimenuitem >Actualizar</guimenuitem @@ -250,44 +257,23 @@ </varlistentry> </variablelist> +<para +>Para além disso, o &kdiskfree; tem os menus de <guimenu +>Configuração</guimenu +> e <guimenu +>Ajuda</guimenu +> normais do &kde;; para mais informações, leia as secções sobre os menus de <ulink url="help:/fundamentals/ui.html#menus-settings" +>Configuração</ulink +> e <ulink url="help:/fundamentals/ui.html#menus-help" +>Ajuda</ulink +> dos Fundamentos do &kde;. </para> + </sect2> <sect2> <title ->O menu e o diálogo <guimenu ->Opções</guimenu -></title> +>A Janela de Configuração</title> -<variablelist> -<varlistentry> -<term> -<menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Configurar os Atalhos...</guimenuitem -></menuchoice> -</term> -<listitem> -<para ->A janela normal do &kde; para configurar os atalhos de teclado.</para> -</listitem> -</varlistentry> - -<varlistentry> -<term> -<menuchoice -><guimenu ->Configuração</guimenu -> <guimenuitem ->Configurar o KDiskFree...</guimenuitem -> </menuchoice> -</term> -<listitem -><para -><action ->Abre um diálogo de configuração.</action -></para> <screenshot> <screeninfo >Ecrã de Configuração do &kdiskfree;</screeninfo> @@ -350,17 +336,8 @@ ></listitem> </varlistentry> </variablelist> -</listitem> -</varlistentry> -</variablelist> -</sect2> -<sect2> -<title ->O menu <guimenu ->Ajuda</guimenu -></title> -&help.menu.documentation; </sect2> +</sect2> </sect1> </chapter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/tr/kdf.po new/kdf-17.08.0/po/tr/kdf.po --- old/kdf-17.04.3/po/tr/kdf.po 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/po/tr/kdf.po 2017-08-11 02:34:44.000000000 +0200 @@ -17,8 +17,8 @@ "POT-Creation-Date: 2016-11-19 20:17+0100\n" "PO-Revision-Date: 2014-06-08 14:02+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" -"Language-Team: Turkish " -"(http://www.transifex.com/projects/p/kdeutils-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/kdeutils-k-tr/" +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/po/zh_CN/kdf.po new/kdf-17.08.0/po/zh_CN/kdf.po --- old/kdf-17.04.3/po/zh_CN/kdf.po 2017-07-11 02:19:35.000000000 +0200 +++ new/kdf-17.08.0/po/zh_CN/kdf.po 2017-08-11 02:34:45.000000000 +0200 @@ -1,24 +1,20 @@ -# translation of kdf.po to zh_CN -# Copyright (C) 2003 Free Software Foundation, Inc. -# -# Li Zongliang <li-zongliang(a)21cn.com>, 2001. -# Xiong Jiang <jxiong(a)offtopic.org>, 2003. -# Lie_Ex <lilith.ex(a)gmail.com>, 2007-2009. -# Weng Xuetian <wengxt(a)gmail.com>, 2016. msgid "" msgstr "" -"Project-Id-Version: kdf\n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2016-04-19 15:35-0800\n" -"Last-Translator: Weng Xuetian <wengxt(a)gmail.com>\n" -"Language-Team: Chinese <kde-i18n-doc(a)kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:36-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" +"Language-Team: Chinese Simplified\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 2.0\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdeutils/kdf.pot\n" #, kde-format msgctxt "NAME OF TRANSLATORS" @@ -405,45 +401,3 @@ #, kde-format msgid "Mount Commands" msgstr "挂载命令" - -#~ msgid "A test application" -#~ msgstr "一个测试程序" - -#~ msgid "" -#~ "<h3>Hardware Information</h3><br /> All the information modules return " -#~ "information about a certain aspect of your computer hardware or your " -#~ "operating system. Not all modules are available on all hardware " -#~ "architectures and/or operating systems." -#~ msgstr "" -#~ "<h3>硬件信息</h3><br /> 所有的信息模块都会返回关于您的计算机硬件或操作系统" -#~ "某一方面的信息。不同硬件体系结构和操作系统上的模块并不相同。" - -#~ msgid "Update frequency [seconds]. The value 0 disables update" -#~ msgstr "更新频率[秒]。0 值代表禁止更新" - -#~ msgid "Mount command:" -#~ msgstr "挂载命令：" - -#~ msgid "Unmount command:" -#~ msgstr "卸载命令：" - -#~ msgid "" -#~ "This filename is not valid: %1\n" -#~ "It must end with \"_mount\" or \"_unmount\"." -#~ msgstr "" -#~ "文件名无效：%1\n" -#~ "它必须以“_mount”或“_unmount”结尾。" - -#~ msgid "%1 (%2) %3 on %4" -#~ msgstr "%4 上的 %1(%2) %3" - -#~ msgctxt "Storage device icon" -#~ msgid "Icon" -#~ msgstr "图标" - -#~ msgctxt "Item on the device information column is visible" -#~ msgid "visible" -#~ msgstr "可见" - -#~ msgid "Get Unmount Command" -#~ msgstr "获取卸载命令" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdf-17.04.3/src/disklist.h new/kdf-17.08.0/src/disklist.h --- old/kdf-17.04.3/src/disklist.h 2017-07-10 00:46:38.000000000 +0200 +++ new/kdf-17.08.0/src/disklist.h 2017-08-08 20:21:26.000000000 +0200 @@ -33,7 +33,7 @@ static QLatin1String DF_Command = QLatin1String( "df" ); -#if defined(Q_OS_LINUX) +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) static QLatin1String DF_Args = QLatin1String( "-kT" ); static const bool No_FS_Type = false; #else

1 0

commit kdesdk-thumbnailers for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kdesdk-thumbnailers for openSUSE:Factory checked in at 2017-08-28 15:06:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk-thumbnailers (Old) and /work/SRC/openSUSE:Factory/.kdesdk-thumbnailers.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk-thumbnailers" Mon Aug 28 15:06:25 2017 rev:53 rq:516352 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk-thumbnailers/kdesdk-thumbnailers.changes 2017-07-29 08:56:58.758365822 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk-thumbnailers.new/kdesdk-thumbnailers.changes 2017-08-28 15:06:46.988320048 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:45:24 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * None + +------------------------------------------------------------------- +Sat Aug 5 18:17:35 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kdesdk-thumbnailers-17.04.3.tar.xz New: ---- kdesdk-thumbnailers-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk-thumbnailers.spec ++++++ --- /var/tmp/diff_new_pack.pMDIFA/_old 2017-08-28 15:06:47.736214847 +0200 +++ /var/tmp/diff_new_pack.pMDIFA/_new 2017-08-28 15:06:47.752212597 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdesdk-thumbnailers # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang Name: kdesdk-thumbnailers -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Translation file thumbnail generators License: GPL-2.0+ @@ -36,7 +37,9 @@ BuildRequires: kio-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Widgets) +%if %{with lang} Recommends: %{name}-lang +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -66,9 +69,9 @@ %files %defattr(-,root,root) %doc COPYING* -%{_kf5_plugindir}/pothumbnail.so %dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/pocreatorsettings.kcfg +%{_kf5_plugindir}/pothumbnail.so %{_kf5_servicesdir}/pothumbnail.desktop %if %{with lang} ++++++ kdesdk-thumbnailers-17.04.3.tar.xz -> kdesdk-thumbnailers-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-thumbnailers-17.04.3/po/tr/pothumbnail.po new/kdesdk-thumbnailers-17.08.0/po/tr/pothumbnail.po --- old/kdesdk-thumbnailers-17.04.3/po/tr/pothumbnail.po 2017-07-11 02:23:55.000000000 +0200 +++ new/kdesdk-thumbnailers-17.08.0/po/tr/pothumbnail.po 2017-08-11 02:44:52.000000000 +0200 @@ -11,8 +11,8 @@ "POT-Creation-Date: 2016-11-19 20:17+0100\n" "PO-Revision-Date: 2014-06-08 14:01+0000\n" "Last-Translator: Volkan Gezer <volkangezer(a)gmail.com>\n" -"Language-Team: Turkish " -"(http://www.transifex.com/projects/p/kdesdk-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/kdesdk-k-tr/" +"language/tr/)\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesdk-thumbnailers-17.04.3/po/zh_CN/pothumbnail.po new/kdesdk-thumbnailers-17.08.0/po/zh_CN/pothumbnail.po --- old/kdesdk-thumbnailers-17.04.3/po/zh_CN/pothumbnail.po 2017-07-11 02:23:55.000000000 +0200 +++ new/kdesdk-thumbnailers-17.08.0/po/zh_CN/pothumbnail.po 2017-08-11 02:44:52.000000000 +0200 @@ -1,21 +1,20 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. -# -# Ni Hui <shuizhuyuanluo(a)126.com>, 2012. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2016-11-19 20:17+0100\n" -"PO-Revision-Date: 2012-05-28 10:03+0800\n" -"Last-Translator: Ni Hui <shuizhuyuanluo(a)126.com>\n" -"Language-Team: Chinese Simplified <kde-china(a)kde.org>\n" +"PO-Revision-Date: 2017-08-05 09:36-0400\n" +"Last-Translator: guoyunhebrave <guoyunhebrave(a)gmail.com>\n" +"Language-Team: Chinese Simplified\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.4\n" +"X-Generator: crowdin.com\n" +"X-Crowdin-Project: kdeorg\n" +"X-Crowdin-Language: zh-CN\n" +"X-Crowdin-File: /kf5-stable/messages/kdesdk/pothumbnail.pot\n" #. i18n: ectx: property (text), widget (QLabel, label) #: pocreatorform.ui:20

1 0

commit kdesdk4-scripts for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kdesdk4-scripts for openSUSE:Factory checked in at 2017-08-28 15:06:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdesdk4-scripts (Old) and /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdesdk4-scripts" Mon Aug 28 15:06:24 2017 rev:54 rq:516351 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdesdk4-scripts/kdesdk4-scripts.changes 2017-07-29 08:56:42.372680832 +0200 +++ /work/SRC/openSUSE:Factory/.kdesdk4-scripts.new/kdesdk4-scripts.changes 2017-08-28 15:06:45.484531575 +0200 @@ -1,0 +2,25 @@ +Fri Aug 11 22:45:22 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : + * Release Simon from the correct branch + * Add translated docs to kio-gdrive + * package proper translations + * config for kirigami2 + * cmakelint.pl - fix a regex + * Bump Krusader version + * Fix downloading docs for Krusader twice + * convert to modern method + * Update to modern method + +------------------------------------------------------------------- +Sat Aug 5 18:17:24 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kde-dev-scripts-17.04.3.tar.xz New: ---- kde-dev-scripts-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdesdk4-scripts.spec ++++++ --- /var/tmp/diff_new_pack.Sv8C4P/_old 2017-08-28 15:06:46.388404434 +0200 +++ /var/tmp/diff_new_pack.Sv8C4P/_new 2017-08-28 15:06:46.392403871 +0200 @@ -1,7 +1,7 @@ # # spec file for package kdesdk4-scripts # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,15 +19,15 @@ %define rname kde-dev-scripts Name: kdesdk4-scripts -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Scripts for KDE Development License: GPL-2.0 and GFDL-1.2 Group: System/GUI/KDE -Url: http://www.kde.org +Url: http://www.kde.org/ Source0: %{rname}-%{version}.tar.xz Patch0: kde-dev-scripts-4.14.3-fix-bashisms.patch BuildRequires: libkde4-devel ++++++ kde-dev-scripts-17.04.3.tar.xz -> kde-dev-scripts-17.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/cmakelint.pl new/kde-dev-scripts-17.08.0/cmakelint.pl --- old/kde-dev-scripts-17.04.3/cmakelint.pl 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/cmakelint.pl 2017-08-10 17:44:14.000000000 +0200 @@ -2,7 +2,7 @@ ############################################################################### # Sanity checks CMakeLists.txt files. # -# Copyright (C) 2006-2012 by Allen Winter <winter(a)kde.org> # +# Copyright (C) 2006-2012,2017 by Allen Winter <winter(a)kde.org> # # Copyright (C) 2008-2010 by Laurent Montel <montel(a)kde.org> # # # # This program is free software; you can redistribute it and/or modify # @@ -34,7 +34,7 @@ use Cwd 'abs_path'; my($Prog) = 'cmakelint.pl'; -my($Version) = '1.30'; +my($Version) = '1.31'; my($help) = ''; my($version) = ''; @@ -170,7 +170,7 @@ 'replace "{$" with "${", or garbage detected'); $issues += &checkLine($line,$linecnt, - '[[^:print:]]\{\$', + '[^[:print:]]\{\$', 'non-printable characters detected'); $issues += &checkLine($line,$linecnt, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/createtarball/config.ini new/kde-dev-scripts-17.08.0/createtarball/config.ini --- old/kde-dev-scripts-17.04.3/createtarball/config.ini 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/createtarball/config.ini 2017-08-10 17:44:14.000000000 +0200 @@ -190,9 +190,8 @@ addPo = krusader kde_release = no translations = yes -version = 2.5.0 +version = 2.6.0 docs = yes -addDocs = krusader [krecipes] mainmodule = extragear @@ -421,14 +420,15 @@ submodule = utils version = 2.1.3 -[kirigami] +[kirigami2] +folder = kirigami gitModule = yes -gitTag = v1.0.0 +gitTag = v2.1.0 mainmodule = extragear submodule = libs -version = 1.0.0 +version = 2.1.1 translations= yes -custompo = libkirigamiplugin_qt +custompo = libkirigami2plugin_qt,kirigami [krita] gitModule = yes @@ -442,19 +442,21 @@ [kio-gdrive] gitModule = yes -gitTag = v1.1.0 +gitTag = v1.1.2 mainmodule = extragear submodule = network -version = 1.1.0 -docs = no +version = 1.1.2 +docs = yes custompo = kio5_gdrive +addDocs = kioslave5/gdrive [simon] gitModule = yes mainmodule = extragear-kde4 l10nmodule = extragear-accessibility submodule = accessibility +gitTag = 0.5 kde_release = no docs = yes translations = yes -version = 0.4.80 +version = 0.4.90 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kde.supp new/kde-dev-scripts-17.08.0/kde.supp --- old/kde-dev-scripts-17.04.3/kde.supp 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/kde.supp 2017-08-10 17:44:14.000000000 +0200 @@ -233,21 +233,38 @@ fun:_ZN6QMutex4lockEv } { - # Qt5 in release mode doesn't see the atomic-operation calls inside QMutex - Qt5_release_lockInternal + # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex + Qt5_lockInternal Helgrind:Race + ... fun:_ZN11QBasicMutex12lockInternalEv } { - # Qt5 in release mode doesn't see the atomic-operation calls inside QMutex - Qt5_release_unlockInternal + # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex + Qt5_unlockInternal Helgrind:Race + ... fun:_ZN11QBasicMutex14unlockInternalEv } { - # Qt5 in release mode doesn't see the atomic-operation calls inside RefCount + # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex + Qt5_QMutex_unlock + Helgrind:Race + ... + fun:_ZN6QMutex6unlockEv +} +{ + # Qt5: helgrind doesn't understand the atomic-operation calls inside QMutex + Qt5_QMutex_lock + Helgrind:Race + ... + fun:_ZN6QMutex4lockEv +} +{ + # Qt5: helgrind doesn't understand the atomic-operation calls Qt5_release_refcount Helgrind:Race + ... fun:_ZN9QtPrivate8RefCount3refEv } { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/adapt_cmakelists_file.pl new/kde-dev-scripts-17.08.0/kf5/adapt_cmakelists_file.pl --- old/kde-dev-scripts-17.04.3/kf5/adapt_cmakelists_file.pl 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/kf5/adapt_cmakelists_file.pl 2017-08-10 17:44:14.000000000 +0200 @@ -16,11 +16,11 @@ $modified = 1; } if (/KDE4_INCLUDE_DIR/) { - $_ =~ s/\${KDE4_INCLUDE_DIR}//; + $_ =~ s/\$\{KDE4_INCLUDE_DIR\}//; $modified = 1; } if (/QT_INCLUDES/ ) { - $_ =~ s/\${QT_INCLUDES}//; + $_ =~ s/\$\{QT_INCLUDES\}//; $modified = 1; } if (/kde4_install_icons/i) { @@ -72,124 +72,124 @@ $modified = 1; } if (/KDE4_KCALCORE_LIBS/) { - $_ =~ s/\${KDE4_KCALCORE_LIBS}/KF5::CalendarCore/; + $_ =~ s/\$\{KDE4_KCALCORE_LIBS\}/KF5::CalendarCore/; $modified = 1; } if (/KDE4_KMIME_LIBRARY/) { - $_ =~ s/\${KDE4_KMIME_LIBRARY}/KF5::Mime/; + $_ =~ s/\$\{KDE4_KMIME_LIBRARY\}/KF5::Mime/; $modified = 1; } if (/KDEPIMLIBS_AKONADI_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_AKONADI_LIBS}/KF5::AkonadiCore/; + $_ =~ s/\$\{KDEPIMLIBS_AKONADI_LIBS\}/KF5::AkonadiCore/; $modified = 1; } if (/KDEPIMLIBS_KCALCORE_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KCALCORE_LIBS}/KF5::CalendarCore/; + $_ =~ s/\$\{KDEPIMLIBS_KCALCORE_LIBS\}/KF5::CalendarCore/; $modified = 1; } if (/KDEPIMLIBS_KPIMUTILS_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KPIMUTILS_LIBS}//; + $_ =~ s/\$\{KDEPIMLIBS_KPIMUTILS_LIBS\}//; $modified = 1; } if (/KDEPIMLIBS_MAILTRANSPORT_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_MAILTRANSPORT_LIBS}/KF5::MailTransport/; + $_ =~ s/\$\{KDEPIMLIBS_MAILTRANSPORT_LIBS\}/KF5::MailTransport/; $modified = 1; } if (/KDEPIMLIBS_KMIME_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KMIME_LIBS}/KF5::Mime/; + $_ =~ s/\$\{KDEPIMLIBS_KMIME_LIBS\}/KF5::Mime/; $modified = 1; } if (/KDEPIMLIBS_KPIMIDENTITIES_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KPIMIDENTITIES_LIBS}/KF5::PimIdentities/; + $_ =~ s/\$\{KDEPIMLIBS_KPIMIDENTITIES_LIBS\}/KF5::PimIdentities/; $modified = 1; } if (/KDE4_KIO_LIBS/) { - $_ =~ s/\${KDE4_KIO_LIBS}/KF5::KIOCore/; + $_ =~ s/\$\{KDE4_KIO_LIBS\}/KF5::KIOCore/; $modified = 1; } if (/KDE4_KROSSCORE_LIBS/) { - $_ =~ s/\${KDE4_KROSSCORE_LIBS}/KF5::KrossCore/; + $_ =~ s/\$\{KDE4_KROSSCORE_LIBS\}/KF5::KrossCore/; $modified = 1; } if (/QT_QTDBUS_LIBRARY/) { - $_ =~ s/\${QT_QTDBUS_LIBRARY}/Qt5::DBus/; + $_ =~ s/\$\{QT_QTDBUS_LIBRARY\}/Qt5::DBus/; $modified = 1; } if (/QT_QTXML_LIBRARY/) { - $_ =~ s/\${QT_QTXML_LIBRARY}/Qt5::Xml/; + $_ =~ s/\$\{QT_QTXML_LIBRARY\}/Qt5::Xml/; $modified = 1; } if (/QT_QTXML_LIBRARIES/) { - $_ =~ s/\${QT_QTXML_LIBRARIES}/Qt5::Xml/; + $_ =~ s/\$\{QT_QTXML_LIBRARIES\}/Qt5::Xml/; $modified = 1; } if (/QT_QTCORE_LIBRARY/) { - $_ =~ s/\${QT_QTCORE_LIBRARY}/Qt5::Core/; + $_ =~ s/\$\{QT_QTCORE_LIBRARY\}/Qt5::Core/; $modified = 1; } if (/QT_QTCORE_LIBRARIES/) { - $_ =~ s/\${QT_QTCORE_LIBRARIES}/Qt5::Core/; + $_ =~ s/\$\{QT_QTCORE_LIBRARIES\}/Qt5::Core/; $modified = 1; } if (/QT_QTGUI_LIBRARY/) { - $_ =~ s/\${QT_QTGUI_LIBRARY}/Qt5::Gui/; + $_ =~ s/\$\{QT_QTGUI_LIBRARY\}/Qt5::Gui/; $modified = 1; } if (/QT_QTGUI_LIBRARIES/) { - $_ =~ s/\${QT_QTGUI_LIBRARIES}/Qt5::Gui/; + $_ =~ s/\$\{QT_QTGUI_LIBRARIES\}/Qt5::Gui/; $modified = 1; } if (/QT_QTHELP_LIBRARIES/) { - $_ =~ s/\${QT_QTHELP_LIBRARIES}/Qt5::Help/; + $_ =~ s/\$\{QT_QTHELP_LIBRARIES\}/Qt5::Help/; $modified = 1; } if (/QT_QTNETWORK_LIBRARY/) { - $_ =~ s/\${QT_QTNETWORK_LIBRARY}/Qt5::Network/; + $_ =~ s/\$\{QT_QTNETWORK_LIBRARY\}/Qt5::Network/; $modified = 1; } if (/QT_QTSCRIPT_LIBRARY/) { - $_ =~ s/\${QT_QTSCRIPT_LIBRARY}/Qt5::Script/; + $_ =~ s/\$\{QT_QTSCRIPT_LIBRARY\}/Qt5::Script/; $modified = 1; } if (/KDE4_KDECORE_LIBS/) { - $_ =~ s/\${KDE4_KDECORE_LIBS}/KF5::KDELibs4Support/; + $_ =~ s/\$\{KDE4_KDECORE_LIBS}/KF5::KDELibs4Support/; $modified = 1; } if (/KDEPIMLIBS_KIMAP_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KIMAP_LIBS}/KF5::IMAP/; + $_ =~ s/\$\{KDEPIMLIBS_KIMAP_LIBS}/KF5::IMAP/; $modified = 1; } if (/KDEPIMLIBS_AKONADI_KMIME_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_AKONADI_KMIME_LIBS}/KF5::AkonadiMime/; + $_ =~ s/\$\{KDEPIMLIBS_AKONADI_KMIME_LIBS}/KF5::AkonadiMime/; $modified = 1; } if (/KDE4_KNOTIFYCONFIG_LIBS/) { - $_ =~ s/\${KDE4_KNOTIFYCONFIG_LIBS}/KF5::NotifyConfig/; + $_ =~ s/\$\{KDE4_KNOTIFYCONFIG_LIBS}/KF5::NotifyConfig/; $modified = 1; } if (/KDEPIMLIBS_KPIMTEXTEDIT_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KPIMTEXTEDIT_LIBS}/KF5::PimTextEdit/; + $_ =~ s/\$\{KDEPIMLIBS_KPIMTEXTEDIT_LIBS}/KF5::PimTextEdit/; $modified = 1; } if (/KDE4_KDEWEBKIT_LIBRARY/) { - $_ =~ s/\${KDE4_KDEWEBKIT_LIBRARY}/KF5::WebKit/; + $_ =~ s/\$\{KDE4_KDEWEBKIT_LIBRARY}/KF5::WebKit/; $modified = 1; } if (/KDEPIMLIBS_KMBOX_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KMBOX_LIBS}/KF5::Mbox/; + $_ =~ s/\$\{KDEPIMLIBS_KMBOX_LIBS}/KF5::Mbox/; $modified = 1; } if (/QT_QTUITOOLS_LIBRARY/) { - $_ =~ s/\${QT_QTUITOOLS_LIBRARY}/Qt5::UiTools/; + $_ =~ s/\$\{QT_QTUITOOLS_LIBRARY\}/Qt5::UiTools/; $modified = 1; } if (/KDEPIMLIBS_KALARMCAL_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KALARMCAL_LIBS}/KF5::AlarmCalendar/; + $_ =~ s/\$\{KDEPIMLIBS_KALARMCAL_LIBS}/KF5::AlarmCalendar/; $modified = 1; } if (/KDEPIMLIBS_KABC_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KABC_LIBS}/KF5::Contacts/; + $_ =~ s/\$\{KDEPIMLIBS_KABC_LIBS}/KF5::Contacts/; $modified = 1; } if (/KF5::Abc/) { @@ -198,67 +198,67 @@ } if (/KDEPIMLIBS_AKONADI_CONTACT_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_AKONADI_CONTACT_LIBS}/KF5::AkonadiContact/; + $_ =~ s/\$\{KDEPIMLIBS_AKONADI_CONTACT_LIBS}/KF5::AkonadiContact/; $modified = 1; } if (/KDE4_KDEUI_LIBS/) { - $_ =~ s/\${KDE4_KDEUI_LIBS}//; + $_ =~ s/\$\{KDE4_KDEUI_LIBS}//; $modified = 1; } if (/KDEPIMLIBS_KTNEF_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KTNEF_LIBS}/KF5::KTnef/; + $_ =~ s/\$\{KDEPIMLIBS_KTNEF_LIBS}/KF5::KTnef/; $modified = 1; } if (/KDEPIMLIBS_KBLOG_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KBLOG_LIBS}/KF5::Blog/; + $_ =~ s/\$\{KDEPIMLIBS_KBLOG_LIBS}/KF5::Blog/; $modified = 1; } if (/KDEPIMLIBS_AKONADI_KABC_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_AKONADI_KABC_LIBS}/KF5::AkonadiAbc/; + $_ =~ s/\$\{KDEPIMLIBS_AKONADI_KABC_LIBS}/KF5::AkonadiAbc/; $modified = 1; } if (/KDE4_KNEWSTUFF3_LIBS/) { - $_ =~ s/\${KDE4_KNEWSTUFF3_LIBS}/KF5::NewStuff/; + $_ =~ s/\$\{KDE4_KNEWSTUFF3_LIBS}/KF5::NewStuff/; $modified = 1; } if (/KDE4_KNEWSTUFF3_LIBRARY/) { - $_ =~ s/\${KDE4_KNEWSTUFF3_LIBRARY}/KF5::NewStuff/; + $_ =~ s/\$\{KDE4_KNEWSTUFF3_LIBRARY}/KF5::NewStuff/; $modified = 1; } if (/KDEPIMLIBS_KLDAP_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KLDAP_LIBS}/KF5::KLdap/; + $_ =~ s/\$\{KDEPIMLIBS_KLDAP_LIBS}/KF5::KLdap/; $modified = 1; } if (/BALOO_LIBRARIES/) { - $_ =~ s/\${BALOO_LIBRARIES}/Baloo/; + $_ =~ s/\$\{BALOO_LIBRARIES}/Baloo/; $modified = 1; } if (/KDE4_KCMUTILS_LIBS/) { - $_ =~ s/\${KDE4_KCMUTILS_LIBS}/KF5::KCMUtils/; + $_ =~ s/\$\{KDE4_KCMUTILS_LIBS}/KF5::KCMUtils/; $modified = 1; } if (/KDEPIMLIBS_KCALUTILS_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KCALUTILS_LIBS}/KF5::CalendarUtils/; + $_ =~ s/\$\{KDEPIMLIBS_KCALUTILS_LIBS}/KF5::CalendarUtils/; $modified = 1; } if (/KDEPIMLIBS_KHOLIDAYS_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KHOLIDAYS_LIBS}/KF5::Holidays/; + $_ =~ s/\$\{KDEPIMLIBS_KHOLIDAYS_LIBS}/KF5::Holidays/; $modified = 1; } if (/KDE4_KUTILS_LIBS/) { - $_ =~ s/\${KDE4_KUTILS_LIBS}//; + $_ =~ s/\$\{KDE4_KUTILS_LIBS}//; $modified = 1; } if (/KDE4_KDECORE_LIBRARY/) { - $_ =~ s/\${KDE4_KDECORE_LIBRARY}//; + $_ =~ s/\$\{KDE4_KDECORE_LIBRARY}//; $modified = 1; } if (/KDE4_KDEUI_LIBRARY/) { - $_ =~ s/\${KDE4_KDEUI_LIBRARY}//; + $_ =~ s/\$\{KDE4_KDEUI_LIBRARY}//; $modified = 1; } if (/KDE4_KTEXTEDITOR_LIBS/) { - $_ =~ s/\${KDE4_KTEXTEDITOR_LIBS}/KF5::TextEditor/; + $_ =~ s/\$\{KDE4_KTEXTEDITOR_LIBS}/KF5::TextEditor/; $modified = 1; } if (/qt4_wrap_cpp/i) { @@ -266,50 +266,50 @@ $modified = 1; } if (/KDEPIMLIBS_SYNDICATION_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_SYNDICATION_LIBS}/KF5::Syndication/; + $_ =~ s/\$\{KDEPIMLIBS_SYNDICATION_LIBS}/KF5::Syndication/; $modified = 1; } if (/KDE4_KHTML_LIBS/) { - $_ =~ s/\${KDE4_KHTML_LIBS}/KF5::KHtml/; + $_ =~ s/\$\{KDE4_KHTML_LIBS}/KF5::KHtml/; $modified = 1; } if (/KDEPIMLIBS_KONTACTINTERFACE_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_KONTACTINTERFACE_LIBS}/KF5::KontactInterface/; + $_ =~ s/\$\{KDEPIMLIBS_KONTACTINTERFACE_LIBS}/KF5::KontactInterface/; $modified = 1; } if (/KDE4_KNOTIFYCONFIG_LIBRARY/) { - $_ =~ s/\${KDE4_KNOTIFYCONFIG_LIBRARY}/KF5::NotifyConfig/; + $_ =~ s/\$\{KDE4_KNOTIFYCONFIG_LIBRARY}/KF5::NotifyConfig/; $modified = 1; } if (/QT_QTDECLARATIVE_LIBRARY/) { - $_ =~ s/\${QT_QTDECLARATIVE_LIBRARY}/Qt5::Declarative/; + $_ =~ s/\$\{QT_QTDECLARATIVE_LIBRARY\}/Qt5::Declarative/; $modified = 1; } if (/QT_QTDECLARATIVE_LIBRARIES/) { - $_ =~ s/\${QT_QTDECLARATIVE_LIBRARIES}/Qt5::Declarative/; + $_ =~ s/\$\{QT_QTDECLARATIVE_LIBRARIES\}/Qt5::Declarative/; $modified = 1; } if (/KDE4_KPARTS_LIBS/) { - $_ =~ s/\${KDE4_KPARTS_LIBS}/KF5::Parts/; + $_ =~ s/\$\{KDE4_KPARTS_LIBS}/KF5::Parts/; $modified = 1; } if (/KDE4_KPARTS_LIBRARY/) { - $_ =~ s/\${KDE4_KPARTS_LIBRARY}/KF5::Parts/; + $_ =~ s/\$\{KDE4_KPARTS_LIBRARY}/KF5::Parts/; $modified = 1; } if (/KDE4_PHONON_LIBS/) { - $_ =~ s/\${KDE4_PHONON_LIBS}/Phonon::phonon4qt5/; + $_ =~ s/\$\{KDE4_PHONON_LIBS}/Phonon::phonon4qt5/; $modified = 1; } if (/KDE4_PHONON_LIBRARY/) { - $_ =~ s/\${KDE4_PHONON_LIBRARY}/Phonon::phonon4qt5/; + $_ =~ s/\$\{KDE4_PHONON_LIBRARY}/Phonon::phonon4qt5/; $modified = 1; } if (/QT_QTTEST_LIBRARY/) { - $_ =~ s/\${QT_QTTEST_LIBRARY}/Qt5::Test/; + $_ =~ s/\$\{QT_QTTEST_LIBRARY\}/Qt5::Test/; $modified = 1; } @@ -322,104 +322,104 @@ $modified = 1; } if (/KDEPIMLIBS_MICROBLOG_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_MICROBLOG_LIBS}/KF5::MicroBlog/; + $_ =~ s/\$\{KDEPIMLIBS_MICROBLOG_LIBS}/KF5::MicroBlog/; $modified = 1; } if (/KDE4_SOLID_LIBS/) { - $_ =~ s/\${KDE4_SOLID_LIBS}//; + $_ =~ s/\$\{KDE4_SOLID_LIBS}//; $modified = 1; } if (/QT_QTWEBKIT_LIBRARY/) { - $_ =~ s/\${QT_QTWEBKIT_LIBRARY}/Qt5::WebKitWidgets/; + $_ =~ s/\$\{QT_QTWEBKIT_LIBRARY\}/Qt5::WebKitWidgets/; $modified = 1; } if (/QT_QTSQL_LIBRARY/) { - $_ =~ s/\${QT_QTSQL_LIBRARY}/Qt5::Sql/; + $_ =~ s/\$\{QT_QTSQL_LIBRARY\}/Qt5::Sql/; $modified = 1; } if (/KDE4_KFILE_LIBS/) { - $_ =~ s/\${KDE4_KFILE_LIBS}//; + $_ =~ s/\$\{KDE4_KFILE_LIBS}//; $modified = 1; } if (/KDEPIMLIBS_AKONADI_NOTES_LIBS/) { - $_ =~ s/\${KDEPIMLIBS_AKONADI_NOTES_LIBS}/KF5::AkonadiNotes/; + $_ =~ s/\$\{KDEPIMLIBS_AKONADI_NOTES_LIBS}/KF5::AkonadiNotes/; $modified = 1; } if (/KDE4_KIO_LIBRARY/) { - $_ =~ s/\${KDE4_KIO_LIBRARY}/KF5::KIOCore/; + $_ =~ s/\$\{KDE4_KIO_LIBRARY}/KF5::KIOCore/; $modified = 1; } if (/KDEVPLATFORM_INTERFACES_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_INTERFACES_LIBRARIES}/KDev::Interfaces/; + $_ =~ s/\$\{KDEVPLATFORM_INTERFACES_LIBRARIES}/KDev::Interfaces/; $modified = 1; } if (/KDEVPLATFORM_SHELL_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_SHELL_LIBRARIES}/KDev::Shell/; + $_ =~ s/\$\{KDEVPLATFORM_SHELL_LIBRARIES}/KDev::Shell/; $modified = 1; } if (/KDEVPLATFORM_LANGUAGE_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_LANGUAGE_LIBRARIES}/KDev::Language/; + $_ =~ s/\$\{KDEVPLATFORM_LANGUAGE_LIBRARIES}/KDev::Language/; $modified = 1; } if (/KDEVPLATFORM_UTIL_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_UTIL_LIBRARIES}/KDev::Util/; + $_ =~ s/\$\{KDEVPLATFORM_UTIL_LIBRARIES}/KDev::Util/; $modified = 1; } if (/KDEVPLATFORM_PROJECT_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_PROJECT_LIBRARIES}/KDev::Project/; + $_ =~ s/\$\{KDEVPLATFORM_PROJECT_LIBRARIES}/KDev::Project/; $modified = 1; } if (/KDEVPLATFORM_OUTPUTVIEW_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_OUTPUTVIEW_LIBRARIES}/KDev::OutputView/; + $_ =~ s/\$\{KDEVPLATFORM_OUTPUTVIEW_LIBRARIES}/KDev::OutputView/; $modified = 1; } if (/KDEVPLATFORM_VCS_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_VCS_LIBRARIES}/KDev::Vcs/; + $_ =~ s/\$\{KDEVPLATFORM_VCS_LIBRARIES}/KDev::Vcs/; $modified = 1; } if (/KDEVPLATFORM_TESTS_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_TESTS_LIBRARIES}/KDev::Tests/; + $_ =~ s/\$\{KDEVPLATFORM_TESTS_LIBRARIES}/KDev::Tests/; $modified = 1; } if (/KDEVPLATFORM_JSONTESTS_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_JSONTESTS_LIBRARIES}/KDev::JsonTests/; + $_ =~ s/\$\{KDEVPLATFORM_JSONTESTS_LIBRARIES}/KDev::JsonTests/; $modified = 1; } if (/KDEVPLATFORM_DOCUMENTATION_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_DOCUMENTATION_LIBRARIES}/KDev::Documentation/; + $_ =~ s/\$\{KDEVPLATFORM_DOCUMENTATION_LIBRARIES}/KDev::Documentation/; $modified = 1; } if (/KDEVPLATFORM_DEBUGGER_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_DEBUGGER_LIBRARIES}/KDev::Debugger/; + $_ =~ s/\$\{KDEVPLATFORM_DEBUGGER_LIBRARIES}/KDev::Debugger/; $modified = 1; } if (/KDEVPLATFORM_SUBLIME_LIBRARIES/) { - $_ =~ s/\${KDEVPLATFORM_SUBLIME_LIBRARIES}/KDev::Sublime/; + $_ =~ s/\$\{KDEVPLATFORM_SUBLIME_LIBRARIES}/KDev::Sublime/; $modified = 1; } if (/KDE4_THREADWEAVER_LIBRARIES/) { - $_ =~ s/\${KDE4_THREADWEAVER_LIBRARIES}/KF5::ThreadWeaver/; + $_ =~ s/\$\{KDE4_THREADWEAVER_LIBRARIES}/KF5::ThreadWeaver/; $modified = 1; } if (/QT_AND_KDECORE_LIBS/) { - $_ =~ s/\${QT_AND_KDECORE_LIBS}//; + $_ =~ s/\$\{QT_AND_KDECORE_LIBS}//; $modified = 1; } if (/KIPI_LIBRARIES/) { - $_ =~ s/\${KIPI_LIBRARIES}/KF5::Kipi/; + $_ =~ s/\$\{KIPI_LIBRARIES}/KF5::Kipi/; $modified = 1; } if (/KEXIV2_LIBRARIES/) { - $_ =~ s/\${KEXIV2_LIBRARIES}/KF5::KExiv2/; + $_ =~ s/\$\{KEXIV2_LIBRARIES}/KF5::KExiv2/; $modified = 1; } if (/KDCRAW_LIBRARIES/) { - $_ =~ s/\${KDCRAW_LIBRARIES}/KF5::KDcraw/; + $_ =~ s/\$\{KDCRAW_LIBRARIES}/KF5::KDcraw/; $modified = 1; } if (/KSANE_LIBRARY/) { - $_ =~ s/\${KSANE_LIBRARY}/KF5::Sane/; + $_ =~ s/\$\{KSANE_LIBRARY}/KF5::Sane/; $modified = 1; } if (/kdegamesprivate/) { @@ -427,7 +427,7 @@ $modified = 1; } if (/KDECLARATIVE_LIBRARIES/) { - $_ =~ s/\${KDECLARATIVE_LIBRARIES}/KF5::Declarative/; + $_ =~ s/\$\{KDECLARATIVE_LIBRARIES}/KF5::Declarative/; $modified = 1; } if (/kdegames/) { @@ -435,11 +435,11 @@ $modified = 1; } if (/LIBKONQ_LIBRARY/) { - $_ =~ s/\${LIBKONQ_LIBRARY}/KF5::Konq/; + $_ =~ s/\$\{LIBKONQ_LIBRARY}/KF5::Konq/; $modified = 1; } if (/QT_QTOPENGL_LIBRARY/) { - $_ =~ s/\${QT_QTOPENGL_LIBRARY}/Qt5::OpenGL/; + $_ =~ s/\$\{QT_QTOPENGL_LIBRARY\}/Qt5::OpenGL/; $modified = 1; } #if (/macro_optional_add_subdirectory/) { @@ -476,11 +476,11 @@ $modified = 1; } if (/KDE4_INCLUDES/) { - $_ =~ s/\${KDE4_INCLUDES}//; + $_ =~ s/\$\{KDE4_INCLUDES}//; $modified = 1; } if (/KDE4_KDNSSD_LIBS/) { - $_ =~ s/\${KDE4_KDNSSD_LIBS}/KF5::DNSSD/; + $_ =~ s/\$\{KDE4_KDNSSD_LIBS}/KF5::DNSSD/; $modified = 1; } @@ -489,7 +489,7 @@ $modified = 1; } if (/QT_QTSVG_LIBRARY/) { - $_ =~ s/\${QT_QTSVG_LIBRARY}/Qt5::Svg/; + $_ =~ s/\$\{QT_QTSVG_LIBRARY\}/Qt5::Svg/; $modified = 1; } if (/KF5::KDE4Support/) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/convert-kdebug-with-argument.sh new/kde-dev-scripts-17.08.0/kf5/convert-kdebug-with-argument.sh --- old/kde-dev-scripts-17.04.3/kf5/convert-kdebug-with-argument.sh 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/kf5/convert-kdebug-with-argument.sh 2017-08-10 17:44:14.000000000 +0200 @@ -14,62 +14,6 @@ upname=`echo $debugnamefile | tr 'a-z' 'A-Z'` -# create debug.h file -cat > $debugnamefile.h <<EOF -/* This file is part of the KDE project - Copyright (C) 2015 Laurent Montel <montel(a)kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef ${upname}_H -#define ${upname}_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY($newcategoryname) - -#endif -EOF - - -#create debug.cpp file -cat > $debugnamefile.cpp <<EOF -/* This file is part of the KDE project - Copyright (C) 2015 Laurent Montel <montel(a)kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "$debugnamefile.h" -Q_LOGGING_CATEGORY($newcategoryname, "$newlogname") -EOF - #convert debug to new qCDebug/qCWarning/qCCritical find -iname "*.cpp" -o -iname "*.h" | xargs sed -ri \ @@ -77,12 +21,10 @@ -e "s,k(Debug|Warning)\s*$\s*$oldcategorynumber\s*$,qC\1$$newcategoryname$," \ -e "s,k(Fatal|Error)\s*$\s*$oldcategorynumber\s*$,qCCritical$$newcategoryname$," -git add $debugnamefile.cpp $debugnamefile.h - # end -echo "1) Add $debugnamefile.cpp to CMakeLists.txt" -echo "2) Add #include <QDebug> + #include \"${debugnamefile}.h\" to each file which was changed and where it is missing" +echo "1) add ecm_qt_declare_logging_category(<file>_SRCS HEADER $debugnamefile.h IDENTIFIER $newcategoryname CATEGORY_NAME $newlogname) to CMakeLists.txt"; +echo "2) #include \"${debugnamefile}.h\" to each file which was changed and where it is missing" echo "3) Verify that it compiles :)" echo "4) If you find bugs fix them please" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kde-dev-scripts-17.04.3/kf5/convert-qkdebug-to-qcdebug.sh new/kde-dev-scripts-17.08.0/kf5/convert-qkdebug-to-qcdebug.sh --- old/kde-dev-scripts-17.04.3/kf5/convert-qkdebug-to-qcdebug.sh 2017-05-25 19:42:05.000000000 +0200 +++ new/kde-dev-scripts-17.08.0/kf5/convert-qkdebug-to-qcdebug.sh 2017-08-10 17:44:14.000000000 +0200 @@ -2,8 +2,8 @@ if test $# != 3; then echo "Usage : $0 <new log name> <new category name> <debug name file>" - echo "example : convert-qdebug-to-qcdebug.sh log_smtp SMTP_LOG smtp_debug" - exit 1 + echo "example : convert-qdebug-to-qcdebug.sh org.kde.smtp SMTP_LOG smtp_debug" + exit 0 fi @@ -13,65 +13,6 @@ upname=`echo $debugnamefile | tr 'a-z' 'A-Z'` -# create debug.h file -cat > $debugnamefile.h <<EOF -/* This file is part of the KDE project - Copyright (C) 2015 Laurent Montel <montel(a)kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef ${upname}_H -#define ${upname}_H - -#include <QLoggingCategory> -Q_DECLARE_LOGGING_CATEGORY($newcategoryname) - -#endif - -EOF - - -#create debug.cpp file -cat > $debugnamefile.cpp <<EOF -/* This file is part of the KDE project - Copyright (C) 2015 Laurent Montel <montel(a)kde.org> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#include "$debugnamefile.h" -Q_LOGGING_CATEGORY($newcategoryname, "$newlogname") - - -EOF - #convert debug to new qCDebug/qCWarning/qCCritical find -iname "*.cpp" -o -iname "*.h" | xargs perl -pi -e "s,qDebug\s*$\s*$,qCDebug$$newcategoryname$," @@ -92,13 +33,12 @@ find -iname "*.cpp" -o -iname "*.h" | xargs perl -pi -e "s/k_funcinfo/Q_FUNC_INFO/;" -git add $debugnamefile.cpp $debugnamefile.h +echo "add ecm_qt_declare_logging_category(<file>_SRCS HEADER $debugnamefile.h IDENTIFIER $newcategoryname CATEGORY_NAME $newlogname) to CMakeLists.txt"; # end echo "1) Add $debugnamefile.cpp to CMakeLists.txt" -echo "2) Add #include <QDebug> + #include \"$debugnamefile.h\" to each file which was changed" -echo "3) Adjust name / email in $debugnamefile.cpp and $debugnamefile.h" -echo "4) Verify that it compiles :)" -echo "5) If you find bugs fix them please" +echo "2) Add #include \"$debugnamefile.h\" to each file which was changed" +echo "3) Verify that it compiles :)" +echo "4) If you find bugs fix them please"

1 0

commit kdenlive for openSUSE:Factory
by root＠hilbert.suse.de 28 Aug '17

28 Aug '17

Hello community, here is the log from the commit of package kdenlive for openSUSE:Factory checked in at 2017-08-28 15:06:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdenlive (Old) and /work/SRC/openSUSE:Factory/.kdenlive.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdenlive" Mon Aug 28 15:06:22 2017 rev:40 rq:516346 version:17.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kdenlive/kdenlive.changes 2017-07-29 08:56:54.694939912 +0200 +++ /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive.changes 2017-08-28 15:06:40.749197658 +0200 @@ -1,0 +2,17 @@ +Fri Aug 11 22:45:19 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.08.0 + * New feature release + * https://www.kde.org/announcements/announce-applications-17.08.0.php +- Changes since 17.04.3 : +- Too many changes to list here + +------------------------------------------------------------------- +Sat Aug 5 18:17:30 UTC 2017 - christophe(a)krop.fr + +- Update to KDE Applications 17.07.90 + * KDE Applications 17.07.90 + * https://www.kde.org/announcements/announce-applications-17.07.90.php + + +------------------------------------------------------------------- Old: ---- kdenlive-17.04.3.tar.xz New: ---- kdenlive-17.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdenlive.spec ++++++ --- /var/tmp/diff_new_pack.jeweax/_old 2017-08-28 15:06:42.021018761 +0200 +++ /var/tmp/diff_new_pack.jeweax/_new 2017-08-28 15:06:42.025018199 +0200 @@ -15,16 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %bcond_without lang %define mlt_version 6.4.0 %define melt_path %(pkg-config --variable=meltbin mlt-framework) %define mlt_soname %(pkg-config --variable=moduledir mlt-framework | sed 's/.*-\$[0-9]\\+\$/\\1/') Name: kdenlive -Version: 17.04.3 +Version: 17.08.0 Release: 0 %define kf5_version 5.26.0 -# Latest stable Applications (e.g. 16.08 in KA, but 16.11.80 in KUA) +# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Non-linear video editor License: GPL-3.0+ @@ -78,8 +79,8 @@ # It requires the profiles Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-data # Without a few of the plugins it crashes on start -Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-modules Requires: %{melt_path} +Requires: %(rpm -qf $(readlink -qne %{_libdir}/libmlt.so) --qf '%{NAME}')-modules # It doesn't start without it (boo#994649) Requires: libqt5-qtquickcontrols Recommends: frei0r-plugins @@ -92,6 +93,9 @@ Recommends: mlt(%{mlt_soname})(avformat) Obsoletes: kdenlive5 < %{version} Provides: kdenlive5 = %{version} +%if %{with lang} +Recommends: %{name}-lang +%endif %description Kdenlive is a non-linear video editor for GNU/Linux and FreeBSD, which supports @@ -146,24 +150,24 @@ %files %defattr(0644,root,root,0755) -%doc AUTHORS COPYING README %attr(0755,-,-) %{_bindir}/%{name} %attr(0755,-,-) %{_bindir}/%{name}_render -%dir %{_kf5_configkcfgdir} -%{_kf5_configkcfgdir}/kdenlivesettings.kcfg -%{_datadir}/kdenlive/ -%{_mandir}/man1/* -%{_datadir}/mime/packages/* -%{_kf5_applicationsdir}/org.kde.kdenlive.desktop -%{_datadir}/kxmlgui5/kdenlive/ +%doc AUTHORS COPYING README %(config) %{_kf5_configdir}/*.knsrc %(config) %{_kf5_configdir}/kdenlive.categories -%{_kf5_plugindir}/mltpreview.so -%{_datadir}/knotifications5/kdenlive.notifyrc -%{_kf5_servicesdir}/mltpreview.desktop -%{_kf5_htmldir}/en/kdenlive/ +%dir %{_kf5_configkcfgdir} +%doc %lang(en) %{_kf5_htmldir}/en/kdenlive/ +%{_kf5_applicationsdir}/org.kde.kdenlive.desktop %{_kf5_appstreamdir}/ +%{_kf5_configkcfgdir}/kdenlivesettings.kcfg %{_kf5_iconsdir}/hicolor/*/*/* +%{_kf5_kxmlguidir}/kdenlive/ +%{_kf5_mandir}/man1/* +%{_kf5_plugindir}/mltpreview.so +%{_kf5_servicesdir}/mltpreview.desktop +%{_kf5_sharedir}/kdenlive/ +%{_kf5_sharedir}/knotifications5/kdenlive.notifyrc +%{_kf5_sharedir}/mime/packages/* %if %{with lang} %files lang -f %{name}.lang ++++++ kdenlive-17.04.3.tar.xz -> kdenlive-17.08.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdenlive/kdenlive-17.04.3.tar.xz /work/SRC/openSUSE:Factory/.kdenlive.new/kdenlive-17.08.0.tar.xz differ: char 27, line 1

1 0