[SCM] oxygen packaging branch, kubuntu_unstable, updated. 4cea25f7b291d874130450ccb91b258c8167c913

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 1f8b0ae141a40a66b984f2e3fb103ea91ca3d3c0
Author: Harald Sitter <sitter at kde.org>
Date:   Sun May 3 18:40:07 2015 +0200

    wrap and sort ffs
---
 debian/control                        | 6 ++++--
 debian/kde-style-oxygen-qt5.install   | 2 +-
 debian/kwin-decoration-oxygen.install | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 4d140e9..0a865fd 100644
--- a/debian/control
+++ b/debian/control
@@ -69,8 +69,10 @@ 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)
+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 8a40cd4..3cbdaa0 100644
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@ -2,7 +2,7 @@ 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/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/share/kservices5/oxygenstyleconfig.desktop
diff --git a/debian/kwin-decoration-oxygen.install b/debian/kwin-decoration-oxygen.install
index fb483b5..d9fc030 100644
--- a/debian/kwin-decoration-oxygen.install
+++ b/debian/kwin-decoration-oxygen.install
@@ -1,3 +1,3 @@
 usr/lib/*/qt5/plugins/org.kde.kdecoration2/oxygendecoration.so
-usr/share/locale/*/LC_MESSAGES/oxygen_kwin_deco.mo
 usr/share/locale/*/LC_MESSAGES/oxygen_kdecoration.mo
+usr/share/locale/*/LC_MESSAGES/oxygen_kwin_deco.mo

-- 
oxygen packaging