[SCM] KDE Discover packaging branch, master, updated. 354988eb04e7a3f44e53f8ae0260864c11cdda65
Matthias Klumpp
mak at moszumanska.debian.org
Mon Jan 11 23:41:37 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=537195f
The following commit has been merged in the master branch:
commit 537195fd89b482041d9a7de7233f989eb9e1e56e
Author: Matthias Klumpp <matthias at tenstral.net>
Date: Mon Jan 11 22:35:41 2016 +0100
Add rename & AS patches temporarily
We need them to not conflict with the "discover" package in Debian, so
use these patches until a new upstream release is published which
already contains them.
---
debian/patches/01_apt-use-appstream.patch | 361 +++++++++++++++
debian/patches/02_rename-discover.patch | 740 ++++++++++++++++++++++++++++++
debian/patches/series | 2 +
3 files changed, 1103 insertions(+)
diff --git a/debian/patches/01_apt-use-appstream.patch b/debian/patches/01_apt-use-appstream.patch
new file mode 100644
index 0000000..7b321ca
--- /dev/null
+++ b/debian/patches/01_apt-use-appstream.patch
@@ -0,0 +1,361 @@
+From: Aleix Pol <aleixpol at kde.org>
+Date: Tue, 17 Nov 2015 18:34:52 +0000
+Subject: Use AppStream instead of appinstall-data in the QApt backend
+X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=97f1426d5806beae0456566e1cf6653341d64afa
+---
+Use AppStream instead of appinstall-data in the QApt backend
+
+It was deprecated and only available on Ubuntu. AppStream is available on
+Debian as well.
+The current version of AppStream in Ubuntu Willy is outdated and needs
+love.
+
+CCMAIL: Kubuntu Developer Discussion <kubuntu-devel at lists.ubuntu.com>
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,11 +31,8 @@
+ if(NOT AkabeiClient_FOUND)
+ find_package(packagekitqt5)
+ endif()
+-
+- if(packagekitqt5_FOUND OR AkabeiClient_FOUND)
+- find_package(AppstreamQt 0.8.4)
+- endif()
+ endif()
++find_package(AppstreamQt 0.8.4)
+ find_package(KF5Attica)
+ find_package(KF5NewStuff)
+ # find_package(BODEGA QUIET)
+
+--- a/libdiscover/backends/ApplicationBackend/Application.cpp
++++ b/libdiscover/backends/ApplicationBackend/Application.cpp
+@@ -49,39 +49,36 @@
+ #include "ApplicationBackend.h"
+ #include "resources/PackageState.h"
+
+-Application::Application(const QString& fileName, QApt::Backend* backend)
++Application::Application(const Appstream::Component &component, QApt::Backend* backend)
+ : AbstractResource(0)
+- , m_data(new KConfig(fileName, KConfig::SimpleConfig))
+- , m_backend(backend)
++ , m_data(component)
+ , m_package(0)
+ , m_isValid(true)
+- , m_isTechnical(false)
++ , m_isTechnical(component.kind() != Appstream::Component::KindDesktop)
+ , m_isExtrasApp(false)
+ , m_sourceHasScreenshot(true)
+ {
+ static QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP");
+
+- m_isTechnical = getField("NoDisplay").toLower() == "true"
+- || !hasField("Exec")
+- || getField("NotShowIn", QByteArray()).contains(currentDesktop)
+- || !getField("OnlyShowIn", currentDesktop).contains(currentDesktop);
+- m_packageName = getField("X-AppInstall-Package");
++ Q_ASSERT(component.packageNames().count() == 1);
++ m_packageName = component.packageNames().at(0);
++
++ m_package = backend->package(packageName());
++ m_isValid = bool(m_package);
+ }
+
+ Application::Application(QApt::Package* package, QApt::Backend* backend)
+ : AbstractResource(0)
+- , m_backend(backend)
+ , m_package(package)
++ , m_packageName(m_package->name())
+ , m_isValid(true)
+ , m_isTechnical(true)
+ , m_isExtrasApp(false)
+ {
+- m_packageName = m_package->name().latin1();
+-
+ QString arch = m_package->architecture();
+- if (arch != m_backend->nativeArchitecture() && arch != QLatin1String("all")) {
+- m_packageName.append(':');
+- m_packageName.append(m_package->architecture().toLatin1());
++ if (arch != backend->nativeArchitecture() && arch != QLatin1String("all")) {
++ m_packageName.append(QLatin1Char(':'));
++ m_packageName.append(arch);
+ }
+
+ if (m_package->origin() == QLatin1String("LP-PPA-app-review-board")) {
+@@ -94,20 +91,7 @@
+
+ QString Application::name()
+ {
+- QString name;
+- if (!m_isTechnical)
+- name = i18n(untranslatedName().toUtf8().constData());
+- else
+- name = untranslatedName();
+-
+- if (package() && m_package->isForeignArch())
+- name = i18n("%1 (%2)", name, m_package->architecture());
+- return name;
+-}
+-
+-QString Application::untranslatedName()
+-{
+- QString name = QString::fromUtf8(getField("Name")).trimmed();
++ QString name = m_data.isValid() ? m_data.name() : QString();
+ if (name.isEmpty() && package()) {
+ // extras.ubuntu.com packages can have this
+ if (m_isExtrasApp)
+@@ -116,18 +100,17 @@
+ name = m_package->name();
+ }
+
++ if (package() && m_package->isForeignArch())
++ name = i18n("%1 (%2)", name, m_package->architecture());
++
+ return name;
+ }
+
+ QString Application::comment()
+ {
+- QString comment = QString::fromLatin1(getField("Comment"));
++ QString comment = m_data.isValid() ? m_data.description() : QString();
+ if (comment.isEmpty()) {
+- // Sometimes GenericName is used instead of Comment
+- comment = QString::fromLatin1(getField("GenericName"));
+- if (comment.isEmpty()) {
+- return package()->shortDescription();
+- }
++ return package()->shortDescription();
+ }
+
+ return i18n(comment.toUtf8().constData());
+@@ -135,13 +118,13 @@
+
+ QString Application::packageName() const
+ {
+- return QString::fromLatin1(m_packageName);
++ return m_packageName;
+ }
+
+ QApt::Package *Application::package()
+ {
+- if (!m_package && m_backend) {
+- m_package = m_backend->package(packageName());
++ if (!m_package && parent()) {
++ m_package = backend()->package(packageName());
+ Q_EMIT stateChanged();
+ }
+
+@@ -156,12 +139,27 @@
+
+ QString Application::icon() const
+ {
+- return QString::fromLatin1(getField("Icon", "applications-other"));
++ QString anIcon = m_data.icon();
++ if (anIcon.isEmpty()) {
++ QUrl iconUrl = m_data.iconUrl(QSize());
++ if (iconUrl.isLocalFile())
++ anIcon = iconUrl.toLocalFile();
++ }
++ return anIcon;
++}
++
++QStringList Application::findProvides(Appstream::Provides::Kind kind) const
++{
++ QStringList ret;
++ Q_FOREACH (Appstream::Provides p, m_data.provides())
++ if (p.kind() == kind)
++ ret += p.value();
++ return ret;
+ }
+
+ QStringList Application::mimetypes() const
+ {
+- return QString::fromLatin1(getField("MimeType")).split(QLatin1Char(';'));
++ return findProvides(Appstream::Provides::KindMimetype);
+ }
+
+ QString Application::menuPath()
+@@ -259,7 +257,7 @@
+
+ QStringList Application::categories()
+ {
+- QStringList categories = QString::fromLatin1(getField("Categories")).split(QLatin1Char(';'), QString::SkipEmptyParts);
++ QStringList categories = m_data.isValid() ? m_data.categories() : QStringList();
+
+ if (categories.isEmpty()) {
+ // extras.ubuntu.com packages can have this field
+@@ -311,10 +309,10 @@
+ QStringList tempList;
+ // Only add recommends or suggests to the list if they aren't already going to be
+ // installed
+- if (!m_backend->config()->readEntry(QStringLiteral("APT::Install-Recommends"), true)) {
++ if (!backend()->config()->readEntry(QStringLiteral("APT::Install-Recommends"), true)) {
+ tempList << m_package->recommendsList();
+ }
+- if (!m_backend->config()->readEntry(QStringLiteral("APT::Install-Suggests"), false)) {
++ if (!backend()->config()->readEntry(QStringLiteral("APT::Install-Suggests"), false)) {
+ tempList << m_package->suggestsList();
+ }
+ tempList << m_package->enhancedByList();
+@@ -337,7 +335,7 @@
+
+ foreach (const QString &addon, tempList) {
+ bool shouldShow = true;
+- QApt::Package *package = m_backend->package(addon);
++ QApt::Package *package = backend()->package(addon);
+
+ if (!package || QString(package->section()).contains(QLatin1String("lib")) || addons.contains(package)) {
+ continue;
+@@ -376,21 +374,6 @@
+ bool Application::isTechnical() const
+ {
+ return m_isTechnical;
+-}
+-
+-QByteArray Application::getField(const char* field, const QByteArray& defaultvalue) const
+-{
+- if(m_data) {
+- KConfigGroup group = m_data->group(QStringLiteral("Desktop Entry"));
+- return group.readEntry(field, defaultvalue);
+- } else
+- return defaultvalue;
+-
+-}
+-
+-bool Application::hasField(const char* field) const
+-{
+- return m_data && m_data->group(QStringLiteral("Desktop Entry")).hasKey(field);
+ }
+
+ QUrl Application::homepage()
+@@ -520,8 +503,8 @@
+ if(!m_sourceHasScreenshot)
+ return;
+
+- QString dest = QStandardPaths::locate(QStandardPaths::TempLocation, QStringLiteral("screenshots.")+QString::fromLatin1(m_packageName));
+- const QUrl packageUrl(MuonDataSources::screenshotsSource().toString() + QStringLiteral("/json/package/")+QString::fromLatin1(m_packageName));
++ QString dest = QStandardPaths::locate(QStandardPaths::TempLocation, QStringLiteral("screenshots.")+m_packageName);
++ const QUrl packageUrl(MuonDataSources::screenshotsSource().toString() + QStringLiteral("/json/package/")+m_packageName);
+ KIO::StoredTransferJob* job = KIO::storedGet(packageUrl, KIO::NoReload, KIO::HideProgressInfo);
+ connect(job, &KIO::StoredTransferJob::finished, this, &Application::downloadingScreenshotsFinished);
+ }
+@@ -641,3 +624,8 @@
+ return description;
+ }
+
++QApt::Backend *Application::backend() const
++{
++ return qobject_cast<ApplicationBackend*>(parent())->backend();
++}
++
+
+--- a/libdiscover/backends/ApplicationBackend/Application.h
++++ b/libdiscover/backends/ApplicationBackend/Application.h
+@@ -27,6 +27,7 @@
+
+ #include <KService>
+
++#include <AppstreamQt/component.h>
+ #include <QApt/Package>
+
+ #include "discovercommon_export.h"
+@@ -43,11 +44,10 @@
+ Q_OBJECT
+ Q_PROPERTY(QString menuPath READ menuPath CONSTANT)
+ public:
+- explicit Application(const QString &fileName, QApt::Backend *backend);
++ explicit Application(const Appstream::Component &component, QApt::Backend *backend);
+ explicit Application(QApt::Package *package, QApt::Backend *backend);
+
+ QString name();
+- QString untranslatedName();
+ QString comment();
+ QApt::Package *package();
+ QString icon() const;
+@@ -91,19 +91,19 @@
+ virtual void fetchChangelog();
+
+ bool isFromSecureOrigin() const;
+- QByteArray getField(const char* field, const QByteArray& defaultvalue = QByteArray()) const;
+
+ private Q_SLOTS:
+ void processChangelog(KJob*);
+ void downloadingScreenshotsFinished(KJob*);
+
+ private:
++ QApt::Backend *backend() const;
++ QStringList findProvides(Appstream::Provides::Kind kind) const;
+ QString buildDescription(const QByteArray& data, const QString& source);
+
+- QSharedPointer<KConfig> m_data;
+- QApt::Backend *m_backend;
++ const Appstream::Component m_data;
+ QApt::Package *m_package;
+- QByteArray m_packageName;
++ QString m_packageName;
+
+ bool m_isValid;
+ bool m_isTechnical;
+@@ -112,7 +112,6 @@
+
+ QApt::PackageList addons();
+ QVector<QPair<QString, QString> > locateApplication(const QString &_relPath, const QString &menuId) const;
+- bool hasField(const char* field) const;
+ };
+
+ #endif
+
+--- a/libdiscover/backends/ApplicationBackend/ApplicationBackend.cpp
++++ b/libdiscover/backends/ApplicationBackend/ApplicationBackend.cpp
+@@ -41,6 +41,8 @@
+ #include <KIconLoader>
+ #include <KXmlGuiWindow>
+
++#include <AppstreamQt/database.h>
++
+ // QApt/DebconfKDE includes
+ #include <QApt/Backend>
+ #include <QApt/Transaction>
+@@ -61,8 +63,6 @@
+ #include <resources/SourcesModel.h>
+ #include <MuonDataSources.h>
+
+-// static const KCatalogLoader loader("app-install-data"); //FIXME port
+-
+ MUON_BACKEND_PLUGIN(ApplicationBackend)
+
+ ApplicationBackend::ApplicationBackend(QObject* parent)
+@@ -91,13 +91,14 @@
+
+ QVector<Application *> init(QApt::Backend *backend, QThread* thread)
+ {
+- QDir appDir(QStringLiteral("/usr/share/app-install/desktop/"));
+- QStringList fileList = appDir.entryList(QStringList(QStringLiteral("*.desktop")), QDir::Files);
++ Appstream::Database appdata;
++ bool opened = appdata.open();
++ Q_ASSERT(opened);
+
+ QVector<Application *> tempList;
+ QSet<QString> packages;
+- foreach(const QString &fileName, fileList) {
+- Application *app = new Application(appDir.filePath(fileName), backend);
++ foreach(const Appstream::Component &component, appdata.allComponents()) {
++ Application *app = new Application(component, backend);
+ packages.insert(app->packageName());
+ tempList << app;
+ }
+
+--- a/libdiscover/backends/ApplicationBackend/CMakeLists.txt
++++ b/libdiscover/backends/ApplicationBackend/CMakeLists.txt
+@@ -20,7 +20,7 @@
+
+ add_library(qapt-backend MODULE ${appsbackend_SRCS})
+ target_link_libraries(qapt-backend Qt5::Widgets Qt5::DBus Qt5::Concurrent
+- KF5::Archive KF5::KIOWidgets KF5::XmlGui DebconfKDE::Main KF5::IconThemes
++ KF5::Archive KF5::KIOWidgets KF5::XmlGui DebconfKDE::Main KF5::IconThemes AppstreamQt
+ Muon::QOAuth QApt::Main Discover::Common MuonApt
+ )
+ target_include_directories(qapt-backend PRIVATE /usr/include/Qca-qt5/QtCrypto)
+
diff --git a/debian/patches/02_rename-discover.patch b/debian/patches/02_rename-discover.patch
new file mode 100644
index 0000000..a0af832
--- /dev/null
+++ b/debian/patches/02_rename-discover.patch
@@ -0,0 +1,740 @@
+From: Aleix Pol <aleixpol at kde.org>
+Date: Mon, 11 Jan 2016 15:41:20 +0000
+Subject: Rename muon-discover to plasma-discover
+X-Git-Url: http://quickgit.kde.org/?p=discover.git&a=commitdiff&h=5599c1dd7b992d7ecf0279fce335168a683b8b10
+---
+Rename muon-discover to plasma-discover
+
+Changes the name of some .po file names, CC'ing l10n.
+
+REVIEW: 126680
+CCMAIL: "Localization and Translation (l10n)" <kde-i18n-doc at kde.org>
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,7 +4,7 @@
+
+ cmake_minimum_required(VERSION 2.8.12)
+
+-option(INSTALL_EXPORTER "Install muon-exporter [development utility]" OFF)
++option(INSTALL_EXPORTER "Install plasma-discover-exporter [development utility]" OFF)
+
+ find_package(ECM REQUIRED NO_MODULE)
+
+
+--- a/Messages.sh
++++ b/Messages.sh
+@@ -3,10 +3,10 @@
+ $EXTRACTRC `find updater/ -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> updaterrc.cpp
+ $EXTRACTRC --context="Category" --tag-group=none --tag=Name `find libdiscover -name "*-categories.xml"` >> categoriesxml.cpp
+ $XGETTEXT categoriesxml.cpp `find libdiscover -name \*.cpp` -o $podir/libdiscover.pot
+-$XGETTEXT rc.cpp updaterrc.cpp `find updater -name \*.cpp` -o $podir/muon-updater.pot
+-$XGETTEXT `find discover -name \*.cpp -o -name \*.qml -o -name \*.js` -o $podir/muon-discover.pot
+-$XGETTEXT `find exporter -name \*.cpp` -o $podir/muon-exporter.pot
+-$XGETTEXT `find notifier -name \*.cpp` -o $podir/muon-notifier.pot
++$XGETTEXT rc.cpp updaterrc.cpp `find updater -name \*.cpp` -o $podir/plasma-discover-updater.pot
++$XGETTEXT `find discover -name \*.cpp -o -name \*.qml -o -name \*.js` -o $podir/plasma-discover.pot
++$XGETTEXT `find exporter -name \*.cpp` -o $podir/plasma-discover-exporter.pot
++$XGETTEXT `find notifier -name \*.cpp` -o $podir/plasma-discover-notifier.pot
+ rm -f muonrc.cpp
+ rm -f updaterrc.cpp
+ rm -f categoriesxml.cpp
+
+--- a/discover/CMakeLists.txt
++++ b/discover/CMakeLists.txt
+@@ -3,7 +3,7 @@
+
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..)
+
+-set(muon_discover_SRCS
++set(plasma_discover_SRCS
+ main.cpp
+ MuonDiscoverMainWindow.cpp
+
+@@ -12,11 +12,11 @@
+ IconColors.cpp
+ )
+
+-qt5_add_resources(muon_discover_SRCS resources.qrc)
++qt5_add_resources(plasma_discover_SRCS resources.qrc)
+
+-add_executable(muon-discover ${muon_discover_SRCS})
++add_executable(plasma-discover ${plasma_discover_SRCS})
+
+-target_link_libraries(muon-discover LINK_PUBLIC KF5::KIOWidgets
++target_link_libraries(plasma-discover LINK_PUBLIC KF5::KIOWidgets
+ KF5::Declarative
+ KF5::DBusAddons
+ KF5::I18n
+@@ -26,9 +26,9 @@
+ Discover::Common
+ )
+
+-install(TARGETS muon-discover ${INSTALL_TARGETS_DEFAULT_ARGS} )
++install(TARGETS plasma-discover ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+ install(PROGRAMS org.kde.discover.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+-install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/muondiscover)
+-install(FILES muondiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/muondiscover)
++install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/plasmadiscover)
++install(FILES plasmadiscoverui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/plasmadiscover)
+
+
+--- a/discover/icons/CMakeLists.txt
++++ b/discover/icons/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ ecm_install_icons(
+ ICONS
+- 128-apps-muondiscover.png
+- 16-apps-muondiscover.png
+- 22-apps-muondiscover.png
+- 32-apps-muondiscover.png
+- 48-apps-muondiscover.png
+- sc-apps-muondiscover.svgz
++ 128-apps-plasmadiscover.png
++ 16-apps-plasmadiscover.png
++ 22-apps-plasmadiscover.png
++ 32-apps-plasmadiscover.png
++ 48-apps-plasmadiscover.png
++ sc-apps-plasmadiscover.svgz
+ DESTINATION ${ICON_INSTALL_DIR}
+ THEME hicolor
+ )
+
+--- a/discover/main.cpp
++++ b/discover/main.cpp
+@@ -44,7 +44,7 @@
+ app.setWindowIcon(QIcon::fromTheme(QStringLiteral("muondiscover")));
+ app.setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
+ app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+- KLocalizedString::setApplicationDomain("muon-discover");
++ KLocalizedString::setApplicationDomain("plasma-discover");
+ KAboutData about(QStringLiteral("muondiscover"), i18n("Discover"), version, i18n("An application explorer"),
+ KAboutLicense::GPL, i18n("© 2010-2014 Plasma Development Team"));
+ about.addAuthor(i18n("Aleix Pol Gonzalez"), QString(), QStringLiteral("aleixpol at blue-systems.com"));
+
+--- a/discover/muondiscoverui.rc
++++ /dev/null
+@@ -1,11 +1,1 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<gui name="muon-discover"
+- version="5"
+- xmlns="http://www.kde.org/standards/kxmlgui/1.0"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
+- http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
+- <ToolBar name="mainToolBar" deleted="true"/>
+- <ToolBar name="discoverToolBar" deleted="true"/>
+-</gui>
+
+
+--- a/discover/org.kde.discover.desktop
++++ b/discover/org.kde.discover.desktop
+@@ -24,7 +24,7 @@
+ Name[x-test]=xxDiscoverxx
+ Name[zh_CN]=发现者
+ MimeType=x-scheme-handler/appstream
+-Exec=muon-discover %U
++Exec=plasma-discover %U
+ Icon=muondiscover
+ Type=Application
+ X-DocPath=muon/index.html
+
+--- /dev/null
++++ b/discover/plasmadiscoverui.rc
+@@ -1,1 +1,11 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<gui name="plasma-discover"
++ version="5"
++ xmlns="http://www.kde.org/standards/kxmlgui/1.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
++ http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
++ <ToolBar name="mainToolBar" deleted="true"/>
++ <ToolBar name="discoverToolBar" deleted="true"/>
++</gui>
+
+
+--- a/exporter/CMakeLists.txt
++++ b/exporter/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+
+-add_executable(muon-exporter main.cpp MuonExporter.cpp)
++add_executable(plasma-discover-exporter main.cpp MuonExporter.cpp)
+
+-target_link_libraries(muon-exporter Discover::Common KF5::CoreAddons KF5::I18n)
++target_link_libraries(plasma-discover-exporter Discover::Common KF5::CoreAddons KF5::I18n)
+
+ if(MUON_INSTALL_EXPORTER)
+- install(TARGETS muon-exporter ${INSTALL_TARGETS_DEFAULT_ARGS})
++ install(TARGETS plasma-discover-exporter ${INSTALL_TARGETS_DEFAULT_ARGS})
+ endif()
+
+
+--- a/exporter/main.cpp
++++ b/exporter/main.cpp
+@@ -31,7 +31,7 @@
+ int main(int argc, char** argv)
+ {
+ QApplication app(argc, argv);
+- KLocalizedString::setApplicationDomain("muon-exporter");
++ KLocalizedString::setApplicationDomain("plasma-discover-exporter");
+ KAboutData about(QStringLiteral("muonexporter"), i18n("Muon Exporter"), version, i18n(description),
+ KAboutLicense::GPL, i18n("©2013 Aleix Pol Gonzalez"), QString());
+ about.addAuthor(i18n("Jonathan Thomas"), QString(), QStringLiteral("echidnaman at kubuntu.org"));
+
+--- a/libdiscover/CMakeLists.txt
++++ b/libdiscover/CMakeLists.txt
+@@ -59,5 +59,5 @@
+ target_include_directories(DiscoverCommon PRIVATE ${PHONON_INCLUDES} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+
+ install(TARGETS DiscoverCommon ${INSTALL_TARGETS_DEFAULT_ARGS})
+-install(FILES resources/muonabstractnotifier.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
++install(FILES resources/discoverabstractnotifier.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+
+
+--- a/libdiscover/backends/ApplicationBackend/Application.cpp
++++ b/libdiscover/backends/ApplicationBackend/Application.cpp
+@@ -495,7 +495,7 @@
+ return Installed;
+ }
+
+- return None; // Actually: none of interest to us here in muon-discover.
++ return None; // Actually: none of interest to us here in plasma-discover.
+ }
+
+ void Application::fetchScreenshots()
+
+--- a/libdiscover/backends/PackageKitBackend/CMakeLists.txt
++++ b/libdiscover/backends/PackageKitBackend/CMakeLists.txt
+@@ -15,8 +15,8 @@
+ install(FILES packagekit-backend-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libdiscover/categories)
+
+ #notifier
+-add_library(MuonPackageKitNotifier MODULE PackageKitNotifier.cpp)
+-target_link_libraries(MuonPackageKitNotifier PRIVATE PK::packagekitqt5 Discover::Notifiers)
++add_library(DiscoverPackageKitNotifier MODULE PackageKitNotifier.cpp)
++target_link_libraries(DiscoverPackageKitNotifier PRIVATE PK::packagekitqt5 Discover::Notifiers)
+
+-install(TARGETS MuonPackageKitNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
++install(TARGETS DiscoverPackageKitNotifier DESTINATION ${PLUGIN_INSTALL_DIR}/discover-notifier)
+
+
+--- a/libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
++++ b/libdiscover/backends/PackageKitBackend/PackageKitUpdater.h
+@@ -52,7 +52,7 @@
+ virtual QString statusDetail() const override;
+ virtual quint64 downloadSpeed() const override;
+
+- /** in muon-updater, actions with HighPriority will be shown in a KMessageWidget,
++ /** in plasma-discover-updater, actions with HighPriority will be shown in a KMessageWidget,
+ * normal priority will go right on top of the more menu, low priority will go
+ * to the advanced menu
+ */
+
+--- a/libdiscover/resources/AbstractResourcesBackend.h
++++ b/libdiscover/resources/AbstractResourcesBackend.h
+@@ -133,7 +133,7 @@
+ /**
+ * This method is used to integrate advanced functions into the Muon GUI.
+ *
+- * In muon-updater, actions with HighPriority will be shown in a KMessageWidget,
++ * In plasma-discover-updater, actions with HighPriority will be shown in a KMessageWidget,
+ * normal priority will go right on top of the more menu, low priority will go
+ * to the advanced menu.
+ */
+
+--- /dev/null
++++ b/libdiscover/resources/discoverabstractnotifier.notifyrc
+@@ -1,1 +1,66 @@
++[Global]
++IconName=applications-system
++Comment=Discover
+
++[Event/Update]
++Name=Updates Are Available
++Name[ca]=Hi ha actualitzacions disponibles
++Name[ca at valencia]=Hi ha actualitzacions disponibles
++Name[da]=Opdateringer tilgængelige
++Name[de]=Es sind Aktualisierungen verfügbar
++Name[el]=Υπάρχουν διαθέσιμες ενημερώσεις
++Name[en_GB]=Updates Are Available
++Name[es]=Existen actualizaciones disponibles
++Name[fi]=Päivityksiä on saatavilla
++Name[fr]=Des mises à jour sont disponibles
++Name[gl]=Hai actualizacións dispoñíbeis
++Name[it]=Sono disponibili aggiornamenti
++Name[ko]=업데이트 사용 가능
++Name[nb]=Oppgraderinger er tilgjengelige
++Name[nl]=Bijwerken is beschikbaar
++Name[nn]=Oppdateringar er tilgjengelege
++Name[pl]=Uaktualnienia są dostępne
++Name[pt]=Estão Disponíveis Actualizações
++Name[pt_BR]=Atualizações estão disponíveis
++Name[sk]=Sú dostupné aktualizácie
++Name[sl]=Na voljo so posodobitve
++Name[sr]=Доступне допуне
++Name[sr at ijekavian]=Доступне допуне
++Name[sr at ijekavianlatin]=Dostupne dopune
++Name[sr at latin]=Dostupne dopune
++Name[sv]=Uppdateringar är tillgängliga
++Name[uk]=Доступні оновлення
++Name[x-test]=xxUpdates Are Availablexx
++Name[zh_CN]=更新可用
++Comment=Updates Available
++Comment[ca]=Actualitzacions disponibles
++Comment[ca at valencia]=Actualitzacions disponibles
++Comment[da]=Opdateringer tilgængelige
++Comment[de]=Aktualisierungen verfügbar
++Comment[el]=Διαθέσιμες ενημερώσεις
++Comment[en_GB]=Updates Available
++Comment[es]=Actualizaciones disponibles
++Comment[fi]=Päivityksiä saatavilla
++Comment[fr]=Mises à jour disponibles
++Comment[gl]=Actualizacións dispoñíbeis
++Comment[it]=Aggiornamenti disponibili
++Comment[ko]=업데이트 사용 가능
++Comment[nb]=Oppgraderinger tilgjengelige
++Comment[nl]=Bijwerken is beschikbaar
++Comment[nn]=Oppdateringar tilgjengelege
++Comment[pl]=Dostępne uaktualnienia
++Comment[pt]=Actualizações Disponíveis
++Comment[pt_BR]=Atualizações disponíveis
++Comment[sk]=Dostupné aktualizácie
++Comment[sl]=Na voljo so posodobitve
++Comment[sr]=Доступне су нове допуне
++Comment[sr at ijekavian]=Доступне су нове допуне
++Comment[sr at ijekavianlatin]=Dostupne su nove dopune
++Comment[sr at latin]=Dostupne su nove dopune
++Comment[sv]=Uppdateringar tillgängliga
++Comment[uk]=Доступні оновлення
++Comment[x-test]=xxUpdates Availablexx
++Comment[zh_CN]=更新可用
++Action=Popup
++
++
+
+--- a/libdiscover/resources/muonabstractnotifier.notifyrc
++++ /dev/null
+@@ -1,94 +1,1 @@
+-[Global]
+-IconName=applications-system
+-Comment=Muon
+-Comment[ca]=Muon
+-Comment[ca at valencia]=Muon
+-Comment[da]=Muon
+-Comment[de]=Muon
+-Comment[el]=Muon
+-Comment[en_GB]=Muon
+-Comment[es]=Muon
+-Comment[fi]=Muon
+-Comment[fr]=Muon
+-Comment[gl]=Muon
+-Comment[it]=Muon
+-Comment[ko]=Muon
+-Comment[nb]=Muon
+-Comment[nl]=Muon
+-Comment[nn]=Muon
+-Comment[pl]=Muon
+-Comment[pt]=Muon
+-Comment[pt_BR]=Muon
+-Comment[sk]=Muon
+-Comment[sl]=Muon
+-Comment[sr]=Муон
+-Comment[sr at ijekavian]=Муон
+-Comment[sr at ijekavianlatin]=Muon
+-Comment[sr at latin]=Muon
+-Comment[sv]=Muon
+-Comment[uk]=Muon
+-Comment[x-test]=xxMuonxx
+-Comment[zh_CN]=Muon
+
+-[Event/Update]
+-Name=Updates Are Available
+-Name[ca]=Hi ha actualitzacions disponibles
+-Name[ca at valencia]=Hi ha actualitzacions disponibles
+-Name[da]=Opdateringer tilgængelige
+-Name[de]=Es sind Aktualisierungen verfügbar
+-Name[el]=Υπάρχουν διαθέσιμες ενημερώσεις
+-Name[en_GB]=Updates Are Available
+-Name[es]=Existen actualizaciones disponibles
+-Name[fi]=Päivityksiä on saatavilla
+-Name[fr]=Des mises à jour sont disponibles
+-Name[gl]=Hai actualizacións dispoñíbeis
+-Name[it]=Sono disponibili aggiornamenti
+-Name[ko]=업데이트 사용 가능
+-Name[nb]=Oppgraderinger er tilgjengelige
+-Name[nl]=Bijwerken is beschikbaar
+-Name[nn]=Oppdateringar er tilgjengelege
+-Name[pl]=Uaktualnienia są dostępne
+-Name[pt]=Estão Disponíveis Actualizações
+-Name[pt_BR]=Atualizações estão disponíveis
+-Name[sk]=Sú dostupné aktualizácie
+-Name[sl]=Na voljo so posodobitve
+-Name[sr]=Доступне допуне
+-Name[sr at ijekavian]=Доступне допуне
+-Name[sr at ijekavianlatin]=Dostupne dopune
+-Name[sr at latin]=Dostupne dopune
+-Name[sv]=Uppdateringar är tillgängliga
+-Name[uk]=Доступні оновлення
+-Name[x-test]=xxUpdates Are Availablexx
+-Name[zh_CN]=更新可用
+-Comment=Updates Available
+-Comment[ca]=Actualitzacions disponibles
+-Comment[ca at valencia]=Actualitzacions disponibles
+-Comment[da]=Opdateringer tilgængelige
+-Comment[de]=Aktualisierungen verfügbar
+-Comment[el]=Διαθέσιμες ενημερώσεις
+-Comment[en_GB]=Updates Available
+-Comment[es]=Actualizaciones disponibles
+-Comment[fi]=Päivityksiä saatavilla
+-Comment[fr]=Mises à jour disponibles
+-Comment[gl]=Actualizacións dispoñíbeis
+-Comment[it]=Aggiornamenti disponibili
+-Comment[ko]=업데이트 사용 가능
+-Comment[nb]=Oppgraderinger tilgjengelige
+-Comment[nl]=Bijwerken is beschikbaar
+-Comment[nn]=Oppdateringar tilgjengelege
+-Comment[pl]=Dostępne uaktualnienia
+-Comment[pt]=Actualizações Disponíveis
+-Comment[pt_BR]=Atualizações disponíveis
+-Comment[sk]=Dostupné aktualizácie
+-Comment[sl]=Na voljo so posodobitve
+-Comment[sr]=Доступне су нове допуне
+-Comment[sr at ijekavian]=Доступне су нове допуне
+-Comment[sr at ijekavianlatin]=Dostupne su nove dopune
+-Comment[sr at latin]=Dostupne su nove dopune
+-Comment[sv]=Uppdateringar tillgängliga
+-Comment[uk]=Доступні оновлення
+-Comment[x-test]=xxUpdates Availablexx
+-Comment[zh_CN]=更新可用
+-Action=Popup
+-
+-
+
+--- a/notifier/CMakeLists.txt
++++ b/notifier/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_definitions(-DTRANSLATION_DOMAIN=\"muon-notifier\")
++add_definitions(-DTRANSLATION_DOMAIN=\"plasma-discover-notifier\")
+
+ add_library(DiscoverNotifierDeclarativePlugin BackendNotifierFactory.cpp DiscoverNotifier.cpp DiscoverNotifierDeclarativePlugin.cpp)
+ target_link_libraries(DiscoverNotifierDeclarativePlugin
+
+--- a/notifier/DiscoverNotifier.cpp
++++ b/notifier/DiscoverNotifier.cpp
+@@ -51,7 +51,7 @@
+
+ void DiscoverNotifier::configurationChanged()
+ {
+- KConfig notifierConfig(QStringLiteral("muon-notifierrc"), KConfig::NoGlobals);
++ KConfig notifierConfig(QStringLiteral("plasma-discover-notifierrc"), KConfig::NoGlobals);
+
+ KConfigGroup notifyTypeGroup(¬ifierConfig, "NotificationType");
+ m_verbose = notifyTypeGroup.readEntry("Verbose", false);
+@@ -59,7 +59,7 @@
+
+ void DiscoverNotifier::showMuon()
+ {
+- KRun::runCommand(QStringLiteral("muon-discover --mode update"), nullptr);
++ KRun::runCommand(QStringLiteral("plasma-discover --mode update"), nullptr);
+ }
+
+ bool DiscoverNotifier::isSystemUpToDate() const
+
+--- a/updater/CMakeLists.txt
++++ b/updater/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories(../libdiscover)
+
+-set(muon_updater_SRCS
++set(plasmadiscover_updater_SRCS
+ main.cpp
+ MainWindow.cpp
+ ChangelogWidget.cpp
+@@ -9,14 +9,14 @@
+ KActionMessageWidget.cpp
+ UpdateDelegate.cpp)
+
+-ki18n_wrap_ui(muon_updater_SRCS ProgressWidget.ui
++ki18n_wrap_ui(plasmadiscover_updater_SRCS ProgressWidget.ui
+ UpdaterCentralWidget.ui
+ UpdaterWidgetNoUpdates.ui
+ )
+
+-add_executable(muon-updater ${muon_updater_SRCS})
++add_executable(plasma-discover-updater ${plasmadiscover_updater_SRCS})
+
+-target_link_libraries(muon-updater KF5::CoreAddons
++target_link_libraries(plasma-discover-updater KF5::CoreAddons
+ KF5::KIOWidgets
+ KF5::Solid
+ KF5::I18n
+@@ -26,14 +26,14 @@
+ Discover::Common)
+
+ if (ENABLE_QZEITGEIST)
+- target_link_libraries(muon-updater ${QZEITGEIST_LIBRARY})
++ target_link_libraries(plasma-discover-updater ${QZEITGEIST_LIBRARY})
+ endif ()
+
+-install(TARGETS muon-updater ${INSTALL_TARGETS_DEFAULT_ARGS} )
++install(TARGETS plasma-discover-updater ${INSTALL_TARGETS_DEFAULT_ARGS} )
+
+ ########### install files ###############
+
+-install( FILES muonupdaterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/muonupdater )
+-install( PROGRAMS muon-updater.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
++install( FILES plasmadiscoverupdaterui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/plasmadiscoverupdater )
++install( PROGRAMS plasma-discover-updater.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+
+
+
+--- a/updater/ChangelogWidget.cpp
++++ b/updater/ChangelogWidget.cpp
+@@ -173,9 +173,9 @@
+ void ChangelogWidget::showMore(const QUrl& package)
+ {
+ if (package.scheme() == QLatin1String("package")) {
+- bool b = QProcess::startDetached(QStringLiteral("muon-discover"), { QStringLiteral("--application"), package.path() });
++ bool b = QProcess::startDetached(QStringLiteral("plasma-discover"), { QStringLiteral("--application"), package.path() });
+ if (!b) {
+- qWarning() << "Couldn't launch muon-discover";
++ qWarning() << "Couldn't launch plasma-discover";
+ }
+ } else {
+ QDesktopServices::openUrl(package);
+
+--- a/updater/main.cpp
++++ b/updater/main.cpp
+@@ -33,8 +33,8 @@
+ {
+ QApplication app(argc, argv);
+ app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-software-update")));
+- KLocalizedString::setApplicationDomain("muon-updater");
+- KAboutData about(QStringLiteral("muonupdater"), i18n("Update Manager"), version, i18n("An update manager"),
++ KLocalizedString::setApplicationDomain("plasma-discover-updater");
++ KAboutData about(QStringLiteral("plasmadiscoverupdater"), i18n("Update Manager"), version, i18n("An update manager"),
+ KAboutLicense::GPL, i18n("©2010-2013 Jonathan Thomas"), QString());
+ about.addAuthor(i18n("Jonathan Thomas"), QString(), QStringLiteral("echidnaman at kubuntu.org"));
+ about.addAuthor(i18n("Aleix Pol"), QString(), QStringLiteral("aleixpol at kde.org"));
+
+--- a/updater/muon-updater.desktop
++++ /dev/null
+@@ -1,60 +1,1 @@
+-[Desktop Entry]
+-Name=Update Manager
+-Name[ca]=Gestor d'actualitzacions
+-Name[ca at valencia]=Gestor d'actualitzacions
+-Name[da]=Håndtering af opdateringer
+-Name[de]=Aktualisierungsverwaltung
+-Name[en_GB]=Update Manager
+-Name[es]=Gestor de actualizaciones
+-Name[fi]=Päivitystenhallinta
+-Name[gl]=Xestor de actualizacións
+-Name[nl]=Beheerder voor bijwerken
+-Name[nn]=Oppdateringshandsamar
+-Name[pl]=Zarządzanie uaktualnieniami
+-Name[pt]=Gestor de Actualizações
+-Name[pt_BR]=Gerenciador de atualizações
+-Name[sk]=Správca aktualizácií
+-Name[sl]=Upravljalnik posodobitev
+-Name[sr]=Менаџер ажурирања
+-Name[sr at ijekavian]=Менаџер ажурирања
+-Name[sr at ijekavianlatin]=Menadžer ažuriranja
+-Name[sr at latin]=Menadžer ažuriranja
+-Name[sv]=Uppdateringshanterare
+-Name[uk]=Керування оновленнями
+-Name[x-test]=xxUpdate Managerxx
+-Name[zh_CN]=更新管理器
+-Exec=muon-updater
+-Icon=system-software-update
+-Type=Application
+-X-DocPath=muon/index.html
+-GenericName=Update Manager
+-GenericName[ca]=Gestor d'actualitzacions
+-GenericName[ca at valencia]=Gestor d'actualitzacions
+-GenericName[da]=Håndtering af opdateringer
+-GenericName[de]=Aktualisierungsverwaltung
+-GenericName[el]=Διαχειριστής ενημερώσεων
+-GenericName[en_GB]=Update Manager
+-GenericName[es]=Gestor de actualizaciones
+-GenericName[fi]=Päivitystenhallinta
+-GenericName[fr]=Gestionnaire de mises à jour
+-GenericName[gl]=Xestor de actualizacións
+-GenericName[it]=Gestore degli aggiornamenti
+-GenericName[ko]=업데이트 관리자
+-GenericName[nb]=Oppdateringsbehandler
+-GenericName[nl]=Beheerder voor bijwerken
+-GenericName[nn]=Oppdateringshandsamar
+-GenericName[pl]=Zarządzanie uaktualnieniami
+-GenericName[pt]=Gestor de Actualizações
+-GenericName[pt_BR]=Gerenciador de atualizações
+-GenericName[sk]=Správca aktualizácií
+-GenericName[sl]=Upravljalnik posodobitev
+-GenericName[sr]=Менаџер ажурирања
+-GenericName[sr at ijekavian]=Менаџер ажурирања
+-GenericName[sr at ijekavianlatin]=Menadžer ažuriranja
+-GenericName[sr at latin]=Menadžer ažuriranja
+-GenericName[sv]=Uppdateringshanterare
+-GenericName[uk]=Керування оновленнями
+-GenericName[x-test]=xxUpdate Managerxx
+-GenericName[zh_CN]=更新管理器
+-Categories=Qt;KDE;System;
+
+
+--- a/updater/muonupdaterui.rc
++++ /dev/null
+@@ -1,40 +1,1 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<gui name="muon-updater"
+- version="1"
+- xmlns="http://www.kde.org/standards/kxmlgui/1.0"
+- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+- xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
+- http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
+- <MenuBar>
+- <Menu name="file" >
+- <Separator/>
+- <Action name="save_download_list" />
+- <Action name="download_from_list" />
+- <Action name="load_archives" />
+- <Separator/>
+- <Action name="file_quit" />
+- </Menu>
+- <Menu name="edit" >
+- <Action name="undo" />
+- <Action name="redo" />
+- <Separator/>
+- <Action name="update" />
+- <Separator/>
+- <Action name="apply" />
+- </Menu>
+- <Menu name="view" >
+- <Action name="history" />
+- </Menu>
+- <Menu name="settings">
+- <Separator />
+- <Action name="software_properties" />
+- </Menu>
+- </MenuBar>
+- <ToolBar name="mainToolBar">
+- <Action name="apply" />
+- <Action name="file_quit" />
+- <Separator/>
+- <Action name="update" />
+- </ToolBar>
+-</gui>
+
+
+--- /dev/null
++++ b/updater/plasma-discover-updater.desktop
+@@ -1,1 +1,60 @@
++[Desktop Entry]
++Name=Update Manager
++Name[ca]=Gestor d'actualitzacions
++Name[ca at valencia]=Gestor d'actualitzacions
++Name[da]=Håndtering af opdateringer
++Name[de]=Aktualisierungsverwaltung
++Name[en_GB]=Update Manager
++Name[es]=Gestor de actualizaciones
++Name[fi]=Päivitystenhallinta
++Name[gl]=Xestor de actualizacións
++Name[nl]=Beheerder voor bijwerken
++Name[nn]=Oppdateringshandsamar
++Name[pl]=Zarządzanie uaktualnieniami
++Name[pt]=Gestor de Actualizações
++Name[pt_BR]=Gerenciador de atualizações
++Name[sk]=Správca aktualizácií
++Name[sl]=Upravljalnik posodobitev
++Name[sr]=Менаџер ажурирања
++Name[sr at ijekavian]=Менаџер ажурирања
++Name[sr at ijekavianlatin]=Menadžer ažuriranja
++Name[sr at latin]=Menadžer ažuriranja
++Name[sv]=Uppdateringshanterare
++Name[uk]=Керування оновленнями
++Name[x-test]=xxUpdate Managerxx
++Name[zh_CN]=更新管理器
++Exec=plasma-discover-updater
++Icon=system-software-update
++Type=Application
++X-DocPath=muon/index.html
++GenericName=Update Manager
++GenericName[ca]=Gestor d'actualitzacions
++GenericName[ca at valencia]=Gestor d'actualitzacions
++GenericName[da]=Håndtering af opdateringer
++GenericName[de]=Aktualisierungsverwaltung
++GenericName[el]=Διαχειριστής ενημερώσεων
++GenericName[en_GB]=Update Manager
++GenericName[es]=Gestor de actualizaciones
++GenericName[fi]=Päivitystenhallinta
++GenericName[fr]=Gestionnaire de mises à jour
++GenericName[gl]=Xestor de actualizacións
++GenericName[it]=Gestore degli aggiornamenti
++GenericName[ko]=업데이트 관리자
++GenericName[nb]=Oppdateringsbehandler
++GenericName[nl]=Beheerder voor bijwerken
++GenericName[nn]=Oppdateringshandsamar
++GenericName[pl]=Zarządzanie uaktualnieniami
++GenericName[pt]=Gestor de Actualizações
++GenericName[pt_BR]=Gerenciador de atualizações
++GenericName[sk]=Správca aktualizácií
++GenericName[sl]=Upravljalnik posodobitev
++GenericName[sr]=Менаџер ажурирања
++GenericName[sr at ijekavian]=Менаџер ажурирања
++GenericName[sr at ijekavianlatin]=Menadžer ažuriranja
++GenericName[sr at latin]=Menadžer ažuriranja
++GenericName[sv]=Uppdateringshanterare
++GenericName[uk]=Керування оновленнями
++GenericName[x-test]=xxUpdate Managerxx
++GenericName[zh_CN]=更新管理器
++Categories=Qt;KDE;System;
+
+
+--- /dev/null
++++ b/updater/plasmadiscoverupdaterui.rc
+@@ -1,1 +1,40 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<gui name="plasma-discover-updater"
++ version="1"
++ xmlns="http://www.kde.org/standards/kxmlgui/1.0"
++ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++ xsi:schemaLocation="http://www.kde.org/standards/kxmlgui/1.0
++ http://www.kde.org/standards/kxmlgui/1.0/kxmlgui.xsd">
++ <MenuBar>
++ <Menu name="file" >
++ <Separator/>
++ <Action name="save_download_list" />
++ <Action name="download_from_list" />
++ <Action name="load_archives" />
++ <Separator/>
++ <Action name="file_quit" />
++ </Menu>
++ <Menu name="edit" >
++ <Action name="undo" />
++ <Action name="redo" />
++ <Separator/>
++ <Action name="update" />
++ <Separator/>
++ <Action name="apply" />
++ </Menu>
++ <Menu name="view" >
++ <Action name="history" />
++ </Menu>
++ <Menu name="settings">
++ <Separator />
++ <Action name="software_properties" />
++ </Menu>
++ </MenuBar>
++ <ToolBar name="mainToolBar">
++ <Action name="apply" />
++ <Action name="file_quit" />
++ <Separator/>
++ <Action name="update" />
++ </ToolBar>
++</gui>
+
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2a7ef94
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+01_apt-use-appstream.patch
+02_rename-discover.patch
--
KDE Discover packaging
More information about the pkg-kde-commits
mailing list