[SCM] plasma-desktop packaging branch, kubuntu_vivid_backports, updated. ubuntu/4%5.3.2-0ubuntu3-2-g85d7d33
Scarlett Clark
sgclark-guest at moszumanska.debian.org
Tue Aug 4 21:33:00 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=85d7d33
The following commit has been merged in the kubuntu_vivid_backports branch:
commit 85d7d33721f144ce23f585e8999b4d1257944ccf
Merge: 7da6c610bceec6eff36aed1f8b165b9d8105ec7a 54d04edcd3d9a14b41a10b7e54b44625bab1fa63
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date: Tue Aug 4 14:32:52 2015 -0700
* add those breaks/replaces to plasma-desktop-data as well
-- Philip Muškovac <yofel at kubuntu.org> Sun, 26 Jul 2015 21:26:47 +0200 * add versions to breaks/replaces for touchpad which have transitionals
-- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Jul 2015 23:44:09 +0200
* add those breaks/replaces to plasma-desktop-data as well
-- Philip Muškovac <yofel at kubuntu.org> Sun, 26 Jul 2015 21:26:47 +0200
* add versions to breaks/replaces for touchpad which have
transitionals
-- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Jul 2015 23:44:09 +0200
debian/changelog | 16 +++++++++++++++-
debian/control | 12 ++++++++----
2 files changed, 23 insertions(+), 5 deletions(-)
diff --cc debian/changelog
index e12eb02,af387d6..c907a9e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,23 @@@
- plasma-desktop (4:5.3.2-0ubuntu2) UNRELEASED; urgency=medium
++plasma-desktop (4:5.3.2-0ubuntu4) UNRELEASED; urgency=medium
+
+ * Vivid backport.
++ * Manual merge.
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 04 Aug 2015 14:30:11 -0700
+
+ plasma-desktop (4:5.3.2-0ubuntu3) wily; urgency=medium
+
+ * add those breaks/replaces to plasma-desktop-data as well
+
+ -- Philip Muškovac <yofel at kubuntu.org> Sun, 26 Jul 2015 21:26:47 +0200
+
+ plasma-desktop (4:5.3.2-0ubuntu2) wily; urgency=medium
+
+ * add versions to breaks/replaces for touchpad which have
+ transitionals
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Tue, 14 Jul 2015 23:44:09 +0200
+
plasma-desktop (4:5.3.2-0ubuntu1) wily; urgency=medium
* New upstream release
diff --cc debian/control
index 960194e,b7896ab..bdaab66
--- a/debian/control
+++ b/debian/control
@@@ -204,9 -204,13 +204,13 @@@ Recommends: plasma-framework
qml-module-qtquick-dialogs
Conflicts: kde-workspace-bin, kde-workspace-data
Breaks: baloo-kf5 (<< 5.5),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
+ kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version})
++ kde-touchpad (<< ${source:Version}),
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
Replaces: baloo-kf5 (<< 5.5),
- plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8),
- kde-config-touchpad (<< ${source:Version}),
- kde-touchpad (<< ${source:Version})
++ kde-config-touchpad (<< ${source:Version}),
++ kde-touchpad (<< ${source:Version}),
+ plasma-desktop-dev (<< 4:5.0.2-0ubuntu1~ubuntu14.10~ppa8)
Description: Tools and widgets for the desktop data files
Plasma Desktop offers a beautiful looking desktop
that takes complete advantage of modern computing technology.
--
plasma-desktop packaging
More information about the pkg-kde-commits
mailing list