[SCM] plasma-desktop packaging branch, master, updated. d00c0080569ca12a5a201fff6940e70da66c80a2

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=bc182f6

The following commit has been merged in the master branch:
commit bc182f6c53eb2633d106f3ed8f0912cd32f6ec89
Merge: 23a6edb1ef7850c97f63f578dc5dbdbe9bd8dbda a37c7f1b843cfc5dbcd7ef1aefd7e487e494f8c8
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Mar 25 11:17:27 2015 +0100

    Merge commit 'a37c7f1b843cfc5dbcd7ef1aefd7e487e494f8c8'
    
    Conflicts:
    	debian/control

 debian/changelog | 12 ++++++++++++
 debian/control   |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 70435f3,1eb38b7..26dfbd0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,15 +1,33 @@@
 +plasma-desktop (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 09:50:23 +0100
 +
+ plasma-desktop (4:5.2.2-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:42:28 -0700
+ 
+ plasma-desktop (4:5.2.1-0ubuntu1) vivid; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 23 Feb 2015 09:46:57 -0800
+ 
 +plasma-desktop (4:5.2.0-1) experimental; urgency=medium
 +
 +  * Prepare initial Debian release.
 +  * Add myself as Uploader.
 +  * Bump Standards-Version to 3.9.6, no changes needed.
 +  * Update build dependencies to build against experimental and to
 +    follow cmake.
 +  * Update copyright information.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 12 Feb 2015 22:57:30 +0100
 +
  plasma-desktop (4:5.2.0-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index ddc6571,6df91fe..ffc007b
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,14 +1,19 @@@
  Source: plasma-desktop
 -Priority: extra
 +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.1.95),
 -               cmake,
 -               debhelper (>= 9.0.0),
 +               cmake (>= 2.8.12),
 +               debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
 -               kdoctools-dev,
 +               kdoctools-dev (>= 5.2.0~),
 +               kinit-dev,
-                kwin-dev (>= 4:5.2.0),
+                kwin-dev (>= 4:5.2.2),
 -               libboost1.55-dev,
 +               libboost-dev,
                 libcanberra-dev,
 +               libfontconfig1-dev,
 +               libfreetype6-dev,
                 libglib2.0-dev,
                 libkf5activities-dev (>= 5.2.0),
                 libkf5attica-dev (>= 5.2.0),
@@@ -46,14 -37,15 +46,14 @@@
                 openbox,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 plasma-framework-dev (>= 5.2.0),
-                plasma-workspace-dev (>= 4:5.2.0),
+                plasma-workspace-dev (>= 4:5.2.2),
 -               qtbase5-dev,
 -               qtdeclarative5-dev,
 +               qtbase5-dev (>= 5.3.0),
 +               qtdeclarative5-dev (>= 5.3.0),
                 xauth,
                 xvfb
 -Standards-Version: 3.9.5
 -Section: kde
 +Standards-Version: 3.9.6
  Homepage: https://projects.kde.org/projects/kde/workspace/plasma-desktop
 -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/plasma-desktop.git
 +Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/plasma/plasma-desktop.git
  Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/plasma-desktop.git
  
  Package: plasma-desktop-dev

-- 
plasma-desktop packaging