[SCM] plasma-workspace packaging branch, kubuntu_stable, updated. acdeabd74d658b4a5fddfcf47e3d4b3b28834c32
Kubuntu CI (Harald Sitter)
kubuntu-ci-guest at moszumanska.debian.org
Mon Feb 23 16:22:31 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=acdeabd
The following commit has been merged in the kubuntu_stable branch:
commit acdeabd74d658b4a5fddfcf47e3d4b3b28834c32
Author: Jonathan Riddell <jr at jriddell.org>
Date: Mon Feb 23 17:21:22 2015 +0100
Add build-dep on libkf5prison-dev and upstream_prison.diff to build klipper with prison, FFe approved on IRC
* Add build-dep on libkf5prison-dev and upstream_prison.diff to build
klipper with prison, FFe approved on IRC
* Add libglib2.0-dev to fix build with libqalculate-dev for krunner
---
debian/changelog | 6 ++++++
debian/control | 5 +++--
debian/patches/series | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d8d320a..0e5a693 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
plasma-workspace (4:5.2.1-0ubuntu1) UNRELEASED; urgency=medium
+ [ Scarlett Clark ]
* New upstream release
* Add new depend libkf5filemetadata
+ [ Jonathan Riddell ]
+ * Add build-dep on libkf5prison-dev and upstream_prison.diff to build
+ klipper with prison, FFe approved on IRC
+ * Add libglib2.0-dev to fix build with libqalculate-dev for krunner
+
-- Scarlett Clark <sgclark at kubuntu.org> Thu, 19 Feb 2015 10:03:52 -0800
plasma-workspace (4:5.2.0-0ubuntu2) vivid; urgency=medium
diff --git a/debian/control b/debian/control
index bc97ebe..d1f0e6d 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Build-Depends: baloo-kf5-dev (>= 5.0.0),
libboost1.55-dev,
libdbusmenu-qt5-dev,
libfontconfig1-dev,
+ libglib2.0-dev,
libgps-dev,
libkf5activities-dev (>= 5.2.0),
libkf5attica-dev (>= 5.2.0),
@@ -48,6 +49,7 @@ Build-Depends: baloo-kf5-dev (>= 5.0.0),
libkf5notifications-dev (>= 5.2.0),
libkf5notifyconfig-dev (>= 5.2.0),
libkf5parts-dev (>= 5.2.0),
+ libkf5prison-dev,
libkf5pty-dev (>= 5.2.0),
libkf5runner-dev (>= 5.2.0),
libkf5screen-dev (>= 5.1.95),
@@ -70,7 +72,6 @@ Build-Depends: baloo-kf5-dev (>= 5.0.0),
libpci-dev,
libphonon4qt5-dev,
libphonon4qt5experimental-dev,
- libprison-dev,
libqalculate-dev,
libqimageblitz-dev,
libqt5sensors5-dev,
@@ -122,7 +123,7 @@ Build-Depends: baloo-kf5-dev (>= 5.0.0),
xauth,
xcb-proto,
xvfb
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Package: plasma-workspace-dev
Architecture: any
diff --git a/debian/patches/series b/debian/patches/series
index 59f4624..62568ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
kubuntu_startkde-qtpath.diff
upstream_gdb-7.8-fix.diff
+upstream_prison.diff
--
plasma-workspace packaging
More information about the pkg-kde-commits
mailing list