diff -Nru kcoreaddons-5.46.0/CMakeLists.txt kcoreaddons-5.47.0/CMakeLists.txt --- kcoreaddons-5.46.0/CMakeLists.txt 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/CMakeLists.txt 2018-06-02 17:50:40.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts project(KCoreAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kcoreaddons-5.46.0/debian/changelog kcoreaddons-5.47.0/debian/changelog --- kcoreaddons-5.46.0/debian/changelog 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/changelog 2018-06-14 14:48:09.000000000 +0000 @@ -1,3 +1,31 @@ +kcoreaddons (5.47.0-0ubuntu1) cosmic; urgency=medium + + * New upstream release (5.47.0) + + [ José Manuel Santamaría Lema ] + * Merge with debian, notes: + - keep using dhmk and debhelper compat level = 9, see: + https://phabricator.kde.org/w/kubuntu/black-operations/pyramid/ + - replace our patch fix-kformattest.patch with Debian's + fix-kformattest-plural-forms.patch + + -- Rik Mills Thu, 14 Jun 2018 15:48:09 +0100 + +kcoreaddons (5.46.0-1) unstable; urgency=medium + + * New upstream release (5.46.0). + * Update build-deps and deps with the info from cmake + * Bump Standards-Version to 4.1.4. + * Use https for the debian/copyright + * testsuite: Run tests one at the time + * Add patch: fix-kformattest-plural-forms.patch + * Add patch: kdirwatch-tests-method-specific.patch + * Add misc:Depends to the -dev package + * Bump group breaks (5.46) + * Release to unstable + + -- Maximiliano Curia Thu, 17 May 2018 22:14:38 +0200 + kcoreaddons (5.46.0-0ubuntu1) cosmic; urgency=medium * New upstream release (5.45.0) @@ -5,6 +33,15 @@ -- Rik Mills Tue, 15 May 2018 15:55:22 +0100 +kcoreaddons (5.45.0-1) unstable; urgency=medium + + * New upstream release (5.45.0). + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.45) + * Release to unstable + + -- Maximiliano Curia Sat, 05 May 2018 08:10:11 +0200 + kcoreaddons (5.44.0a-0ubuntu1) bionic; urgency=medium * New upstream release (5.44.0) @@ -12,6 +49,27 @@ -- Rik Mills Mon, 12 Mar 2018 19:56:38 +0000 +kcoreaddons (5.44.0-1) sid; urgency=medium + + * New upstream release (5.44.0). + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.44) + * Bump doxygen build dep. + Thanks to Aaron M. Ucko for the report (Closes: 887679) + * Release to sid + + -- Maximiliano Curia Wed, 21 Mar 2018 14:51:54 +0100 + +kcoreaddons (5.43.0-1) experimental; urgency=medium + + * Use the salsa canonical urls + * New upstream release (5.43.0). + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.43) + * Release to experimental + + -- Maximiliano Curia Mon, 26 Feb 2018 11:43:15 +0100 + kcoreaddons (5.43.0-0ubuntu2) bionic; urgency=medium * Disable expensive kdirwatch backend tests. These fail on ubuntu @@ -26,6 +84,26 @@ -- Rik Mills Sun, 11 Feb 2018 11:14:20 +0000 +kcoreaddons (5.42.0-2) sid; urgency=medium + + * New revision + * Release to sid + + -- Maximiliano Curia Sat, 10 Feb 2018 11:28:38 +0100 + +kcoreaddons (5.42.0-1) experimental; urgency=medium + + * New upstream release (5.42.0). + * Add link options as-needed + * Bump debhelper build-dep and compat to 11. + * Build without build_stamp + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.42) + * Bump Standards-Version to 4.1.3. + * Release to experimental + + -- Maximiliano Curia Fri, 02 Feb 2018 12:04:50 +0100 + kcoreaddons (5.42.0-0ubuntu1) bionic; urgency=medium * Rename libkf5coreaddons-bin-dev to libkf5coreaddons-dev-bin, as @@ -34,6 +112,24 @@ -- Rik Mills Fri, 26 Jan 2018 22:20:24 +0000 +kcoreaddons (5.41.0-1) experimental; urgency=medium + + [ Maximiliano Curia ] + * New upstream release (5.41.0). + * Update symbols files + * Rename libkf5coreaddons-bin-dev to libkf5coreaddons-dev-bin. + Move the cmake file to the m-a: same -dev package, and add the + corresponding breaks replaces. + Thanks to Helmut Grohne (Closes: 882692) + * Update copyright file + * Bump group breaks (5.41) + * Release to experimental + + [ Helmut Grohne ] + * Fix FTCBFS: Annotate libqt5sql5-sqlite with :native. (Closes: 882835) + + -- Maximiliano Curia Fri, 15 Dec 2017 10:42:17 -0300 + kcoreaddons (5.41.0-0ubuntu1) bionic; urgency=low * New upstream release (5.41.0) @@ -41,6 +137,12 @@ -- Walter Lapchynski Sun, 10 Dec 2017 22:03:48 -0600 +kcoreaddons (5.41.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 08 Dec 2017 14:45:03 +0000 + kcoreaddons (5.40.0-0ubuntu1) bionic; urgency=medium * New upstream release (5.39.0) @@ -48,6 +150,18 @@ -- Rik Mills Fri, 24 Nov 2017 17:15:28 +0000 +kcoreaddons (5.40.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 10 Nov 2017 12:56:23 +0000 + +kcoreaddons (5.39.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 15 Oct 2017 11:40:05 +0000 + kcoreaddons (5.38.0-0ubuntu1) artful; urgency=medium * Update sybmols from build logs. Remove private symbols now upstream @@ -56,6 +170,47 @@ -- Rik Mills Mon, 11 Sep 2017 13:14:29 +0100 +kcoreaddons (5.38.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 11 Sep 2017 13:24:29 +0000 + +kcoreaddons (5.37.0-3) unstable; urgency=medium + + * Team upload. + + [ Maximiliano Curia ] + * Rename libkf5coreaddons-bin-dev to libkf5coreaddons-dev-bin. + Move the cmake file to the m-a: same -dev package, and add the + corresponding Breaks/Replaces. + Thanks to Helmut Grohne (Closes: 882692) + + -- Dmitry Shachnev Sat, 13 Jan 2018 13:37:06 +0300 + +kcoreaddons (5.37.0-2) sid; urgency=medium + + * New revision + * Update install file + * Bump Standards-Version to 4.1.0. + * Update upstream metadata + * Release to sid + + -- Maximiliano Curia Sun, 03 Sep 2017 09:57:47 +0200 + +kcoreaddons (5.37.0-1) experimental; urgency=medium + + * New upstream release (5.37.0). + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.37) + * Update symbols file + * Add a libkf5coreaddons-doc package for the qch files + * Bump Standards-Version to 4.0.1. + * Set section for the doc package + * Release to experimental + + -- Maximiliano Curia Wed, 16 Aug 2017 10:41:59 +0200 + kcoreaddons (5.37.0-0ubuntu1) artful; urgency=medium * Update symbols from build logs @@ -63,30 +218,88 @@ -- Rik Mills Sat, 12 Aug 2017 18:48:13 +0100 +kcoreaddons (5.37.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 11 Aug 2017 15:11:54 +0000 + +kcoreaddons (5.36.0-1) experimental; urgency=medium + + [ Maximiliano Curia ] + * Update watch file + * New upstream release (5.35.0). + * Bump Standards-Version to 4.0.0. + * Update build-deps and deps with the info from cmake + * Bump group breaks (5.35) + * Drop upstream patches + * watch: Use https uris + * New upstream release (5.36.0). + * Bump group breaks (5.36) + * Update build-deps and deps with the info from cmake + + [ Raymond Wooninck ] + * Add signing key + + [ Jonathan Riddell ] + * add gpg key + + -- Maximiliano Curia Sun, 09 Jul 2017 23:41:05 +0200 + kcoreaddons (5.36.0-0ubuntu1) artful; urgency=low * New upstream release (5.36.0) -- José Manuel Santamaría Lema Tue, 11 Jul 2017 23:53:04 +0100 +kcoreaddons (5.36.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 10 Jul 2017 17:10:14 +0000 + kcoreaddons (5.35.0-0ubuntu1) artful; urgency=low * New upstream release (5.35.0) -- José Manuel Santamaría Lema Mon, 12 Jun 2017 22:58:10 +0100 +kcoreaddons (5.35.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 11 Jun 2017 20:36:03 +0000 + kcoreaddons (5.34.0-0ubuntu1) artful; urgency=low * New upstream release (5.34.0) -- José Manuel Santamaría Lema Mon, 15 May 2017 21:26:06 +0100 +kcoreaddons (5.34.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 14 May 2017 17:34:38 +0000 + kcoreaddons (5.33.0-0ubuntu1) artful; urgency=low * New upstream release (5.33.0) -- José Manuel Santamaría Lema Sat, 29 Apr 2017 18:05:24 +0100 +kcoreaddons (5.33.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 07 Apr 2017 16:22:03 +0000 + +kcoreaddons (5.32.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sun, 12 Mar 2017 13:21:29 +0000 + kcoreaddons (5.31.0-0ubuntu1) zesty; urgency=medium * Pass '-fno-keep-inline-functions' to gcc in the acc test in order to @@ -95,12 +308,52 @@ -- José Manuel Santamaría Lema Tue, 14 Feb 2017 22:51:09 +0000 +kcoreaddons (5.31.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 13 Feb 2017 14:34:54 +0000 + kcoreaddons (5.30.1-0ubuntu1) zesty; urgency=low * New upstream release (5.30.1) -- Rik Mills Wed, 01 Feb 2017 18:34:53 +0000 +kcoreaddons (5.30.1-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 16 Jan 2017 13:39:09 +0000 + +kcoreaddons (5.29.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Fri, 09 Dec 2016 19:06:46 +0000 + +kcoreaddons (5.28.0-2) unstable; urgency=medium + + * Add new upstream patch: + Fix-Bug-343275-1-added-at-the-end-of-a-hyperlink.patch + * Add new upstream patch: + Fix-Bug-363427-unsafe-characters-incorrectly-parsed-as-pa.patch + * Add new upstream patch: KDirWatch-fix-memory-leak-on-destruction.patch + + -- Maximiliano Curia Fri, 31 Mar 2017 15:53:53 +0200 + +kcoreaddons (5.28.0-1) unstable; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + * Refresh patches + + [ Maximiliano Curia ] + * New upstream release (5.28) + * Bump group breaks (5.28) + + -- Maximiliano Curia Fri, 18 Nov 2016 16:01:12 +0100 + kcoreaddons (5.28.0-0ubuntu1) zesty; urgency=medium [ Clive Johnston ] @@ -122,6 +375,12 @@ -- José Manuel Santamaría Lema Mon, 05 Dec 2016 20:16:58 +0000 +kcoreaddons (5.28.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Thu, 17 Nov 2016 09:45:11 +0000 + kcoreaddons (5.27.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -134,6 +393,12 @@ -- Maximiliano Curia Sat, 15 Oct 2016 16:49:11 +0200 +kcoreaddons (5.27.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sat, 08 Oct 2016 11:29:40 +0000 + kcoreaddons (5.26.0-3) unstable; urgency=high [ Sandro Knauß ] @@ -190,6 +455,12 @@ -- Clive Johnston Thu, 22 Sep 2016 13:42:27 +0100 +kcoreaddons (5.26.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 12 Sep 2016 08:30:17 +0000 + kcoreaddons (5.25.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -201,12 +472,24 @@ -- Maximiliano Curia Thu, 18 Aug 2016 17:19:25 +0200 +kcoreaddons (5.25.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Sat, 13 Aug 2016 20:15:12 +0000 + kcoreaddons (5.24.0-0ubuntu1) yakkety; urgency=medium * New upstream release (5.24.0) -- Philip Muškovac Tue, 26 Jul 2016 08:38:34 +0000 +kcoreaddons (5.24.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 11 Jul 2016 07:42:31 +0000 + kcoreaddons (5.23.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -221,6 +504,12 @@ -- Clive Johnston Mon, 11 Jul 2016 22:09:27 +0200 +kcoreaddons (5.23.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 13 Jun 2016 09:38:40 +0000 + kcoreaddons (5.22.0-1) unstable; urgency=medium [ Automatic packaging ] @@ -248,6 +537,12 @@ -- Clive Johnston Tue, 17 May 2016 16:14:41 -0700 +kcoreaddons (5.22.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Tue, 17 May 2016 07:27:29 +0000 + kcoreaddons (5.21.0-1) experimental; urgency=medium [ Maximiliano Curia ] @@ -270,6 +565,18 @@ -- Maximiliano Curia Fri, 06 May 2016 20:06:41 +0200 +kcoreaddons (5.21.0-0neon) xenial; urgency=medium + + * New release + + -- Neon CI Mon, 11 Apr 2016 09:21:39 +0000 + +kcoreaddons (5.20.0-0neon) wily; urgency=medium + + * New release + + -- Neon CI Fri, 01 Apr 2016 11:05:18 +0000 + kcoreaddons (5.19.0-1) experimental; urgency=medium * New upstream release (5.19.0). diff -Nru kcoreaddons-5.46.0/debian/control kcoreaddons-5.47.0/debian/control --- kcoreaddons-5.46.0/debian/control 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/control 2018-06-14 14:48:09.000000000 +0000 @@ -3,16 +3,19 @@ Priority: optional Maintainer: Debian/Kubuntu Qt/KDE Maintainers Uploaders: Maximiliano Curia -Build-Depends: cmake (>= 2.8.12), - debhelper (>= 9), - extra-cmake-modules (>= 5.46.0~), +Build-Depends: cmake (>= 3.0~), + debhelper (>= 11~), + doxygen (>= 1.8.13~), + extra-cmake-modules (>= 5.47.0~), + graphviz, libfam-dev, + libqt5sql5-sqlite:native, pkg-kde-tools (>= 0.15.16~), - qtbase5-dev (>= 5.6.1~), + qtbase5-dev (>= 5.8.0~), qttools5-dev (>= 5.6.1~), qttools5-dev-tools (>= 5.6.1~), - shared-mime-info (>= 1.3) -Standards-Version: 3.9.8 + shared-mime-info (>= 1.3), +Standards-Version: 4.1.4 Homepage: http://projects.kde.org/kcoreaddons Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kcoreaddons Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kcoreaddons @@ -39,11 +42,12 @@ Section: libdevel Depends: libkf5coreaddons-dev-bin (= ${binary:Version}), libkf5coreaddons5 (= ${binary:Version}), - qtbase5-dev (>= 5.6.1~), + qtbase5-dev (>= 5.8.0~), ${misc:Depends}, - ${shlibs:Depends} -Breaks: libkf5service-dev (<= 5.2.0), libkf5coreaddons-bin-dev (<< 5.42.0~) -Replaces: libkf5service-dev (<= 5.2.0), libkf5coreaddons-bin-dev (<< 5.42.0~) + ${shlibs:Depends}, +Breaks: libkf5coreaddons-bin-dev (<< 5.42.0~), libkf5service-dev (<= 5.2.0) +Replaces: libkf5coreaddons-bin-dev (<< 5.42.0~), libkf5service-dev (<= 5.2.0) +Recommends: libkf5coreaddons-doc (= ${source:Version}) Description: KDE Frameworks 5 addons to QtCore - development files KCoreAddons provides classes built on top of QtCore to perform various tasks such as manipulating mime types, autosaving files, creating backup files, @@ -59,8 +63,8 @@ Multi-Arch: foreign Section: libdevel Depends: ${misc:Depends}, ${shlibs:Depends} -Replaces: libkf5coreaddons-bin-dev, libkf5coreaddons-dev (<< 5.15.0-2~) Breaks: libkf5coreaddons-bin-dev, libkf5coreaddons-dev (<< 5.15.0-2~) +Replaces: libkf5coreaddons-bin-dev, libkf5coreaddons-dev (<< 5.15.0-2~) Description: KDE Frameworks 5 addons to QtCore - development files KCoreAddons provides classes built on top of QtCore to perform various tasks such as manipulating mime types, autosaving files, creating backup files, @@ -71,6 +75,21 @@ . This package is an implementation detail for KCoreAddons. +Package: libkf5coreaddons-doc +Architecture: all +Multi-Arch: foreign +Section: doc +Depends: ${misc:Depends} +Description: KDE Frameworks 5 addons to QtCore (documentation) + KCoreAddons provides classes built on top of QtCore to perform various tasks + such as manipulating mime types, autosaving files, creating backup files, + generating random sequences, performing text manipulations such as macro + replacement, accessing user information and many more. + . + This package is part of KDE Frameworks 5. + . + This package contains the qch documentation files. + Package: libkf5coreaddons5 Architecture: any Multi-Arch: same diff -Nru kcoreaddons-5.46.0/debian/copyright kcoreaddons-5.47.0/debian/copyright --- kcoreaddons-5.46.0/debian/copyright 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/copyright 2018-06-14 14:48:09.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: kcoreaddons Source: git://anongit.kde.org/kcoreaddons @@ -8,18 +8,22 @@ 2014, Alex Richardson 2007, Allen Winter 2007, Bernhard Loos + 1301-2110, Boston, MA USA 2000, Charles Samuels 2014, Daniel Vrátil 2002, Dave Corrie + 2016, David Edmundson 2013, David Faure 2005-2014, David Faure 2014, Developer 2006, Dominic Battre 2000, Espen Sand + 1951, Franklin Street, Fifth Floor 1991, Free Software Foundation, Inc 2008, Friedrich W. H. Kossebau - 1999, Ian Zepp (icszepp@islc.net) - 2014, Ivan Cukic + 2017, Harald Sitter + 1999, Ian Zepp + 2014, Ivan Cukic 2006, Jacob R Rideout 2004, Jan Schaefer 2013, John Layt @@ -32,7 +36,6 @@ 2009, Michael Pyne 2014, Montel Laurent 2015, Nick Shaforostoff - 2006, Nicolas GOUTTE 2002-2008, Oswald Buddenhagen 1999, Sean Harmer 2000, Stephan Kulow @@ -41,41 +44,42 @@ 2003, Waldo Bastian 2000, Espen Sand 2008, Friedrich W. H. Kossebau + 2017, Harald Sitter 2006, Nicolas GOUTTE 2010, Teo Mrnjavac 2009, Adriaan de Groot, Mustapha Abubakar, Ibrahim Dasuna 2006, Canonical Ltd, and Rosetta Contributors 2006 1998, Erez Nir - 2004-2009, Free Software Foundation, Inc + 1998-2017, Free Software Foundation, Inc 2008-2009, K Desktop Environment 2005, KDE Armenian translation team 2005, KDE Russian translation team - 2000-2003, KDE e.v + 2000-2004, KDE e.v 2007, KDE i18n Project for Vietnamese 1999-2003, Meni Livne - 2002-2012, This_file_is_part_of_KDE + 2002-2016, This_file_is_part_of_KDE 2001, translate.org.za + 2009-2013, Yasen Pramatarov + 2006-2009, Zlatko Popov License: LGPL-2+ -Files: autotests/kcompositejobtest.cpp +Files: autotests/kaboutdataapplicationdatatest.cpp + autotests/kcompositejobtest.cpp autotests/kcompositejobtest.h autotests/kdelibs4configmigratortest.cpp autotests/kdelibs4migrationtest.cpp autotests/kjobtest.cpp autotests/kjobtest.h autotests/kmacroexpandertest.cpp + autotests/krandomtest.cpp autotests/kshelltest.cpp autotests/ktexttohtmltest.cpp - src/lib/caching/kshareddatacache.cpp - src/lib/caching/kshareddatacache.h - src/lib/caching/kshareddatacache_p.h - src/lib/caching/kshareddatacache_win.cpp + src/lib/caching/* src/lib/io/kbackup.cpp src/lib/io/kbackup.h src/lib/io/kdirwatch.cpp src/lib/io/kdirwatch.h src/lib/io/kdirwatch_p.h - src/lib/io/kdirwatch_win.cpp src/lib/io/kmessage.cpp src/lib/io/kmessage.h src/lib/jobs/kcompositejob.cpp @@ -93,22 +97,18 @@ src/lib/plugin/kpluginmetadata.h src/lib/randomness/krandomsequence.h src/lib/text/kstringhandler.h - tests/faceicontest.cpp - tests/faceicontest.h - tests/kdirwatchtest.cpp - tests/kdirwatchtest.h - tests/kdirwatchtest_gui.cpp - tests/kdirwatchtest_gui.h - tests/krandomsequencetest.cpp + tests/* autotests/kaboutdatatest.cpp Copyright: 2014, Alex Richardson 2006-2007, Allen Winter + 2016, Arne Spiegelhauer 2007, Bernhard Loos 2010-2014, David Faure 2006, Dirk Mueller 2006, Dirk Stoecker 2006, Dominic Battre 2007, Flavio Castelli + 2016, Friedrich W. H. Kossebau 2006, Gregory S. Hayes 1999, Ian Zepp 2005, Ingo Kloecker @@ -117,7 +117,7 @@ 2013, Kevin Funk 2006-2007, Kevin Ottens 2006, Martin Pool - 2010-2012, Michael Pyne + 2010-2016, Michael Pyne 2006, Michaël Larouche 2014, Montel Laurent 2014, Nicolás Alvarez @@ -132,6 +132,7 @@ 2005, Thomas Braxton 1999, Waldo Bastian 2008, Friedrich W. H. Kossebau + 2017, Harald Sitter License: LGPL-2 Files: autotests/alwaysunloadplugin.cpp @@ -149,69 +150,50 @@ Copyright: 2014, Alex Merry 2013, Sebastian Kügler License: GPL-2+3+KDEeV - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License or (at your option) version 3 or any later version - accepted by the membership of KDE e.V. (or its successor approved - by the membership of KDE e.V.), which shall act as a proxy - defined in Section 14 of version 3 of the license. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public License - version 2 can be found in "/usr/share/common-licenses/GPL-2", and the - complete text of the GNU General Public License version 3 can be found in - "/usr/share/common-licenses/GPL-3". Files: autotests/kpluginfactorytest.cpp autotests/kpluginloadertest.cpp - autotests/kshareddatacachetest.cpp + autotests/kpluginmetadatatest.cpp src/desktoptojson/desktoptojson.cpp src/desktoptojson/desktoptojson.h src/desktoptojson/main.cpp - src/lib/plugin/desktopfileparser.h - po/ca/kcoreaddons5_qt.po - po/ca@valencia/kcoreaddons5_qt.po - po/uk/kcoreaddons5_qt.po + src/lib/plugin/desktopfileparser_p.h + po/ca/* + po/ca@valencia/* + po/uk/* src/lib/plugin/desktopfileparser.cpp Copyright: 2014, Alex Merry 2014, Alex Richardson 2013-2014, Sebastian Kügler - 2014-2015, This_file_is_part_of_KDE + 2014-2017, This_file_is_part_of_KDE 2014, Alex Richardson 2013-2014, Sebastian Kügler License: LGPL-2.1+3+KDEeV - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License or ( at - your option ) version 3 or, at the discretion of KDE e.V. ( which shall - act as a proxy as in section 14 of the GPLv3 ), 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 Lesser 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. - . - On Debian systems, the complete text of the GNU Lesser General Public License - version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", and the - complete text of the GNU Lesser General Public License version 3 can be found - in "/usr/share/common-licenses/LGPL-3". Files: COPYING-CMAKE-SCRIPTS - cmake/FindFAM.cmake + cmake/* Copyright: 2006, Alexander Neundorf + 2016, Shaheed Haque + 2016, Stephen Kelly +License: BSD-3-clause + +Files: src/lib/io/kfilesystemtype.cpp + src/lib/io/kfilesystemtype.h +Copyright: 2011, David Faure +License: LGPL-2.1 + +Files: autotests/kshareddatacachetest.cpp +Copyright: 2012, David Faure +License: LGPL-2+3+KDEeV + +Files: src/lib/caching/posix_fallocate_mac.h +Copyright: 2015-2016, R.J.V. Bertin +License: GPL-2+ or LGPL-2.1+ or MPL-1.1 + +Files: debian/* +Copyright: 2014 Michał Zając +License: LGPL-2+ + License: BSD-3-clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -236,47 +218,54 @@ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: autotests/kshareddatacachetest.cpp -Copyright: 2012, David Faure -License: LGPL-2+3+KDEeV - This library is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2 of the License or ( at - your option ) version 3 or, at the discretion of KDE e.V. ( which shall - act as a proxy as in section 14 of the GPLv3 ), any later version. +License: GPL-2 + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. . - This library is distributed in the hope that it will be useful, + This program 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 Lesser 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. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . - On Debian systems, the complete text of the GNU Lesser General Public License - version 2 can be found in "/usr/share/common-licenses/LGPL-2", and the - complete text of the GNU Lesser General Public License version 3 can be found - in "/usr/share/common-licenses/LGPL-3". - -Files: src/lib/io/kfilesystemtype.cpp - src/lib/io/kfilesystemtype.h -Copyright: 2011, David Faure -License: LGPL-2.1 + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in "/usr/share/common-licenses/GPL-2". -Files: po/bg/kcoreaddons5_qt.po -Copyright: 2009-2013, Yasen Pramatarov - 2006-2009, Zlatko Popov -License: GPL - This file is licensed under the GPL. +License: GPL-2+ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License. + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. . On Debian systems, the complete text of the GNU General Public License - can be found in `/usr/share/common-licenses/GPL'. + version 2 can be found in "/usr/share/common-licenses/GPL-2". -Files: debian/* -Copyright: 2014 Michał Zając -License: LGPL-2+ +License: GPL-2+3+KDEeV + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License or (at your option) version 3 or any later version + accepted by the membership of KDE e.V. (or its successor approved + by the membership of KDE e.V.), which shall act as a proxy + defined in Section 14 of version 3 of the license. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU General Public License + version 2 can be found in "/usr/share/common-licenses/GPL-2", and the + complete text of the GNU General Public License version 3 can be found in + "/usr/share/common-licenses/GPL-3". License: LGPL-2 This library is free software; you can redistribute it and/or @@ -291,8 +280,8 @@ You should have received a copy of the GNU Library General Public License along with this library. If not, see . - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in "/usr/share/common-licenses/LGPL-2". + The complete text of the GNU Library General Public License version 2 can be + found in "/usr/share/common-licenses/LGPL-2". License: LGPL-2+ This package is free software; you can redistribute it and/or @@ -308,8 +297,43 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . . - On Debian systems, the complete text of the GNU Lesser General - Public License can be found in "/usr/share/common-licenses/LGPL-2". + On Debian systems, the complete text of the GNU Library General Public + License version 2 can be found in "/usr/share/common-licenses/LGPL-2". + +License: LGPL-2.1 + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License version 2.1 as published by the Free Software Foundation. + . + 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. + . + The complete text of the GNU Lesser General Public License version 2.1 can be + found in "/usr/share/common-licenses/LGPL-2.1". + +License: LGPL-2+3+KDEeV + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2 of the License or ( at + your option ) version 3 or, at the discretion of KDE e.V. ( which shall + act as a proxy as in section 14 of the GPLv3 ), 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 Lesser 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. + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2 can be found in "/usr/share/common-licenses/LGPL-2", and the + complete text of the GNU Lesser General Public License version 3 can be found + in "/usr/share/common-licenses/LGPL-3". License: LGPL-2.1 This library is free software; you can redistribute it and/or modify it under @@ -326,3 +350,50 @@ . On Debian systems, the complete text of the GNU Lesser General Public License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-2.1+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This 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 + Lesser General Public License for more details. + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'. + +License: LGPL-2.1+3+KDEeV + This library is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License or ( at + your option ) version 3 or, at the discretion of KDE e.V. ( which shall + act as a proxy as in section 14 of the GPLv3 ), 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 Lesser 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. + . + On Debian systems, the complete text of the GNU Lesser General Public License + version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1", and the + complete text of the GNU Lesser General Public License version 3 can be found + in "/usr/share/common-licenses/LGPL-3". + +License: MPL-1.1 + The contents of this file are subject to the Mozilla Public License Version + 1.1 (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + . + Software distributed under the License is distributed on an "AS IS" basis, + WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + for the specific language governing rights and limitations under the + License. diff -Nru kcoreaddons-5.46.0/debian/libkf5coreaddons-data.lintian-overrides kcoreaddons-5.47.0/debian/libkf5coreaddons-data.lintian-overrides --- kcoreaddons-5.46.0/debian/libkf5coreaddons-data.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ kcoreaddons-5.47.0/debian/libkf5coreaddons-data.lintian-overrides 2018-06-14 14:48:09.000000000 +0000 @@ -0,0 +1,3 @@ +# These are copies used in kaboutdialog to have applications offer their full +# license version in the about dialog. +libkf5coreaddons-data: extra-license-file usr/share/kf5/licenses/* diff -Nru kcoreaddons-5.46.0/debian/libkf5coreaddons-doc.install kcoreaddons-5.47.0/debian/libkf5coreaddons-doc.install --- kcoreaddons-5.46.0/debian/libkf5coreaddons-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ kcoreaddons-5.47.0/debian/libkf5coreaddons-doc.install 2018-06-14 14:48:09.000000000 +0000 @@ -0,0 +1,2 @@ +usr/share/qt5/doc/KF5CoreAddons.qch +usr/share/qt5/doc/KF5CoreAddons.tags diff -Nru kcoreaddons-5.46.0/debian/meta/cmake-ignore kcoreaddons-5.47.0/debian/meta/cmake-ignore --- kcoreaddons-5.46.0/debian/meta/cmake-ignore 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/meta/cmake-ignore 2018-06-14 14:48:09.000000000 +0000 @@ -1 +1,4 @@ -FAM +- FAM +- QCH , API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop): + series: xenial +- PythonModuleGeneration diff -Nru kcoreaddons-5.46.0/debian/patches/fix-kformattest.patch kcoreaddons-5.47.0/debian/patches/fix-kformattest.patch --- kcoreaddons-5.46.0/debian/patches/fix-kformattest.patch 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/patches/fix-kformattest.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,33 +0,0 @@ -Index: b/autotests/kformattest.cpp -=================================================================== ---- a/autotests/kformattest.cpp -+++ b/autotests/kformattest.cpp -@@ -248,8 +248,8 @@ - { - KFormat format(QLocale::c()); - -- QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); -- QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); -+// QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); -+// QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); - QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); -@@ -264,7 +264,7 @@ - { - KFormat format(QLocale::c()); - -- QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); -+/* QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); - QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); - QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)")); - QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)")); -@@ -279,7 +279,7 @@ - QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); - // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration - // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. -- QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)")); -+ QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)"));*/ - } - - void KFormatTest::formatRelativeDate() diff -Nru kcoreaddons-5.46.0/debian/patches/fix-kformattest-plural-forms.patch kcoreaddons-5.47.0/debian/patches/fix-kformattest-plural-forms.patch --- kcoreaddons-5.46.0/debian/patches/fix-kformattest-plural-forms.patch 1970-01-01 00:00:00.000000000 +0000 +++ kcoreaddons-5.47.0/debian/patches/fix-kformattest-plural-forms.patch 2018-06-14 14:48:09.000000000 +0000 @@ -0,0 +1,56 @@ +From: Maximiliano Curia +Date: Tue, 15 May 2018 13:06:53 +0200 +Subject: fix kformattest plural forms + +--- + autotests/kformattest.cpp | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) + +diff --git a/autotests/kformattest.cpp b/autotests/kformattest.cpp +index 15080be..6cc3c52 100644 +--- a/autotests/kformattest.cpp ++++ b/autotests/kformattest.cpp +@@ -248,8 +248,8 @@ void KFormatTest::formatDecimalDuration() + { + KFormat format(QLocale::c()); + +- QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 millisecond(s)")); +- QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 millisecond(s)")); ++ QCOMPARE(format.formatDecimalDuration(10), QStringLiteral("10 milliseconds")); ++ QCOMPARE(format.formatDecimalDuration(10, 3), QStringLiteral("10 milliseconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 10), QStringLiteral("1.01 seconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInSecond + 1, 3), QStringLiteral("1.001 seconds")); + QCOMPARE(format.formatDecimalDuration(1 * MSecsInMinute + 10 * MSecsInSecond), QStringLiteral("1.17 minutes")); +@@ -264,22 +264,22 @@ void KFormatTest::formatSpelloutDuration() + { + KFormat format(QLocale::c()); + +- QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second(s)")); +- QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 second(s)")); +- QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute(s)")); +- QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minute(s)")); +- QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour(s)")); +- QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hour(s)")); +- QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute(s) and 15 second(s)")); ++ QCOMPARE(format.formatSpelloutDuration(1000), QStringLiteral("1 second")); ++ QCOMPARE(format.formatSpelloutDuration(5000), QStringLiteral("5 seconds")); ++ QCOMPARE(format.formatSpelloutDuration(60000), QStringLiteral("1 minute")); ++ QCOMPARE(format.formatSpelloutDuration(300000), QStringLiteral("5 minutes")); ++ QCOMPARE(format.formatSpelloutDuration(3600000), QStringLiteral("1 hour")); ++ QCOMPARE(format.formatSpelloutDuration(18000000), QStringLiteral("5 hours")); ++ QCOMPARE(format.formatSpelloutDuration(75000), QStringLiteral("1 minute and 15 seconds")); + // Problematic case #1 (there is a reference to this case on kformat.cpp) +- QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minute(s)")); ++ QCOMPARE(format.formatSpelloutDuration(119999), QStringLiteral("2 minutes")); + // This case is strictly 2 hours, 15 minutes and 59 seconds. However, since the range is + // pretty high between hours and seconds, formatSpelloutDuration always omits seconds when there + // are hours in scene. +- QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hour(s) and 15 minute(s)")); ++ QCOMPARE(format.formatSpelloutDuration(8159000), QStringLiteral("2 hours and 15 minutes")); + // This case is strictly 1 hour and 10 seconds. For the same reason, formatSpelloutDuration + // detects that 10 seconds is just garbage compared to 1 hour, and omits it on the result. +- QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour(s)")); ++ QCOMPARE(format.formatSpelloutDuration(3610000), QStringLiteral("1 hour")); + } + + void KFormatTest::formatRelativeDate() diff -Nru kcoreaddons-5.46.0/debian/patches/kdirwatch-tests-method-specific.patch kcoreaddons-5.47.0/debian/patches/kdirwatch-tests-method-specific.patch --- kcoreaddons-5.46.0/debian/patches/kdirwatch-tests-method-specific.patch 1970-01-01 00:00:00.000000000 +0000 +++ kcoreaddons-5.47.0/debian/patches/kdirwatch-tests-method-specific.patch 2018-06-14 14:48:09.000000000 +0000 @@ -0,0 +1,36 @@ +From: Maximiliano Curia +Date: Tue, 15 May 2018 15:02:16 +0200 +Subject: kdirwatch tests method specific + +Skip the tests that won't work for the current backend +--- + autotests/kdirwatch_unittest.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/autotests/kdirwatch_unittest.cpp b/autotests/kdirwatch_unittest.cpp +index 1982c01..ff97214 100644 +--- a/autotests/kdirwatch_unittest.cpp ++++ b/autotests/kdirwatch_unittest.cpp +@@ -729,6 +729,10 @@ void KDirWatch_UnitTest::testHardlinkChange() + + //KDirWatch::statistics(); + ++ auto method = qgetenv("KDIRWATCH_METHOD"); ++ if ((method != "INotify") && (method != "Fam")) { ++ QSKIP("Only works with the inotify and fam backends", SkipSingle); ++ } + appendToFile(existingFile); + QVERIFY(waitForOneSignal(watch, SIGNAL(dirty(QString)), existingFile)); + #else +@@ -832,6 +836,11 @@ void KDirWatch_UnitTest::benchNotifyWatcher() + KDirWatch watch; + watch.addDir(dir.path(), KDirWatch::WatchSubDirs | KDirWatch:: WatchFiles); + ++ auto method = qgetenv("KDIRWATCH_METHOD"); ++ if ((method != "INotify") && (method != "QFSWatch")) { ++ QSKIP("Only works with the inotify and qfswatch backends", SkipSingle); ++ } ++ + // now touch all the files repeatedly and wait for the dirty updates to come in + QSignalSpy spy(&watch, &KDirWatch::dirty); + QBENCHMARK { diff -Nru kcoreaddons-5.46.0/debian/patches/series kcoreaddons-5.47.0/debian/patches/series --- kcoreaddons-5.46.0/debian/patches/series 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/patches/series 2018-06-14 14:48:09.000000000 +0000 @@ -1,2 +1,3 @@ kubuntu_disable-expensive-tests.patch -fix-kformattest.patch +fix-kformattest-plural-forms.patch +kdirwatch-tests-method-specific.patch diff -Nru kcoreaddons-5.46.0/debian/rules kcoreaddons-5.47.0/debian/rules --- kcoreaddons-5.46.0/debian/rules 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/rules 2018-06-14 14:48:09.000000000 +0000 @@ -1,7 +1,10 @@ #!/usr/bin/make -f - + include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk +override_dh_auto_configure: + $(overridden_command) -- -DBUILD_QCH=ON + override_dh_strip: $(overridden_command) --dbgsym-migration='libkf5coreaddons5-dbg (<= 5.19.0-1~~)' diff -Nru kcoreaddons-5.46.0/debian/tests/testsuite kcoreaddons-5.47.0/debian/tests/testsuite --- kcoreaddons-5.46.0/debian/tests/testsuite 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/tests/testsuite 2018-06-14 14:48:09.000000000 +0000 @@ -6,4 +6,5 @@ trap "rm -rf debian/tests.home" EXIT fi mkdir -p "$HOME"/.config || true -dh_auto_test + +dh_auto_test --no-parallel diff -Nru kcoreaddons-5.46.0/debian/upstream/metadata kcoreaddons-5.47.0/debian/upstream/metadata --- kcoreaddons-5.46.0/debian/upstream/metadata 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/upstream/metadata 2018-06-14 14:48:09.000000000 +0000 @@ -1,7 +1,7 @@ Name: kcoreaddons -Changelog: https://quickgit.kde.org/?p=kcoreaddons.git&a=log +Changelog: https://cgit.kde.org/kcoreaddons.git/log Contact: kde-frameworks-devel@kde.org Donation: https://www.kde.org/community/donations/index.php Repository: https://anongit.kde.org/kcoreaddons.git -Repository-Browse: https://quickgit.kde.org/?p=kcoreaddons.git +Repository-Browse: https://cgit.kde.org/kcoreaddons.git Security-Contact: security@kde.org diff -Nru kcoreaddons-5.46.0/debian/upstream/signing-key.asc kcoreaddons-5.47.0/debian/upstream/signing-key.asc --- kcoreaddons-5.46.0/debian/upstream/signing-key.asc 1970-01-01 00:00:00.000000000 +0000 +++ kcoreaddons-5.47.0/debian/upstream/signing-key.asc 2018-06-14 14:48:09.000000000 +0000 @@ -0,0 +1,30 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBFfNUR8BCADDjPXScwObp7mWwUnrjqrM0gGg+pId6vqe0a5A4xr+Rgj26quK +2qJLym0mmul/uh2M8z486qDTQYQaTEppFCosH3WqFonTN2LWpHcujeVABXkAe9qo +DHBZZRMw8CXtiEwvJ/xV/MXTR7G0QCqT4HF045SAyyBjusBiiGly32JEDD4FdjHj +KKUrAJyyoc6frake7ZMO0SO3tQNwmi4T5KLSoxhi3Zgez2k9GPZEj4/W7l5Ne0zQ +7C8Tgo8wraqj/8pzjfP6+Dc2LHOTtu8DGDQkXEFa9VvuAotOtI8Kjff+bOd36WTL +L2dk69Bb7WbhRLkkavHZCdKOpfyBtVn+hGWRABEBAAG0G0RhdmlkIEZhdXJlIDxm +YXVyZUBrZGUub3JnPokBPQQTAQgAJwUCV81RHwIbAwUJCWYBgAULCQgHAgYVCAkK +CwIEFgIDAQIeAQIXgAAKCRBY0O5kikizu/01B/46hG+MaTFW1CVevZrGyPacmDRj +pQhx/ODadBkVXXaJyr7aNKT3EvAedyT82SGT/ch+aqXjZK1kEwK6zITqoOZZUt2I +CjBN4+UfLrWwlKldZShbhJ6NMHJIeYQ5EDlMw7TWVn0OPkRuDvLEasgOhxR9ZjWW +c5wlcZXXy8N+wGSR0bThzl0pdFcIy9Z3g411ZOvjUdDuWqtKUH9iy1VdVyba7FXI +x/BqAXIVsAaIFNsJBZZ7C7j1a1IlTykRLiDjh3mpyBfX4xfMTo4z6pjfQsoPebJl +TlCnwAkIxeyatGXm4OCqEA9zPVd1Ju7+XuEr6+15ENYJ4oYsZjfyScHHJdWMuQEN +BFfNUR8BCADe5wRc/QFL92npVAgzPQ9mJKopscRcxs0f2DM7EBPzUFvWGRIGRdB8 +obXfzBp4Pfyzqky7C1X/j7ENzx+Kol1AJ93wjUEfLoZ/zsvoj9ZT3GdjeVQeReKY +d4th7Jqo4qxvi33Pud0jZsENezzgdd4npiNN9bFX0mjNKNHL9o1n5nTm9pfDI/AS +PZz2RoRO7oUJb+aX6hKxTBaKoAiZHybAXQVchtwJx0O4wLbZ3E4ytJdcATlPDNXS +jw2Lmns8aGa6DBGyqiG6g1PlCnOI2Q/cQK1zbkSisfoCbpEq1MgIzuZSoJ00NIEp +eiACoR82565G68yAb+uKHkcFrYkfDT41ABEBAAGJASUEGAEIAA8FAlfNUR8CGwwF +CQlmAYAACgkQWNDuZIpIs7vWkgf9GNUZmD0UgbQmj0nwkEHum1g7LD+MZL0+P2kg +HyEL3Cm01ot9d+X5ed/gAJ6hDR55KYxHi+/wwwkCNDLoQoP+7VZq2fMiGD0/bDar +oWQqbckqDZU4l69u9NbYvVWHUerfwKfi0ZKN5sJqLwIkr57wEX0I/TBGoMuFB27q +2qyloS5m1Q2pke2mmZjKSqE0jxZJ7iFGJO/Buyjgd1B2kr0DaGaCrh0wjfVjAWpt +klK95Phry1jQc7W0Z4ZdWpB79S1yW670eutSC4fMjvsNxROGkPx4dDkyG5nToeau +zhEh/pXho2Eo/aFEqqY42GMSlN9rf7ekaTNo7OxsE7vvCB0fug== +=4o3u +-----END PGP PUBLIC KEY BLOCK----- diff -Nru kcoreaddons-5.46.0/debian/watch kcoreaddons-5.47.0/debian/watch --- kcoreaddons-5.46.0/debian/watch 2018-05-15 14:55:22.000000000 +0000 +++ kcoreaddons-5.47.0/debian/watch 2018-06-14 14:48:09.000000000 +0000 @@ -1,2 +1,3 @@ -version=3 -http://download.kde.org/stable/frameworks/([\d\.]*)/kcoreaddons-(.*)\.tar\.xz +version=4 + +opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/frameworks/([\d\.]*)/kcoreaddons-(.*)\.tar\.xz diff -Nru kcoreaddons-5.46.0/po/id/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/id/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/id/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/id/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: kdelibs4\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-23 01:50+0000\n" -"PO-Revision-Date: 2018-04-03 06:32+0700\n" +"PO-Revision-Date: 2018-05-31 22:01+0700\n" "Last-Translator: Wantoyo \n" "Language-Team: Indonesian \n" "Language: id\n" @@ -120,7 +120,7 @@ #: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" msgid "Custom" -msgstr "Suaian" +msgstr "Kustom" #: lib/kaboutdata.cpp:384 msgctxt "KAboutLicense|@item license" @@ -527,7 +527,7 @@ "KFormat|used when a relative date string can't be generated because the date " "is invalid" msgid "Invalid date" -msgstr "Tanggal tidak sah" +msgstr "Tanggal tidak absah" #: lib/util/kformatprivate.cpp:382 msgctxt "KFormat|" diff -Nru kcoreaddons-5.46.0/po/sr/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/sr/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/sr/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/sr/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -23,7 +23,7 @@ "X-Wrapping: fine\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:291 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -34,103 +34,103 @@ "Проверите да ли су услови лиценцирања наведени у\n" "документацији или изворном коду.\n" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:302 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Услови за дистрибуирање програма: %1." -#: lib/kaboutdata.cpp:347 +#: lib/kaboutdata.cpp:348 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "ОЈЛ в2" -#: lib/kaboutdata.cpp:348 +#: lib/kaboutdata.cpp:349 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "Гнуова Општа јавна лиценца, верзија 2" -#: lib/kaboutdata.cpp:351 +#: lib/kaboutdata.cpp:352 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "МОЈЛ в3" -#: lib/kaboutdata.cpp:352 +#: lib/kaboutdata.cpp:353 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "Гнуова Мања општа јавна лиценца, верзија 2" -#: lib/kaboutdata.cpp:355 +#: lib/kaboutdata.cpp:356 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "БСД" -#: lib/kaboutdata.cpp:356 +#: lib/kaboutdata.cpp:357 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "БСД" -#: lib/kaboutdata.cpp:359 +#: lib/kaboutdata.cpp:360 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Уметничка" -#: lib/kaboutdata.cpp:360 +#: lib/kaboutdata.cpp:361 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Уметничка" -#: lib/kaboutdata.cpp:363 +#: lib/kaboutdata.cpp:364 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "КуПЛ 1.0" -#: lib/kaboutdata.cpp:364 +#: lib/kaboutdata.cpp:365 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Ку јавна лиценца" -#: lib/kaboutdata.cpp:367 +#: lib/kaboutdata.cpp:368 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "ОЈЛ в3" -#: lib/kaboutdata.cpp:368 +#: lib/kaboutdata.cpp:369 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "Гнуова Општа јавна лиценца, верзија 3" -#: lib/kaboutdata.cpp:371 +#: lib/kaboutdata.cpp:372 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "МОЈЛ в3" -#: lib/kaboutdata.cpp:372 +#: lib/kaboutdata.cpp:373 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "Гнуова Мања општа јавна лиценца, верзија 3" -#: lib/kaboutdata.cpp:375 +#: lib/kaboutdata.cpp:376 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" msgstr "МОЈЛ в2.1" -#: lib/kaboutdata.cpp:376 +#: lib/kaboutdata.cpp:377 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" msgstr "Гнуова Мања општа јавна лиценца, верзија 2.1" -#: lib/kaboutdata.cpp:380 +#: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "(посебна)" -#: lib/kaboutdata.cpp:383 +#: lib/kaboutdata.cpp:384 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "(није наведена)" -#: lib/kaboutdata.cpp:932 +#: lib/kaboutdata.cpp:933 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "

KDE is translated into many languages thanks to the work of the " @@ -146,43 +146,43 @@ "затреба.

За детаљније информације о локализацији КДЕ‑а уопште, " "посетите https://l10n.kde.org.

" -#: lib/kaboutdata.cpp:1159 +#: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Прикажи податке о ауторима." -#: lib/kaboutdata.cpp:1160 +#: lib/kaboutdata.cpp:1161 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Прикажи податке о лиценци." -#: lib/kaboutdata.cpp:1162 +#: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Основно име фајла ставке површи за овај програм." -#: lib/kaboutdata.cpp:1163 +#: lib/kaboutdata.cpp:1164 msgctxt "KAboutData CLI|" msgid "file name" msgstr "Име фајла" -#: lib/kaboutdata.cpp:1172 +#: lib/kaboutdata.cpp:1173 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Овај програм је написао неко ко жели да остане анониман." -#: lib/kaboutdata.cpp:1174 +#: lib/kaboutdata.cpp:1175 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "%1 написали:" -#: lib/kaboutdata.cpp:1185 +#: lib/kaboutdata.cpp:1186 msgctxt "KAboutData CLI|" msgid "Please use https://bugs.kde.org to report bugs." msgstr "Користите https://bugs.kde.org за пријаву грешака." -#: lib/kaboutdata.cpp:1187 +#: lib/kaboutdata.cpp:1188 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -Nru kcoreaddons-5.46.0/po/sr@ijekavian/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/sr@ijekavian/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/sr@ijekavian/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/sr@ijekavian/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -22,7 +22,7 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:291 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -33,103 +33,103 @@ "Провјерите да ли су услови лиценцирања наведени у\n" "документацији или изворном коду.\n" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:302 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Услови за дистрибуирање програма: %1." -#: lib/kaboutdata.cpp:347 +#: lib/kaboutdata.cpp:348 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "ОЈЛ в2" -#: lib/kaboutdata.cpp:348 +#: lib/kaboutdata.cpp:349 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "Гнуова Општа јавна лиценца, верзија 2" -#: lib/kaboutdata.cpp:351 +#: lib/kaboutdata.cpp:352 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "МОЈЛ в3" -#: lib/kaboutdata.cpp:352 +#: lib/kaboutdata.cpp:353 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "Гнуова Мања општа јавна лиценца, верзија 2" -#: lib/kaboutdata.cpp:355 +#: lib/kaboutdata.cpp:356 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "БСД" -#: lib/kaboutdata.cpp:356 +#: lib/kaboutdata.cpp:357 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "БСД" -#: lib/kaboutdata.cpp:359 +#: lib/kaboutdata.cpp:360 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Умјетничка" -#: lib/kaboutdata.cpp:360 +#: lib/kaboutdata.cpp:361 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Умјетничка" -#: lib/kaboutdata.cpp:363 +#: lib/kaboutdata.cpp:364 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "КуПЛ 1.0" -#: lib/kaboutdata.cpp:364 +#: lib/kaboutdata.cpp:365 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Ку јавна лиценца" -#: lib/kaboutdata.cpp:367 +#: lib/kaboutdata.cpp:368 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "ОЈЛ в3" -#: lib/kaboutdata.cpp:368 +#: lib/kaboutdata.cpp:369 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "Гнуова Општа јавна лиценца, верзија 3" -#: lib/kaboutdata.cpp:371 +#: lib/kaboutdata.cpp:372 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "МОЈЛ в3" -#: lib/kaboutdata.cpp:372 +#: lib/kaboutdata.cpp:373 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "Гнуова Мања општа јавна лиценца, верзија 3" -#: lib/kaboutdata.cpp:375 +#: lib/kaboutdata.cpp:376 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" msgstr "МОЈЛ в2.1" -#: lib/kaboutdata.cpp:376 +#: lib/kaboutdata.cpp:377 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" msgstr "Гнуова Мања општа јавна лиценца, верзија 2.1" -#: lib/kaboutdata.cpp:380 +#: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "(посебна)" -#: lib/kaboutdata.cpp:383 +#: lib/kaboutdata.cpp:384 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "(није наведена)" -#: lib/kaboutdata.cpp:932 +#: lib/kaboutdata.cpp:933 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "

KDE is translated into many languages thanks to the work of the " @@ -145,43 +145,43 @@ "затреба.

За детаљније информације о локализацији КДЕ‑а уопште, " "посјетите https://l10n.kde.org.

" -#: lib/kaboutdata.cpp:1159 +#: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Прикажи податке о ауторима." -#: lib/kaboutdata.cpp:1160 +#: lib/kaboutdata.cpp:1161 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Прикажи податке о лиценци." -#: lib/kaboutdata.cpp:1162 +#: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Основно име фајла ставке површи за овај програм." -#: lib/kaboutdata.cpp:1163 +#: lib/kaboutdata.cpp:1164 msgctxt "KAboutData CLI|" msgid "file name" msgstr "Име фајла" -#: lib/kaboutdata.cpp:1172 +#: lib/kaboutdata.cpp:1173 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Овај програм је написао неко ко жели да остане анониман." -#: lib/kaboutdata.cpp:1174 +#: lib/kaboutdata.cpp:1175 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "%1 написали:" -#: lib/kaboutdata.cpp:1185 +#: lib/kaboutdata.cpp:1186 msgctxt "KAboutData CLI|" msgid "Please use https://bugs.kde.org to report bugs." msgstr "Користите https://bugs.kde.org за пријаву грешака." -#: lib/kaboutdata.cpp:1187 +#: lib/kaboutdata.cpp:1188 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -Nru kcoreaddons-5.46.0/po/sr@ijekavianlatin/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/sr@ijekavianlatin/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/sr@ijekavianlatin/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/sr@ijekavianlatin/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -22,7 +22,7 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:291 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -33,103 +33,103 @@ "Provjerite da li su uslovi licenciranja navedeni u\n" "dokumentaciji ili izvornom kodu.\n" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:302 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Uslovi za distribuiranje programa: %1." -#: lib/kaboutdata.cpp:347 +#: lib/kaboutdata.cpp:348 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "OJL v2" -#: lib/kaboutdata.cpp:348 +#: lib/kaboutdata.cpp:349 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU‑ova Opšta javna licenca, verzija 2" -#: lib/kaboutdata.cpp:351 +#: lib/kaboutdata.cpp:352 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "MOJL v3" -#: lib/kaboutdata.cpp:352 +#: lib/kaboutdata.cpp:353 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU‑ova Manja opšta javna licenca, verzija 2" -#: lib/kaboutdata.cpp:355 +#: lib/kaboutdata.cpp:356 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD" -#: lib/kaboutdata.cpp:356 +#: lib/kaboutdata.cpp:357 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD" -#: lib/kaboutdata.cpp:359 +#: lib/kaboutdata.cpp:360 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Umjetnička" -#: lib/kaboutdata.cpp:360 +#: lib/kaboutdata.cpp:361 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Umjetnička" -#: lib/kaboutdata.cpp:363 +#: lib/kaboutdata.cpp:364 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL 1.0" -#: lib/kaboutdata.cpp:364 +#: lib/kaboutdata.cpp:365 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q javna licenca" -#: lib/kaboutdata.cpp:367 +#: lib/kaboutdata.cpp:368 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "OJL v3" -#: lib/kaboutdata.cpp:368 +#: lib/kaboutdata.cpp:369 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU‑ova Opšta javna licenca, verzija 3" -#: lib/kaboutdata.cpp:371 +#: lib/kaboutdata.cpp:372 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "MOJL v3" -#: lib/kaboutdata.cpp:372 +#: lib/kaboutdata.cpp:373 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU‑ova Manja opšta javna licenca, verzija 3" -#: lib/kaboutdata.cpp:375 +#: lib/kaboutdata.cpp:376 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" msgstr "MOJL v2.1" -#: lib/kaboutdata.cpp:376 +#: lib/kaboutdata.cpp:377 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" msgstr "GNU‑ova Manja opšta javna licenca, verzija 2.1" -#: lib/kaboutdata.cpp:380 +#: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "(posebna)" -#: lib/kaboutdata.cpp:383 +#: lib/kaboutdata.cpp:384 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "(nije navedena)" -#: lib/kaboutdata.cpp:932 +#: lib/kaboutdata.cpp:933 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "

KDE is translated into many languages thanks to the work of the " @@ -145,43 +145,43 @@ "zatreba.

Za detaljnije informacije o lokalizaciji KDE‑a uopšte, " "posjetite https://l10n.kde.org.

" -#: lib/kaboutdata.cpp:1159 +#: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Prikaži podatke o autorima." -#: lib/kaboutdata.cpp:1160 +#: lib/kaboutdata.cpp:1161 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Prikaži podatke o licenci." -#: lib/kaboutdata.cpp:1162 +#: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Osnovno ime fajla stavke površi za ovaj program." -#: lib/kaboutdata.cpp:1163 +#: lib/kaboutdata.cpp:1164 msgctxt "KAboutData CLI|" msgid "file name" msgstr "Ime fajla" -#: lib/kaboutdata.cpp:1172 +#: lib/kaboutdata.cpp:1173 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Ovaj program je napisao neko ko želi da ostane anoniman." -#: lib/kaboutdata.cpp:1174 +#: lib/kaboutdata.cpp:1175 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "%1 napisali:" -#: lib/kaboutdata.cpp:1185 +#: lib/kaboutdata.cpp:1186 msgctxt "KAboutData CLI|" msgid "Please use https://bugs.kde.org to report bugs." msgstr "Koristite https://bugs.kde.org za prijavu grešaka." -#: lib/kaboutdata.cpp:1187 +#: lib/kaboutdata.cpp:1188 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -Nru kcoreaddons-5.46.0/po/sr@latin/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/sr@latin/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/sr@latin/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/sr@latin/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -22,7 +22,7 @@ "X-Environment: kde\n" "X-Qt-Contexts: true\n" -#: lib/kaboutdata.cpp:291 +#: lib/kaboutdata.cpp:292 msgctxt "KAboutLicense|" msgid "" "No licensing terms for this program have been specified.\n" @@ -33,103 +33,103 @@ "Proverite da li su uslovi licenciranja navedeni u\n" "dokumentaciji ili izvornom kodu.\n" -#: lib/kaboutdata.cpp:301 +#: lib/kaboutdata.cpp:302 #, qt-format msgctxt "KAboutLicense|" msgid "This program is distributed under the terms of the %1." msgstr "Uslovi za distribuiranje programa: %1." -#: lib/kaboutdata.cpp:347 +#: lib/kaboutdata.cpp:348 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v2" msgstr "OJL v2" -#: lib/kaboutdata.cpp:348 +#: lib/kaboutdata.cpp:349 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 2" msgstr "GNU‑ova Opšta javna licenca, verzija 2" -#: lib/kaboutdata.cpp:351 +#: lib/kaboutdata.cpp:352 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2" msgstr "MOJL v3" -#: lib/kaboutdata.cpp:352 +#: lib/kaboutdata.cpp:353 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2" msgstr "GNU‑ova Manja opšta javna licenca, verzija 2" -#: lib/kaboutdata.cpp:355 +#: lib/kaboutdata.cpp:356 msgctxt "KAboutLicense|@item license (short name)" msgid "BSD License" msgstr "BSD" -#: lib/kaboutdata.cpp:356 +#: lib/kaboutdata.cpp:357 msgctxt "KAboutLicense|@item license" msgid "BSD License" msgstr "BSD" -#: lib/kaboutdata.cpp:359 +#: lib/kaboutdata.cpp:360 msgctxt "KAboutLicense|@item license (short name)" msgid "Artistic License" msgstr "Umetnička" -#: lib/kaboutdata.cpp:360 +#: lib/kaboutdata.cpp:361 msgctxt "KAboutLicense|@item license" msgid "Artistic License" msgstr "Umetnička" -#: lib/kaboutdata.cpp:363 +#: lib/kaboutdata.cpp:364 msgctxt "KAboutLicense|@item license (short name)" msgid "QPL v1.0" msgstr "QPL 1.0" -#: lib/kaboutdata.cpp:364 +#: lib/kaboutdata.cpp:365 msgctxt "KAboutLicense|@item license" msgid "Q Public License" msgstr "Q javna licenca" -#: lib/kaboutdata.cpp:367 +#: lib/kaboutdata.cpp:368 msgctxt "KAboutLicense|@item license (short name)" msgid "GPL v3" msgstr "OJL v3" -#: lib/kaboutdata.cpp:368 +#: lib/kaboutdata.cpp:369 msgctxt "KAboutLicense|@item license" msgid "GNU General Public License Version 3" msgstr "GNU‑ova Opšta javna licenca, verzija 3" -#: lib/kaboutdata.cpp:371 +#: lib/kaboutdata.cpp:372 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v3" msgstr "MOJL v3" -#: lib/kaboutdata.cpp:372 +#: lib/kaboutdata.cpp:373 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 3" msgstr "GNU‑ova Manja opšta javna licenca, verzija 3" -#: lib/kaboutdata.cpp:375 +#: lib/kaboutdata.cpp:376 msgctxt "KAboutLicense|@item license (short name)" msgid "LGPL v2.1" msgstr "MOJL v2.1" -#: lib/kaboutdata.cpp:376 +#: lib/kaboutdata.cpp:377 msgctxt "KAboutLicense|@item license" msgid "GNU Lesser General Public License Version 2.1" msgstr "GNU‑ova Manja opšta javna licenca, verzija 2.1" -#: lib/kaboutdata.cpp:380 +#: lib/kaboutdata.cpp:381 msgctxt "KAboutLicense|@item license" msgid "Custom" msgstr "(posebna)" -#: lib/kaboutdata.cpp:383 +#: lib/kaboutdata.cpp:384 msgctxt "KAboutLicense|@item license" msgid "Not specified" msgstr "(nije navedena)" -#: lib/kaboutdata.cpp:932 +#: lib/kaboutdata.cpp:933 msgctxt "KAboutData|replace this with information about your translation team" msgid "" "

KDE is translated into many languages thanks to the work of the " @@ -145,43 +145,43 @@ "zatreba.

Za detaljnije informacije o lokalizaciji KDE‑a uopšte, " "posetite https://l10n.kde.org.

" -#: lib/kaboutdata.cpp:1159 +#: lib/kaboutdata.cpp:1160 msgctxt "KAboutData CLI|" msgid "Show author information." msgstr "Prikaži podatke o autorima." -#: lib/kaboutdata.cpp:1160 +#: lib/kaboutdata.cpp:1161 msgctxt "KAboutData CLI|" msgid "Show license information." msgstr "Prikaži podatke o licenci." -#: lib/kaboutdata.cpp:1162 +#: lib/kaboutdata.cpp:1163 msgctxt "KAboutData CLI|" msgid "The base file name of the desktop entry for this application." msgstr "Osnovno ime fajla stavke površi za ovaj program." -#: lib/kaboutdata.cpp:1163 +#: lib/kaboutdata.cpp:1164 msgctxt "KAboutData CLI|" msgid "file name" msgstr "Ime fajla" -#: lib/kaboutdata.cpp:1172 +#: lib/kaboutdata.cpp:1173 msgctxt "KAboutData CLI|" msgid "This application was written by somebody who wants to remain anonymous." msgstr "Ovaj program je napisao neko ko želi da ostane anoniman." -#: lib/kaboutdata.cpp:1174 +#: lib/kaboutdata.cpp:1175 #, qt-format msgctxt "KAboutData CLI|" msgid "%1 was written by:" msgstr "%1 napisali:" -#: lib/kaboutdata.cpp:1185 +#: lib/kaboutdata.cpp:1186 msgctxt "KAboutData CLI|" msgid "Please use https://bugs.kde.org to report bugs." msgstr "Koristite https://bugs.kde.org za prijavu grešaka." -#: lib/kaboutdata.cpp:1187 +#: lib/kaboutdata.cpp:1188 #, qt-format msgctxt "KAboutData CLI|" msgid "Please report bugs to %1." diff -Nru kcoreaddons-5.46.0/po/zh_CN/kcoreaddons5_qt.po kcoreaddons-5.47.0/po/zh_CN/kcoreaddons5_qt.po --- kcoreaddons-5.46.0/po/zh_CN/kcoreaddons5_qt.po 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/po/zh_CN/kcoreaddons5_qt.po 2018-06-02 17:50:40.000000000 +0000 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-04-26 05:21-0400\n" +"PO-Revision-Date: 2018-05-18 06:23-0400\n" "Last-Translator: guoyunhebrave \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -Nru kcoreaddons-5.46.0/src/mimetypes/kde5.xml kcoreaddons-5.47.0/src/mimetypes/kde5.xml --- kcoreaddons-5.46.0/src/mimetypes/kde5.xml 2018-05-05 12:56:27.000000000 +0000 +++ kcoreaddons-5.47.0/src/mimetypes/kde5.xml 2018-06-02 17:50:40.000000000 +0000 @@ -3350,6 +3350,7 @@ KConfigXT-Einrichtungsoptionen KConfigXT Configuration Options Opciones de configuración de KConfigXT + KConfigXT konfiguratzeko aukerak KConfigXT Configuration Options Options de configuration de KConfigXT Opcións de configuración de KConfigXT @@ -3387,6 +3388,7 @@ KConfigXT-Optionen zur Quelltexterzeugung KConfigXT Code Generation Options Opciones de generación de código de KConfigXT + KConfigXT kodea sortzeko aukerak KConfigXT Code Generation Options Options de génération de code de KConfigXT Opcións de xeración de código de KConfigXT @@ -3420,6 +3422,7 @@ KXMLGUI-UI-Deklaration KXMLGUI UI Declaration Declaración de interfaz de usuario de KXMLGUI + KXMLGUI UI deklarazioa KXMLGUI UI Declaration Déclaration d'interface KXMLGUI Declaración de interface gráfica de KXMLGUI @@ -3458,6 +3461,7 @@ KNotification-Deklaration KNotification Declaration Declaración de KNotification + KNotification deklarazioa KNotification Declaration Déclaration de KNotification Declaración de KNotification