[SCM] oxygen packaging branch, kubuntu_stable, updated. 023cdc11cdab77d183cec4ea78cfc99d2a1d91b9

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 023cdc11cdab77d183cec4ea78cfc99d2a1d91b9
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Sun Mar 22 14:25:35 2015 -0700

    Add missing file.
---
 debian/changelog                      |  1 +
 debian/control                        | 12 ++----------
 debian/kwin-decoration-oxygen.install |  1 -
 debian/plasma-theme-oxygen.install    |  1 +
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e7955a5..0c6475d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ oxygen (4:5.2.2-0ubuntu1) UNRELEASED; urgency=medium
   * Re- remove kwin-decoration-oxygen package, it no longer builds
   * Remove missing file. 
   * Fix stubvar external package for removed package. 
+  * Add missing file. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 19 Mar 2015 15:12:01 -0700
 
diff --git a/debian/control b/debian/control
index adc6882..c48df59 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ 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,        
+         kde-style-oxygen-qt5,
          oxygen-sounds,
          ${misc:Depends},
          ${shlibs:Depends}
@@ -55,14 +55,6 @@ 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}
@@ -93,7 +85,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}),
          ${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/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index 42e9beb..925be49 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,2 @@
-usr/bin/oxygen-settings5
 usr/lib/*/qt5/plugins/org.kde.kdecoration2/oxygendecoration.so
 usr/share/locale/*/LC_MESSAGES/oxygen_kwin_deco.mo
diff --git a/debian/plasma-theme-oxygen.install b/debian/plasma-theme-oxygen.install
index a5e753e..7a12990 100644
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1,3 +1,4 @@
+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