[SCM] oxygen packaging branch, master, updated. 909b74ca087007b0cf008ec8a1633f8bfe6da54b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit abdec89cc77e7f9cb01e2c4a7fd47651612c6ded
Merge: 06070d792f8fd923eb9486d9ff3f283b723fe2b2 5b28941fb672e2683e73d960da16d280cc223c4c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jul 1 14:14:23 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'
    
    Conflicts:
    	debian/control
    	debian/kwin-decoration-oxygen.install
    	debian/plasma-theme-oxygen.install

 debian/changelog                    | 18 ++++++++++++++++++
 debian/control                      | 10 ++++++++--
 debian/kde-style-oxygen-qt5.install |  3 +++
 debian/plasma-theme-oxygen.install  |  1 -
 4 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 3692111,d507a88..90e178d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,21 +1,36 @@@
 +oxygen (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:25:57 +0200
 +
+ oxygen (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:31:56 +0200
+ 
+ oxygen (4:5.3.1-0ubuntu1) wily; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:38:55 +0200
+ 
 +oxygen (4:5.2.2-1) experimental; urgency=medium
 +
 +  * New upstream release (5.2.1).
 +  * New upstream release (5.2.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:55 +0100
 +
+ oxygen (4:5.2.2-0ubuntu2) vivid; urgency=medium
+ 
+   * Fix kde-style-oxygen-qt5.install
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 25 Mar 2015 00:11:23 +0100
+ 
  oxygen (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index a3d09da,937f0a4..0587fcf
--- a/debian/control
+++ b/debian/control
@@@ -1,20 -1,22 +1,22 @@@
  Source: oxygen
 -Priority: extra
 +Section: kde
 +Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 -Build-Depends: cmake,
 -               debhelper (>= 9.0.0),
 +Uploaders: Maximiliano Curia <maxy at debian.org>
 +Build-Depends: cmake (>= 2.8.12),
 +               debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
 +               kdelibs5-dev (>= 4.9.80),
-                kwin-dev (>= 4:5.2.2),
-                libkdecorations2-dev,
+                kwin-dev (>= 4:5.3.2),
+                libkdecorations2-dev (>= 4:5.2.0),
+                libkf5auth-dev (>= 5.2.0),
+                libkf5codecs-dev (>= 5.2.0),
                 libkf5completion-dev (>= 5.2.0),
                 libkf5config-dev (>= 5.2.0),
 -               libkf5configwidgets-dev (>= 5.2.0),
 -               libkf5coreaddons-dev (>= 5.2.0),
 -               libkf5dbusaddons-dev (>= 5.2.0),
 +               libkf5configwidgets-dev,
 +               libkf5coreaddons-dev,
                 libkf5guiaddons-dev (>= 5.2.0),
                 libkf5i18n-dev (>= 5.2.0),
 -               libkf5iconthemes-dev (>= 5.2.0),
 -               libkf5itemviews-dev (>= 5.2.0),
                 libkf5service-dev (>= 5.2.0),
                 libkf5style-dev (>= 5.2.0),
                 libkf5widgetsaddons-dev (>= 5.2.0),
diff --cc debian/kde-style-oxygen-qt5.install
index bc8ac30,3cbdaa0..66bd552
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@@ -1,5 -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/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/locale/*/*/oxygen_style_config.mo
 +usr/share/locale/*/*/oxygen_style_demo.mo
diff --cc debian/plasma-theme-oxygen.install
index cb810ae,a5e753e..0cb81c8
--- a/debian/plasma-theme-oxygen.install
+++ b/debian/plasma-theme-oxygen.install
@@@ -1,2 -1,8 +1,1 @@@
- 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
 -usr/share/plasma/look-and-feel/org.kde.oxygen/contents/splash/Splash.qml
 -usr/share/plasma/look-and-feel/org.kde.oxygen/contents/splash/images/background.png
 -usr/share/plasma/look-and-feel/org.kde.oxygen/contents/splash/images/kde.png
 -usr/share/plasma/look-and-feel/org.kde.oxygen/contents/splash/images/rectangle.png
 -usr/share/plasma/look-and-feel/org.kde.oxygen/metadata.desktop
 +usr/share/plasma/look-and-feel/org.kde.oxygen/

-- 
oxygen packaging