[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=367aa57

The following commit has been merged in the kubuntu_unstable branch:
commit 367aa57c43b0e7e4ee87b67643b745bfb20d7a84
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jan 19 13:09:48 2015 +0100

    Revert "remove kwin-decoration-oxygen package, it no longer builds"
    
    This reverts commit 11e5f6f0a941760a0a029b998c2856e37986e9b7.
    
    Conflicts:
    	debian/changelog
    	debian/control
---
 debian/control       | 15 ++++++++++++---
 debian/not-installed |  2 --
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 86e298b..06a1541 100644
--- a/debian/control
+++ b/debian/control
@@ -34,8 +34,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/oxygen.git
 
 Package: plasma-theme-oxygen
 Architecture: any
-Depends: kde-style-oxygen-qt4,
-         kde-style-oxygen-qt5,
+Depends: kde-style-oxygen-qt5,
+         kde-style-oxygen-qt4,
+         kwin-decoration-oxygen,
          oxygen-sounds,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -54,6 +55,14 @@ Description: Sounds for the Oxygen desktop theme
  .
  This package contains the sounds.
 
+Package: kwin-decoration-oxygen
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: KWin decoration for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the KWin decoration and settings modules.
+
 Package: kde-style-oxygen-qt5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -84,7 +93,7 @@ Package: oxygen-dbg
 Section: debug
 Architecture: any
 Recommends: qtbase5-dbg
-Depends: liboxygenstyleconfig5-5 (= ${binary:Version}) | liboxygenstyle5-5 (= ${binary:Version}) | kde-style-oxygen-qt5 (= ${binary:Version}),
+Depends: liboxygenstyleconfig5-5 (= ${binary:Version}) | liboxygenstyle5-5 (= ${binary:Version}) | kde-style-oxygen-qt5 (= ${binary:Version}) | kwin-decoration-oxygen (= ${binary:Version}),
          ${misc:Depends}
 Description: debugging symbols for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
diff --git a/debian/not-installed b/debian/not-installed
index eefb108..bc4194b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -451,5 +451,3 @@
 ./usr/share/icons/Oxygen_Zion/cursors/whats_this
 ./usr/share/icons/Oxygen_Zion/cursors/xterm
 ./usr/share/icons/Oxygen_Zion/index.theme
-./usr/bin/oxygen-settings5
-./usr/share/locale/*/LC_MESSAGES/oxygen_kwin_deco.mo

-- 
oxygen packaging