[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=f79f0e6

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

    repair the packaging. this was messed up so bad I want to quit
---
 debian/control                      | 4 ++++
 debian/kde-style-oxygen-qt5.install | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 475ef40..92497dc 100644
--- a/debian/control
+++ b/debian/control
@@ -59,6 +59,8 @@ Description: Sounds for the Oxygen desktop theme
 Package: kwin-decoration-oxygen
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-style-oxygen-qt5 (<< 4:5.2.2+git20150326)
+Replaces: kde-style-oxygen-qt5 (<< 4:5.2.2+git20150326)
 Description: KWin decoration for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
@@ -67,6 +69,8 @@ Description: KWin decoration for the Oxygen desktop theme
 Package: kde-style-oxygen-qt5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kwin-decoration-oxygen (<< 4:5.2.2+git20150326), plasma-theme-oxygen (<< 4:5.2.2+git20150326)
+Replaces: kwin-decoration-oxygen (<< 4:5.2.2+git20150326), plasma-theme-oxygen (<< 4:5.2.2+git20150326)
 Description: Qt decoration for the Oxygen desktop theme
  The Oxygen desktop theme is used by Plasma and other KDE Software.
  .
diff --git a/debian/kde-style-oxygen-qt5.install b/debian/kde-style-oxygen-qt5.install
index 62243f9..8a40cd4 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,8 +1,8 @@
+usr/bin/oxygen-settings5
 usr/lib/*/qt5/plugins/kstyle_oxygen_config.so
 usr/lib/*/qt5/plugins/styles/oxygen.so
 usr/share/kservices5/oxygenstyleconfig.desktop
 usr/share/kstyle/themes/oxygen.themerc
 usr/share/locale/*/LC_MESSAGES/oxygen_style_config.mo
 usr/share/locale/*/LC_MESSAGES/oxygen_style_demo.mo
-usr/lib/*/qt5/plugins/org.kde.kdecoration2/oxygendecoration.so
 usr/share/kservices5/oxygenstyleconfig.desktop

-- 
oxygen packaging