[SCM] KDE Discover packaging branch, master, updated. debian/5.6.2-1-2-gee52605
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Apr 17 13:54:57 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=ee52605
The following commit has been merged in the master branch:
commit ee52605bb5de8f9740c02748483c95df301d5066
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Apr 17 15:51:27 2016 +0200
Add missing breaks replaces against libmuon
The conflicting file is:
libmuon: /usr/share/polkit-1/actions/org.kde.muon.repo.policy
---
debian/control | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index 9a1eb85..a6b82a3 100644
--- a/debian/control
+++ b/debian/control
@@ -64,10 +64,8 @@ Depends: libqapt3-runtime,
${misc:Depends},
${shlibs:Depends}
Recommends: plasma-discover-notifier
-Breaks: muon-notifier (<< 4:5.5.3a),
- muon-updater (<< 4:5.5.3a)
-Replaces: muon-notifier (<< 4:5.5.3a),
- muon-updater (<< 4:5.5.3a)
+Breaks: libmuon, muon-notifier (<< 4:5.5.3a), muon-updater (<< 4:5.5.3a)
+Replaces: libmuon, 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
@@ -75,10 +73,7 @@ Description: Update manager for KDE
Package: plasma-discover-private
Architecture: any
-Depends: policykit-1,
- python3,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: policykit-1, python3, ${misc:Depends}, ${shlibs:Depends}
Breaks: libmuon (<< 4:5.5.3a)
Replaces: libmuon (<< 4:5.5.3a)
Description: Private runtime libraries for the Discover suite
@@ -102,8 +97,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.
@@ -112,8 +106,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.
@@ -122,8 +115,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.
--
KDE Discover packaging
More information about the pkg-kde-commits
mailing list