[SCM] oxygen packaging branch, kubuntu_wily_archive, updated. 66959ebbb30254c8240bf27026863366bc40b5f7

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 66959ebbb30254c8240bf27026863366bc40b5f7
Merge: 5b28941fb672e2683e73d960da16d280cc223c4c 798d15073e1a3765c1d3c8a0987aa55adf5f095b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:40:31 2015 +0200

    merge master

 debian/.gitattributes                           |   1 +
 debian/changelog                                |  27 ++
 debian/control                                  |  53 +--
 debian/copyright                                | 412 +++++++++++-------------
 debian/kde-style-oxygen-qt4.install             |   9 +
 debian/kde-style-oxygen-qt5.install             |   4 +-
 debian/kwin-decoration-oxygen.install           |   4 +-
 debian/kwin-decoration-oxygen.lintian-overrides |   1 -
 debian/liboxygenstyle5-5.install                |   3 +-
 debian/liboxygenstyleconfig5-5.install          |   6 +-
 debian/not-installed                            |   2 +
 debian/oxygen-sounds.install                    |   2 +-
 debian/plasma-theme-oxygen.install              |  10 +-
 debian/rules                                    |  16 +
 debian/source/lintian-overrides                 |   1 -
 debian/watch                                    |   5 +-
 16 files changed, 286 insertions(+), 270 deletions(-)

diff --cc debian/changelog
index d507a88,6d60201..846b8f5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,17 +1,35 @@@
 +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-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.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:57:15 +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-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/kde-style-oxygen-qt5.install
index 3cbdaa0,bc8ac30..66bd552
--- a/debian/kde-style-oxygen-qt5.install
+++ b/debian/kde-style-oxygen-qt5.install
@@@ -1,8 -1,5 +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

-- 
oxygen packaging