[SCM] oxygen packaging branch, kubuntu_unstable, updated. be2565f754f295ee2f3edff9a978ad7b74a7e852

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit be2565f754f295ee2f3edff9a978ad7b74a7e852
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 13 09:35:55 2015 +0100

    fix up decoration packaging for port for kdecoration2
---
 debian/control                        | 5 +++--
 debian/kwin-decoration-oxygen.install | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 06a1541..4a87d32 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Build-Depends: cmake,
                debhelper (>= 9.0.0),
                extra-cmake-modules (>= 1.3.0~),
                kwin-dev (>= 4:5.2.0),
+               libkdecorations2-dev (>= 4:5.2.0),
                libkf5auth-dev (>= 5.2.0),
                libkf5codecs-dev (>= 5.2.0),
                libkf5completion-dev (>= 5.2.0),
@@ -34,8 +35,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/oxygen.git
 
 Package: plasma-theme-oxygen
 Architecture: any
-Depends: kde-style-oxygen-qt5,
-         kde-style-oxygen-qt4,
+Depends: kde-style-oxygen-qt4,
+         kde-style-oxygen-qt5,
          kwin-decoration-oxygen,
          oxygen-sounds,
          ${misc:Depends},
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index d6f75f1..42e9beb 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,4 +1,3 @@
-#usr/lib/*/qt5/plugins/kwin/kdecorations/config/kwin_oxygen_config.so
-#usr/lib/*/qt5/plugins/kwin/kdecorations/kwin3_oxygen.so
 usr/bin/oxygen-settings5
+usr/lib/*/qt5/plugins/org.kde.kdecoration2/oxygendecoration.so
 usr/share/locale/*/LC_MESSAGES/oxygen_kwin_deco.mo

-- 
oxygen packaging