[SCM] KDE Discover packaging branch, master, updated. debian/5.7.0-1-2-gfe691ae

[Matthias Klumpp]

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

The following commit has been merged in the master branch:
commit fe691aef5e2fd1c6a9e893f9ac0cf2670aae402f
Author: Matthias Klumpp <mak at debian.org>
Date:   Tue Jul 12 15:24:42 2016 +0200

    Adjust packaging for the 5.7 release
---
 debian/control                         | 64 ++++++++++++++--------------------
 debian/plasma-discover-common.install  |  4 +++
 debian/plasma-discover-private.install |  5 ---
 debian/plasma-discover-updater.install |  6 ----
 debian/plasma-discover.install         | 12 +++++--
 5 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/debian/control b/debian/control
index a8db717..d59c36b 100644
--- a/debian/control
+++ b/debian/control
@@ -47,47 +47,34 @@ Architecture: any
 Depends: appstream,
          packagekit,
          plasma-discover-common (= ${source:Version}),
-         plasma-discover-private (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: muon-discover (<< 4:5.5.3a)
-Replaces: muon-discover (<< 4:5.5.3a)
-Recommends: software-properties-kde
-Suggests: plasma-discover-updater
-Description: Utility for browsing, installing and removing software
- Plasma Discover will help you browse through the huge applications library you
- have available and help you find the applications you're looking for.
- .
- To install or remove software using Discover, you need administrator
- access on the computer.
-
-Package: plasma-discover-updater
-Architecture: any
-Depends: packagekit,
-         plasma-discover-private (= ${binary:Version}),
          ${misc: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)
+        muon-updater (<< 4:5.5.3a),
+        plasma-discover-common (<< 5.7.0),
+        plasma-discover-private (<< 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)
-Description: Update manager for KDE
- Plasma Discover Updater is a graphical update manager for KDE. It is part of
- the Discover family of software and provides an interface similar to that of
- Discover.
-
-Package: plasma-discover-private
-Architecture: any
-Depends: policykit-1, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libmuon (<< 4:5.6)
-Replaces: libmuon (<< 4:5.6)
-Description: Private runtime libraries for the Discover suite
- The Discover suite is a collection of software management applications
- built on the KDE platform.
+          muon-updater (<< 4:5.5.3a),
+          plasma-discover-common (<< 5.7.0),
+          plasma-discover-private (<< 5.7.0),
+          plasma-discover-updater (<< 5.7.0)
+Recommends: software-properties-kde
+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.
+ .
+ By allowing to navigate a software library by search, categories, top lists
+ along with detailed application information that includes screenshots
+ and reviews, users can more quickly find applications that suit their needs.
  .
- This package contains private runtime libraries
+ Discover will also keep the system up to date by notifying about updates and
+ installing them.
 
 Package: plasma-discover-common
 Architecture: all
@@ -104,7 +91,8 @@ Package: muon-discover
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover, ${misc:Depends}
+Depends: plasma-discover,
+         ${misc:Depends}
 Description: Transitional package (muon-discover -> plasma-discover)
  This is a transitional package for plasma-discover and can safely be
  removed.
@@ -113,7 +101,8 @@ Package: muon-updater
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover-updater, ${misc:Depends}
+Depends: plasma-discover-updater,
+         ${misc:Depends}
 Description: Transitional package (muon-updater -> plasma-discover-updater)
  This is a transitional package updating muon-updater to plasma-discover-updater
  and can safely be removed.
@@ -122,7 +111,8 @@ Package: muon-notifier
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: plasma-discover-updater, ${misc:Depends}
+Depends: plasma-discover-updater,
+         ${misc:Depends}
 Description: Transitional package (muon-notifier -> plasma-discover-updater)
  This is a transitional package updating muon-notifier to
  plasma-discover-updater and can safely be removed.
diff --git a/debian/plasma-discover-common.install b/debian/plasma-discover-common.install
index c41f83e..216ca28 100644
--- a/debian/plasma-discover-common.install
+++ b/debian/plasma-discover-common.install
@@ -1,2 +1,6 @@
+etc/xdg/discover_ktexteditor_codesnippets_core.knsrc
 usr/share/icons/hicolor/*/apps/plasmadiscover.*
+usr/share/kxmlgui5/plasmadiscover/*
+usr/share/libdiscover/*
 usr/share/locale/*
+usr/share/plasmadiscover/*
diff --git a/debian/plasma-discover-private.install b/debian/plasma-discover-private.install
deleted file mode 100644
index 0ac992e..0000000
--- a/debian/plasma-discover-private.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/plasma-discover/*
-usr/lib/*/qt5/plugins/discover-notifier/
-usr/lib/*/qt5/plugins/discover/
-usr/lib/*/qt5/qml/org/kde/discover/
-usr/share/libdiscover/
diff --git a/debian/plasma-discover-updater.install b/debian/plasma-discover-updater.install
deleted file mode 100644
index 17324c4..0000000
--- a/debian/plasma-discover-updater.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/bin/plasma-discover-updater
-usr/share/applications/plasma-discover-updater.desktop
-usr/share/knotifications5/
-usr/share/kservices5/plasma-applet-org.kde.discovernotifier.desktop
-usr/share/kxmlgui5/plasmadiscoverupdater/
-usr/share/plasma/plasmoids/org.kde.discovernotifier/
diff --git a/debian/plasma-discover.install b/debian/plasma-discover.install
index 60dcabf..27ebe88 100644
--- a/debian/plasma-discover.install
+++ b/debian/plasma-discover.install
@@ -1,6 +1,12 @@
 usr/bin/plasma-discover
+usr/lib/*/plasma-discover/*
+usr/lib/*/qt5/plugins/discover-notifier/
+usr/lib/*/qt5/plugins/discover/
+usr/lib/*/qt5/qml/org/kde/discover/
 usr/lib/*/qt5/qml/org/kde/discovernotifier/libDiscoverNotifierDeclarativePlugin.so
 usr/lib/*/qt5/qml/org/kde/discovernotifier/qmldir
-usr/share/applications/org.kde.discover.desktop
-usr/share/kxmlgui5/plasmadiscover/
-usr/share/plasmadiscover/
+usr/share/appdata/*
+usr/share/applications/*
+usr/share/knotifications5/*
+usr/share/kservices5/*
+usr/share/plasma/plasmoids/*

-- 
KDE Discover packaging