[SCM] plasma-workspace packaging branch, master, updated. 36eaa2e152ca5758a8863cdf892db3922bcaf1ed
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 26 12:43:24 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=b44767d
The following commit has been merged in the master branch:
commit b44767dd941405b1938793d6f3eda3aeaef44197
Merge: 4dcea20cd7069daea338763597e2fe0de973b963 e26694e6be6724ecaa6ea3a3739a5d593088c7da
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Wed Mar 25 11:22:12 2015 +0100
Merge commit 'e26694e6be6724ecaa6ea3a3739a5d593088c7da'
Conflicts:
debian/control
debian/patches/series
debian/changelog | 41 +++++++
debian/control | 4 +-
.../patches/kubuntu_default-systray-applets.diff | 19 ++++
debian/patches/series | 2 +
debian/patches/upstream_prison.diff | 124 +++++++++++++++++++++
5 files changed, 188 insertions(+), 2 deletions(-)
diff --cc debian/changelog
index fb0aac8,8aee2d4..e573f6f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,44 +1,66 @@@
+plasma-workspace (4:5.2.2-1~) UNRELEASED; urgency=medium
+
+ * New upstream release (5.2.1).
+ * New upstream release (5.2.2).
+
+ -- Maximiliano Curia <maxy at debian.org> Wed, 25 Mar 2015 10:00:59 +0100
+
+ plasma-workspace (4:5.2.2-0ubuntu1) vivid; urgency=medium
+
+ * New upstream release
+
+ -- Scarlett Clark <sgclark at kubuntu.org> Tue, 24 Mar 2015 07:43:40 -0700
+
+ plasma-workspace (4:5.2.1-0ubuntu3) vivid; urgency=medium
+
+ * Update kubuntu_default-systray-applets.diff to add telepathy
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Fri, 13 Mar 2015 21:04:50 +0100
+
+ plasma-workspace (4:5.2.1-0ubuntu2) vivid; urgency=medium
+
+ * Add kubuntu_default-systray-applets.diff to add printer, muon and
+ kdeconnect to systray by default
+
+ -- Jonathan Riddell <jriddell at ubuntu.com> Mon, 09 Mar 2015 21:24:35 +0100
+
+ plasma-workspace (4:5.2.1-0ubuntu1) vivid; 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> Mon, 23 Feb 2015 09:48:01 -0800
+
+plasma-workspace (4:5.2.0-1) experimental; urgency=medium
+
+ * Prepare initial Debian release.
+ * Add myself as Uploader.
+ * Add missing prerm.
+ * Bump Standards-Version to 3.9.6, no changes needed.
+ * Update build dependencies to build against experimental and to
+ follow cmake.
+ * Update copyright information.
+ * Update install files.
+ * Add basic autopkgtests support.
+ * New patch: install_missing_header.
+
+ -- Maximiliano Curia <maxy at debian.org> Tue, 10 Feb 2015 20:32:53 +0100
+
+ plasma-workspace (4:5.2.0-0ubuntu2) vivid; urgency=medium
+
+ * Merge kubuntu_stable branch to adopt kglobalacceld move for
+ frameworks 5.7
+ + Force a dependency on the kglobalaccel binary package >= 5.7
+ + Also force a build dependency on >= 5.7
+
+ -- Harald Sitter <sitter at kde.org> Mon, 16 Feb 2015 08:10:29 +0100
+
plasma-workspace (4:5.2.0-0ubuntu1) vivid; urgency=medium
* New upstream release
diff --cc debian/control
index 73b9ec2,0e18f90..f7377e0
--- a/debian/control
+++ b/debian/control
@@@ -2,51 -2,81 +2,50 @@@ Source: plasma-workspac
Section: kde
Priority: optional
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.0.0),
- cmake,
+ cmake (>= 2.8.12),
dbus-x11,
- debhelper (>= 9.0.0),
- extra-cmake-modules,
- kdoctools-dev,
- kgendesignerplugin (>= 5.2.0),
+ debhelper (>= 9),
+ extra-cmake-modules (>= 1.6.0),
+ kdoctools-dev (>= 5.4.0),
kinit-dev,
- kio-dev (>= 5.2.0),
+ kio-dev (>= 5.4.0),
kwayland-dev (>= 5.1.95),
- kwin-dev (>= 4:5.2.0),
+ kwin-dev (>= 4:5.2.2),
- libboost1.55-dev,
+ libboost-dev,
libdbusmenu-qt5-dev,
- libfontconfig1-dev,
- libglib2.0-dev,
libgps-dev,
- libkf5activities-dev (>= 5.2.0),
- libkf5attica-dev (>= 5.2.0),
- libkf5auth-dev (>= 5.2.0),
- libkf5bookmarks-dev (>= 5.2.0),
- libkf5codecs-dev (>= 5.2.0),
- libkf5completion-dev (>= 5.2.0),
+ libkf5activities-dev (>= 5.4.0),
libkf5config-dev (>= 5.2.0),
- libkf5configwidgets-dev (>= 5.2.0),
libkf5coreaddons-dev (>= 5.2.0),
- libkf5crash-dev (>= 5.2.0),
- libkf5dbusaddons-dev (>= 5.2.0),
- libkf5declarative-dev (>= 5.2.0),
- libkf5emoticons-dev (>= 5.2.0),
- libkf5filemetadata-dev (>= 5.6.1),
- libkf5globalaccel-dev (>= 5.7.0),
- libkf5guiaddons-dev (>= 5.2.0),
+ libkf5crash-dev (>= 5.4.0),
+ libkf5dbusaddons-dev (>= 5.4.0),
+ libkf5declarative-dev (>= 5.4.0),
+ libkf5globalaccel-dev (>= 5.4.0),
libkf5i18n-dev (>= 5.2.0),
- libkf5iconthemes-dev (>= 5.2.0),
- libkf5idletime-dev (>= 5.2.0),
- libkf5itemmodels-dev (>= 5.2.0),
- libkf5itemviews-dev (>= 5.2.0),
- libkf5jobwidgets-dev (>= 5.2.0),
- libkf5jsembed-dev (>= 5.2.0),
- libkf5kcmutils-dev (>= 5.2.0),
- libkf5kdelibs4support-dev (>= 5.2.0),
- libkf5khtml-dev (>= 5.2.0),
- libkf5kjs-dev (>= 5.2.0),
- libkf5newstuff-dev (>= 5.2.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),
+ libkf5idletime-dev (>= 5.4.0),
+ libkf5jsembed-dev (>= 5.4.0),
+ libkf5kcmutils-dev (>= 5.4.0),
+ libkf5kdelibs4support-dev (>= 5.4.0),
+ libkf5newstuff-dev (>= 5.4.0),
+ libkf5notifyconfig-dev (>= 5.4.0),
+ libkf5runner-dev (>= 5.4.0),
libkf5screen-dev (>= 5.1.95),
- libkf5service-dev (>= 5.2.0),
libkf5solid-dev (>= 5.2.0),
- libkf5sonnet-dev (>= 5.2.0),
- libkf5style-dev (>= 5.2.0),
- libkf5su-dev (>= 5.2.0),
- libkf5sysguard-dev (>= 5.2.0),
+ libkf5su-dev (>= 5.4.0),
+ libkf5sysguard-dev,
libkf5texteditor-dev (>= 5.2.0),
- libkf5textwidgets-dev (>= 5.2.0),
- libkf5threadweaver-dev (>= 5.2.0),
- libkf5unitconversion-dev (>= 5.2.0),
- libkf5wallet-dev (>= 5.2.0),
- libkf5webkit-dev (>= 5.2.0),
- libkf5widgetsaddons-dev (>= 5.2.0),
- libkf5windowsystem-dev (>= 5.2.0),
- libkf5xmlgui-dev (>= 5.2.0),
+ libkf5textwidgets-dev (>= 5.4.0),
+ libkf5wallet-dev (>= 5.4.0),
+ libkf5webkit-dev (>= 5.4.0),
libpam0g-dev,
- libpci-dev,
- libphonon4qt5-dev,
+ libphonon4qt5-dev (>= 4:4.8.0-5),
libphonon4qt5experimental-dev,
- libprison-dev,
libqalculate-dev,
- libqimageblitz-dev,
libqt5sensors5-dev,
libqt5webkit5-dev,
- libqt5x11extras5-dev,
+ libqt5x11extras5-dev (>= 5.3.0~),
libraw1394-dev,
libsm-dev,
libudev-dev,
diff --cc debian/patches/series
index 478d34f,ba33935..1e8eb1a
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,4 +1,5 @@@
kubuntu_startkde-qtpath.diff
upstream_gdb-7.8-fix.diff
+install_missing_header
+ upstream_prison.diff
+ kubuntu_default-systray-applets.diff
--
plasma-workspace packaging
More information about the pkg-kde-commits
mailing list