[SCM] KDE Discover packaging branch, kubuntu_unstable, updated. ubuntu/5.5.4-0ubuntu1-17-g468a70c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 7ef91361b204b9516e63aaa8f88d10c9c7a2ed12
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Mar 8 13:00:30 2016 +0000

    update .install file for plasma 5.6, wrap-and-sort
---
 debian/control                         | 30 ++++++++++++------------------
 debian/libdiscovercommon.install       |  8 ++------
 debian/plasma-discover-updater.install |  2 +-
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/debian/control b/debian/control
index 95f1abf..5589ec8 100644
--- a/debian/control
+++ b/debian/control
@@ -66,14 +66,14 @@ Depends: libdiscovercommon (= ${binary:Version}),
          libqapt3-runtime,
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: muon-notifier (<< 4:5.5.3a),
+Breaks: libdiscover,
+        muon-notifier (<< 4:5.5.3a),
         muon-updater (<< 4:5.5.3a),
-        plasma-discover-notifier,
-        libdiscover
-Replaces: muon-notifier (<< 4:5.5.3a),
+        plasma-discover-notifier
+Replaces: libdiscover,
+          muon-notifier (<< 4:5.5.3a),
           muon-updater (<< 4:5.5.3a),
-          plasma-discover-notifier,
-          libdiscover
+          plasma-discover-notifier
 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
@@ -81,12 +81,9 @@ Description: update manager for KDE
 
 Package: libdiscovercommon
 Architecture: any
-Depends: policykit-1,
-         python3,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Breaks: libmuon (<< 4:5.5.3a), libdiscover
-Replaces: libmuon (<< 4:5.5.3a), libdiscover
+Depends: policykit-1, python3, ${misc:Depends}, ${shlibs:Depends}
+Breaks: libdiscover, libmuon (<< 4:5.5.3a)
+Replaces: libdiscover, libmuon (<< 4:5.5.3a)
 Description: Shared runtime files for the Discover package management suite
  The Discover package management suite is a collection of package management
  applications built on the KDE platform.
@@ -122,8 +119,7 @@ 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.
@@ -132,8 +128,7 @@ 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.
@@ -142,8 +137,7 @@ 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/libdiscovercommon.install b/debian/libdiscovercommon.install
index 208f594..700a3a2 100644
--- a/debian/libdiscovercommon.install
+++ b/debian/libdiscovercommon.install
@@ -1,10 +1,6 @@
-etc/dbus-1/system.d/org.kde.muon.repo.conf
-usr/lib/*/libDiscoverCommon.so
-usr/lib/*/libDiscoverNotifiers.so
-usr/lib/*/libexec/muon_repo_helper
-usr/lib/*/qt5/plugins/discover-notifier/
+usr/lib/*/plasma-discover/libDiscoverCommon.so
+usr/lib/*/plasma-discover/libDiscoverNotifiers.so
 usr/lib/*/qt5/plugins/discover/
 usr/lib/*/qt5/qml/org/kde/discover/
-usr/share/dbus-1/system-services/org.kde.muon.repo.service
 usr/share/libdiscover/
 usr/share/locale/*/LC_MESSAGES/libdiscover.mo
diff --git a/debian/plasma-discover-updater.install b/debian/plasma-discover-updater.install
index 93f1a12..aaa948d 100644
--- a/debian/plasma-discover-updater.install
+++ b/debian/plasma-discover-updater.install
@@ -1,10 +1,10 @@
 #usr/share/locale/*/LC_MESSAGES/plasma-discover-notifier.mo
 #usr/share/locale/*/LC_MESSAGES/plasma-discover-updater.mo
+#usr/share/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
 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/locale/*/LC_MESSAGES/plasma_applet_org.kde.muonnotifier.mo
 usr/share/plasma/plasmoids/org.kde.discovernotifier/
 usr/share/polkit-1/actions/org.kde.muon.repo.policy

-- 
KDE Discover packaging