[SCM] oxygen packaging branch, kubuntu_stable, updated. 2c599192398b9ef2d35693871fa73dec054a32b9

[Harald Sitter]

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

The following commit has been merged in the kubuntu_stable branch:
commit 424c722f6573aa24f0587e6a7b16968f34fd9b66
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Mar 26 13:12:21 2015 +0100

    Revert "Fix stubvar external package for removed package."
    
    This reverts commit b0852946a066ba9ddd85826a08db072fe92db137.
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/plasma-theme-oxygen.install
---
 debian/control                     | 3 ++-
 debian/plasma-theme-oxygen.install | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index f4fcc53..475ef40 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,7 @@ Package: plasma-theme-oxygen
 Architecture: any
 Depends: kde-style-oxygen-qt4,
          kde-style-oxygen-qt5,
+         kwin-decoration-oxygen,
          oxygen-sounds,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -93,7 +94,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/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index 7a12990..a5e753e 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1,4 +1,3 @@
-usr/bin/oxygen-settings5
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/defaults
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/previews/preview.png
 usr/share/plasma/look-and-feel/org.kde.oxygen/contents/previews/splash.png

-- 
oxygen packaging