[SCM] plasma-workspace packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-92-g1e3b84e
Clive Johnston
clivejo-guest at moszumanska.debian.org
Wed Jan 27 21:00:21 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=a340b49
The following commit has been merged in the kubuntu_xenial_archive branch:
commit a340b49041fbc0f6a63a6840a8c3ad1e11bcb6b0
Merge: a927152f2a466fa502a67c4a6ff9a61b3852460c dd50c209243c5d804d8c18949e9b71e75e7e9ffd
Author: Clive Johnston <clivejo at aol.com>
Date: Wed Jan 27 20:19:19 2016 +0000
Merge xenial_archive manual.
debian/changelog | 12 ++++++++++--
debian/control | 2 +-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --cc debian/changelog
index c9f52b6,7e757d1..24623d6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
--plasma-workspace (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
++plasma-workspace (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
[ Scarlett Clark ]
* New upstream release Xenial.
@@@ -14,24 -14,10 +14,32 @@@
into plasma-workspace-wayland.install
* New upstream release
++<<<<<<< HEAD
+ [ Philip Muškovac ]
+ * Merge with debian git master
++=======
+ [ Scarlett Clark ]
+ * Merge xenial_archive manual.
++>>>>>>> origin/kubuntu_stable
++
++ [ Clive Johnston ]
++ * New upstream release
+
- -- Clive Johnston <clivejo at aol.com> Thu, 07 Jan 2016 18:02:18 +0000
++ -- Clive Johnston <clivejo at aol.com> Wed, 27 Jan 2016 20:19:19 +0000
+
+plasma-workspace (4:5.4.3-2) UNRELEASED; urgency=medium
+
+ [ Dmitry Shachnev ]
+ * Stop depending on qtdeclarative5-* transitional packages.
- -- Clive Johnston <clivejo at aol.com> Thu, 07 Jan 2016 18:02:18 +0000
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 12 Jan 2016 16:57:56 +0300
+
+plasma-workspace (4:5.4.3-1) unstable; urgency=medium
+
+ * Really add the Provides: notification-daemon. (Closes: #798377)
+ * New upstream release (5.4.3).
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 01 Dec 2015 11:46:11 +0100
plasma-workspace (4:5.4.3-0ubuntu1) xenial; urgency=medium
diff --cc debian/control
index 3ae1266,6256e25..9a333b9
--- a/debian/control
+++ b/debian/control
@@@ -4,9 -4,10 +4,9 @@@ Priority: optiona
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
Build-Depends: baloo-kf5-dev (>= 5.18.0~),
- extra-cmake-modules (>= 5.18.0~),
cmake (>= 2.8.12),
- dbus-x11,
debhelper (>= 9),
+ extra-cmake-modules (>= 5.18.0~),
kdoctools-dev (>= 5.18.0~),
kinit-dev (>= 5.18.0~),
kio-dev (>= 5.18.0~),
--
plasma-workspace packaging
More information about the pkg-kde-commits
mailing list