[SCM] oxygen packaging branch, master, updated. ubuntu/4%5.3.2-0ubuntu1-12-g6ab4a80

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e23c40882949329df653ba861d877b24515d558f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jul 3 13:43:36 2015 +0200

    Finish merge
---
 debian/control                         | 4 ++--
 debian/kde-style-oxygen-qt5.install    | 1 -
 debian/liboxygenstyleconfig5-5.install | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 3977670..6be6f22 100644
--- a/debian/control
+++ b/debian/control
@@ -100,8 +100,8 @@ Description: style library for the Oxygen desktop theme
 Package: liboxygenstyleconfig5-5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kde-style-oxygen-qt5 (<< 4:5.3.2~)
-Replaces: kde-style-oxygen-qt5 (<< 4:5.3.2~)
+Breaks: kde-style-oxygen-qt5 (<< 4:5.3.2-2~)
+Replaces: kde-style-oxygen-qt5 (<< 4:5.3.2-2~)
 Description: style library configuration 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 28dacab..b3deb4c 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -1,7 +1,6 @@
 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/*/*/oxygen_style_config.mo
 usr/share/locale/*/*/oxygen_style_demo.mo
diff --git a/debian/liboxygenstyleconfig5-5.install b/debian/liboxygenstyleconfig5-5.install
index 1dc5c25..58fdb0d 100644
--- a/debian/liboxygenstyleconfig5-5.install
+++ b/debian/liboxygenstyleconfig5-5.install
@@ -1,3 +1,4 @@
 usr/lib/*/liboxygenstyleconfig5.so.5
 usr/lib/*/liboxygenstyleconfig5.so.5.*
+usr/share/kservices5/oxygenstyleconfig.desktop
 usr/share/locale/*/*/liboxygenstyleconfig.mo

-- 
oxygen packaging