[SCM] oxygen packaging branch, kubuntu_vivid_archive, updated. 4bd722f9730fef2d6f58b266d09b9a9fe78234b9

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit 4bd722f9730fef2d6f58b266d09b9a9fe78234b9
Merge: 1df6d3f3d7eed3a99f7351e2e56fb5bb8814d215 772a07aece5f6d7c0101af8681b3f1e4723ed827
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Mar 19 17:38:43 2015 -0700

    Manual merge kubuntu_unstable

 debian/control                        | 16 +++++++++++++---
 debian/kde-style-oxygen-qt5.install   |  1 +
 debian/kwin-decoration-oxygen.install |  3 +--
 debian/meta/upstream_scm.json         |  1 -
 debian/not-installed                  |  2 --
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --cc debian/control
index 505709b,dbbb23c..475ef40
--- a/debian/control
+++ b/debian/control
@@@ -4,7 -4,8 +4,8 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Build-Depends: cmake,
                 debhelper (>= 9.0.0),
                 extra-cmake-modules (>= 1.3.0~),
 -               kwin-dev (>= 4:5.2.1),
 +               kwin-dev (>= 4:5.2.2),
+                libkdecorations2-dev (>= 4:5.2.0),
                 libkf5auth-dev (>= 5.2.0),
                 libkf5codecs-dev (>= 5.2.0),
                 libkf5completion-dev (>= 5.2.0),

-- 
oxygen packaging