diff -Nru plasma-discover-5.8.5/debian/changelog plasma-discover-5.8.5/debian/changelog --- plasma-discover-5.8.5/debian/changelog 2016-12-29 16:45:08.000000000 +0000 +++ plasma-discover-5.8.5/debian/changelog 2017-01-23 15:27:07.000000000 +0000 @@ -1,3 +1,41 @@ +plasma-discover (5.8.5-3ubuntu1) zesty; urgency=medium + + * Merge from debian. Remaining changes: + + Transitional packages for muon-discover, muon-updater & + muon-notifier. + + -- Rik Mills Mon, 23 Jan 2017 15:27:07 +0000 + +plasma-discover (5.8.5-3) unstable; urgency=medium + + * Make APT download high-res application icons by default + - This will make Discover look like upstream intends it to + look like, at the cost of higher download sizes. + - The download can be disabled by overriding the respective + APT setting. + * fix-desktop-run.patch: Fix arguments when running .desktop + files with runservice + + -- Matthias Klumpp Fri, 20 Jan 2017 21:04:20 +0100 + +plasma-discover (5.8.5-2) unstable; urgency=medium + + * Upload to unstable + + -- Matthias Klumpp Sun, 08 Jan 2017 22:16:14 +0100 + +plasma-discover (5.8.5-1) experimental; urgency=medium + + [ Automatic packaging ] + * Update build-deps and deps with the info from cmake + + [ Maximiliano Curia ] + * New upstream release (5.8.5). + * Drop upstream patch: 01_new-appstreamqt.patch + * Update install file + + -- Maximiliano Curia Fri, 30 Dec 2016 18:46:21 +0100 + plasma-discover (5.8.5-0ubuntu1) zesty; urgency=low * New upstream release (5.8.5) diff -Nru plasma-discover-5.8.5/debian/control plasma-discover-5.8.5/debian/control --- plasma-discover-5.8.5/debian/control 2016-12-29 16:45:08.000000000 +0000 +++ plasma-discover-5.8.5/debian/control 2017-01-23 15:27:07.000000000 +0000 @@ -37,7 +37,8 @@ pkg-config, pkg-kde-tools (>= 0.15.16), qtbase5-dev (>= 5.6.1~), - qtdeclarative5-dev (>= 5.6.1~) + qtdeclarative5-dev (>= 5.6.1~), + qml-module-org-kde-kirigami, Standards-Version: 3.9.8 Homepage: https://projects.kde.org/projects/kde/workspace/discover Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/discover diff -Nru plasma-discover-5.8.5/debian/extra/60plasma-discover plasma-discover-5.8.5/debian/extra/60plasma-discover --- plasma-discover-5.8.5/debian/extra/60plasma-discover 1970-01-01 00:00:00.000000000 +0000 +++ plasma-discover-5.8.5/debian/extra/60plasma-discover 2017-01-23 15:27:07.000000000 +0000 @@ -0,0 +1,17 @@ +## This file is provided by KDE Discover to enable the download of +## small-size icons as well as bigger high-res application icons by default. +## +## The small (64x64px) icons are required for Discover to work, while the +## HiDPI icons are required for it to look good. + +Acquire::IndexTargets { + deb::DEP-11-icons { + DefaultEnabled "true"; + }; +}; + +Acquire::IndexTargets { + deb::DEP-11-icons-hidpi { + DefaultEnabled "true"; + }; +}; diff -Nru plasma-discover-5.8.5/debian/patches/01_fix-desktop-run.patch plasma-discover-5.8.5/debian/patches/01_fix-desktop-run.patch --- plasma-discover-5.8.5/debian/patches/01_fix-desktop-run.patch 1970-01-01 00:00:00.000000000 +0000 +++ plasma-discover-5.8.5/debian/patches/01_fix-desktop-run.patch 2017-01-23 15:27:07.000000000 +0000 @@ -0,0 +1,27 @@ +From 2db9081b379614ecc19331634d31ca827b9cf9e6 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 27 Dec 2016 18:53:40 +0100 +Subject: Fix arguments when running .desktop files with runservice + +Without this patch the command run with runservice has a duplicate first argument +as QProcess already prepends the executable name. +--- + libdiscover/backends/PackageKitBackend/runservice/main.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/libdiscover/backends/PackageKitBackend/runservice/main.cpp b/libdiscover/backends/PackageKitBackend/runservice/main.cpp +index b56917a..693d80c 100644 +--- a/libdiscover/backends/PackageKitBackend/runservice/main.cpp ++++ b/libdiscover/backends/PackageKitBackend/runservice/main.cpp +@@ -39,5 +39,7 @@ int main(int argc, char** argv) + QTextStream cerr(stderr); + KIO::DesktopExecParser execParser(_service, {}); + +- return !QProcess::startDetached(KIO::DesktopExecParser::executableName(_service.exec()), execParser.resultingArguments()); ++ auto args = execParser.resultingArguments(); ++ const auto execName = args.takeFirst(); ++ return !QProcess::startDetached(execName, args); + } +-- +cgit v0.11.2 + diff -Nru plasma-discover-5.8.5/debian/patches/series plasma-discover-5.8.5/debian/patches/series --- plasma-discover-5.8.5/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ plasma-discover-5.8.5/debian/patches/series 2017-01-23 15:27:07.000000000 +0000 @@ -0,0 +1 @@ +01_fix-desktop-run.patch diff -Nru plasma-discover-5.8.5/debian/plasma-discover.install plasma-discover-5.8.5/debian/plasma-discover.install --- plasma-discover-5.8.5/debian/plasma-discover.install 2016-12-29 16:45:08.000000000 +0000 +++ plasma-discover-5.8.5/debian/plasma-discover.install 2017-01-23 15:27:07.000000000 +0000 @@ -1,3 +1,4 @@ +debian/extra/60plasma-discover /etc/apt/apt.conf.d/ usr/bin/plasma-discover usr/lib/*/libexec/kf5/discover/runservice usr/lib/*/plasma-discover/*