[SCM] KDE Discover packaging branch, kubuntu_unstable, updated. ubuntu/5.6.2-1ubuntu1-19-gb581ddf

Matthias Klumpp mak at moszumanska.debian.org
Sun Apr 24 18:17:23 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=b581ddf

The following commit has been merged in the kubuntu_unstable branch:
commit b581ddf45f9f25eb094a94c3141062436e0e176c
Author: Matthias Klumpp <mak at debian.org>
Date:   Sun Apr 24 20:17:14 2016 +0200

    Drop patches: Applied upstream
    
    Available in Discover 5.6.3
---
 debian/patches/01_components-without-pkgname.patch | 26 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 27 deletions(-)

diff --git a/debian/patches/01_components-without-pkgname.patch b/debian/patches/01_components-without-pkgname.patch
deleted file mode 100644
index 747a7b4..0000000
--- a/debian/patches/01_components-without-pkgname.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Matthias Klumpp <matthias at tenstral.net>
-Date: Fri, 15 Apr 2016 18:38:23 +0000
-Subject: Account for components having no package as installation candidate
-X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=683642fb214bfacec23b69dac9f82481337d572a
----
-Account for components having no package as installation candidate
-
-AppStream components may also be installed via fwupd, a Limba or XdgApp
-bundle, etc.
-This prevents Discover from crashing when encountering such a component.
----
-
-
---- a/libdiscover/backends/ApplicationBackend/Application.cpp
-+++ b/libdiscover/backends/ApplicationBackend/Application.cpp
-@@ -61,7 +61,8 @@
-     static QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
- 
-     Q_ASSERT(component.packageNames().count() == 1);
--    m_packageName = component.packageNames().at(0);
-+    if (!component.packageNames().empty())
-+        m_packageName = component.packageNames().at(0);
-     
-     m_package = backend->package(packageName());
-     m_isValid = bool(m_package);
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1f4e9b6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01_components-without-pkgname.patch

-- 
KDE Discover packaging



More information about the pkg-kde-commits mailing list