[SCM] KDE Discover packaging branch, master, updated. debian/5.10.5-2-10-gc8832da
Matthias Klumpp
mak at moszumanska.debian.org
Mon Jan 15 00:21:54 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=cdd1241
The following commit has been merged in the master branch:
commit cdd1241545dbccfcd005db5ea230ce134cdf9449
Author: Matthias Klumpp <mak at debian.org>
Date: Mon Jan 15 00:21:48 2018 +0100
Add Flatpak and Snap backends
---
debian/control | 43 +++++++++++++++++++++-----
debian/plasma-discover-backend-flatpak.install | 4 +++
debian/plasma-discover-backend-snap.install | 7 +++++
debian/plasma-discover-common.install | 2 +-
debian/plasma-discover.install | 8 +++--
debian/rules | 9 ++++++
6 files changed, 62 insertions(+), 11 deletions(-)
diff --git a/debian/control b/debian/control
index 8efc28a..5365b48 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,14 @@ Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>,
- Matthias Klumpp <mak at debian.org>,
+ Matthias Klumpp <mak at debian.org>
Build-Depends: cmake (>= 2.8.12),
debhelper (>= 9),
extra-cmake-modules (>= 5.16.0~),
kirigami2-dev (>= 2.1.0~),
libappstreamqt-dev (>= 0.10.3),
libdebconf-kde-dev (>= 1.0.0),
+ libflatpak-dev (>= 0.10.2),
libkf5archive-dev (>= 5.34~),
libkf5attica-dev (>= 5.23~),
libkf5config-dev (>= 5.34~),
@@ -35,10 +36,11 @@ Build-Depends: cmake (>= 2.8.12),
libpackagekitqt5-dev (>= 0.9.5),
libqca-qt5-2-dev,
libqt5svg5-dev (>= 5.4.0~),
+ libsnapd-qt-dev (>= 1.30),
pkg-config,
pkg-kde-tools (>= 0.15.16),
qtbase5-dev (>= 5.7.0~),
- qtdeclarative5-dev (>= 5.7.0~),
+ qtdeclarative5-dev (>= 5.7.0~)
Standards-Version: 4.1.2
Homepage: https://projects.kde.org/projects/kde/workspace/discover
Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/plasma/plasma-discover.git
@@ -51,22 +53,23 @@ Depends: appstream (>= 0.8),
plasma-discover-common (= ${source:Version}),
qml-module-org-kde-kirigami2,
${misc:Depends},
- ${shlibs:Depends},
+ ${shlibs:Depends}
Breaks: libmuon (<< 4:5.6),
muon-discover (<< 4:5.5.3a),
muon-notifier (<< 4:5.5.3a),
muon-updater (<< 4:5.5.3a),
plasma-discover-common (<< 5.7.0),
plasma-discover-private (<< 5.7.0),
- plasma-discover-updater (<< 5.7.0),
+ plasma-discover-updater (<< 5.7.0)
Replaces: libmuon (<< 4:5.6),
muon-discover (<< 4:5.5.3a),
muon-notifier (<< 4:5.5.3a),
muon-updater (<< 4:5.5.3a),
plasma-discover-common (<< 5.7.0),
plasma-discover-private (<< 5.7.0),
- plasma-discover-updater (<< 5.7.0),
+ plasma-discover-updater (<< 5.7.0)
Recommends: software-properties-kde
+Suggests: plasma-discover-backend-flatpak
Description: Discover software management suite
Discover is a graphical software manager for the Plasma workspace.
It helps users easily and quickly find applications and other software
@@ -85,13 +88,39 @@ Depends: ${misc:Depends}
Breaks: muon-common (<< 4:5.5.3a),
plasma-discover (<< 5.7.0-2),
plasma-discover-private (<< 5.7.0),
- plasma-discover-updater (<< 5.7.0),
+ plasma-discover-updater (<< 5.7.0)
Replaces: muon-common (<< 4:5.5.3a),
plasma-discover (<< 5.7.0-2),
plasma-discover-private (<< 5.7.0),
- plasma-discover-updater (<< 5.7.0),
+ plasma-discover-updater (<< 5.7.0)
Description: Discover software manager suite (common data files)
Discover is a graphical software manager for the Plasma workspace.
.
This package contains data files shared by various parts of the
Discover suite.
+
+Package: plasma-discover-backend-flatpak
+Architecture: any
+Depends: flatpak,
+ plasma-discover (= ${source:Version}),
+ ${misc:Depends}
+Description: Discover software management suite
+ Discover is a graphical software manager for the Plasma workspace.
+ It helps users easily and quickly find applications and other software
+ they might want to install.
+ .
+ This package contains a backend for the Flatpak application
+ bundling system.
+
+Package: plasma-discover-backend-snap
+Architecture: any
+Depends: plasma-discover (= ${source:Version}),
+ snapd,
+ ${misc:Depends}
+Description: Discover software management suite
+ Discover is a graphical software manager for the Plasma workspace.
+ It helps users easily and quickly find applications and other software
+ they might want to install.
+ .
+ This package contains a backend for the Ubuntu Core Snappy application
+ bundling system.
diff --git a/debian/plasma-discover-backend-flatpak.install b/debian/plasma-discover-backend-flatpak.install
new file mode 100644
index 0000000..013cd8f
--- /dev/null
+++ b/debian/plasma-discover-backend-flatpak.install
@@ -0,0 +1,4 @@
+usr/lib/*/qt5/plugins/discover-notifier/FlatpakNotifier.so
+usr/lib/*/qt5/plugins/discover/flatpak-backend.so
+usr/share/applications/org.kde.discover-flatpak.desktop
+usr/share/libdiscover/categories/flatpak-backend-categories.xml
diff --git a/debian/plasma-discover-backend-snap.install b/debian/plasma-discover-backend-snap.install
new file mode 100644
index 0000000..e15ed69
--- /dev/null
+++ b/debian/plasma-discover-backend-snap.install
@@ -0,0 +1,7 @@
+etc/dbus-1/system.d/org.kde.discover.libsnapclient.conf
+usr/lib/*/libexec/discover/SnapMacaroonDialog
+usr/lib/*/libexec/kauth/libsnap_helper
+usr/lib/*/qt5/plugins/discover/snap-backend.so
+usr/share/dbus-1/system-services/org.kde.discover.libsnapclient.service
+usr/share/libdiscover/categories/snap-backend-categories.xml
+usr/share/polkit-1/actions/org.kde.discover.libsnapclient.policy
diff --git a/debian/plasma-discover-common.install b/debian/plasma-discover-common.install
index e502d92..7433750 100644
--- a/debian/plasma-discover-common.install
+++ b/debian/plasma-discover-common.install
@@ -2,5 +2,5 @@ etc/xdg/discover_ktexteditor_codesnippets_core.knsrc
usr/share/discover/*
usr/share/icons/hicolor/*/apps/plasmadiscover.*
usr/share/kxmlgui5/plasmadiscover/*
-usr/share/libdiscover/*
+usr/share/libdiscover/categories/packagekit-backend-categories.xml
usr/share/locale/*
diff --git a/debian/plasma-discover.install b/debian/plasma-discover.install
index 35a32a8..8766a96 100644
--- a/debian/plasma-discover.install
+++ b/debian/plasma-discover.install
@@ -2,11 +2,13 @@ debian/extra/60plasma-discover /etc/apt/apt.conf.d/
usr/bin/plasma-discover
usr/lib/*/libexec/kf5/discover/runservice
usr/lib/*/plasma-discover/*
-usr/lib/*/qt5/plugins/discover-notifier/*
-usr/lib/*/qt5/plugins/discover/*
+usr/lib/*/qt5/plugins/discover-notifier/DiscoverPackageKitNotifier.so
+usr/lib/*/qt5/plugins/discover/kns-backend.so
+usr/lib/*/qt5/plugins/discover/packagekit-backend.so
usr/lib/*/qt5/qml/org/kde/discovernotifier/libDiscoverNotifierDeclarativePlugin.so
usr/lib/*/qt5/qml/org/kde/discovernotifier/qmldir
-usr/share/applications/*
+usr/share/applications/org.kde.discover.desktop
+usr/share/applications/org.kde.discover.urlhandler.desktop
usr/share/knotifications5/*
usr/share/kservices5/*
usr/share/metainfo/*
diff --git a/debian/rules b/debian/rules
index 2237856..f22d5b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,15 @@
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
+PLASMA_DISCOVER_FLAGS = -DBUILD_FlatpakBackend=ON \
+ -DBUILD_SnapBackend=ON
+
%:
dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5
+override_dh_auto_configure:
+ dh_auto_configure -- $(PLASMA_DISCOVER_FLAGS)
+
# Do not pull plugins into the shlibs file, it makes lintian angry.
# This happens because dh_makeshlibs will look for sonames matching
# (.*)-(.*)\.so where it assumes is the library name and is the version.
@@ -15,6 +21,9 @@ DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: /
override_dh_makeshlibs:
dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/discover* -V
+override_dh_missing:
+ dh_missing --fail-missing
+
# FIXME: tests are broken at time
override_dh_auto_test:
:
--
KDE Discover packaging
More information about the pkg-kde-commits
mailing list