[SCM] oxygen packaging branch, kubuntu_utopic_next, updated. 81090909743ec2933ef55c10c7fc2a152fdd3c14

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 81090909743ec2933ef55c10c7fc2a152fdd3c14
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Oct 14 15:50:09 2014 +0200

    Rename oxygen-look-and-feel to plasma-theme-oxygen and make it depend on other parts it expects
---
 debian/changelog                                   |  6 ++----
 debian/control                                     | 22 ++++++++++++++--------
 ...nd-feel.install => plasma-theme-oxygen.install} |  4 ++--
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5ba2064..1d28447 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ oxygen (4:5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
   [ Jonathan Riddell ]
   * New upstream release
   * Add upstream_dont-install-build-files.diff to not install unused files
+  * Rename oxygen-look-and-feel to plasma-theme-oxygen and make it depend
+    on other parts it expects
 
   [ Scarlett Clark ]
   * Add missing look-and-feel files to a new package.
@@ -11,10 +13,6 @@ oxygen (4:5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
   * Override missing manpage lintian error.
   * Correct the filename for the lintian override.
 
-  [ Jonathan Riddell ]
-  * New upstream release
-  * New upstream release with fixed tar
-
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 14 Oct 2014 13:50:05 +0200
 
 oxygen (4:5.0.2-0ubuntu1) utopic; urgency=medium
diff --git a/debian/control b/debian/control
index 225dfb1..972485a 100644
--- a/debian/control
+++ b/debian/control
@@ -32,6 +32,20 @@ Homepage: https://projects.kde.org/projects/kde/workspace/oxygen
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/plasma/oxygen.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/oxygen.git
 
+Package: plasma-theme-oxygen
+Architecture: any
+Depends: kde-style-oxygen-qt5,
+         kwin-decoration-oxygen,
+         oxygen-sounds,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Breaks: oxygen-look-and-feel
+Replaces: oxygen-look-and-feel
+Description: Look-and-feel for the Oxygen desktop theme
+ The Oxygen desktop theme is used by Plasma and other KDE Software.
+ .
+ This package contains the meta settings for the Oxygen theme.
+
 Package: oxygen-sounds
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -48,14 +62,6 @@ Description: KWin decoration for the Oxygen desktop theme
  .
  This package contains the KWin decoration and settings modules.
 
-Package: oxygen-look-and-feel
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Look-and-feel for the Oxygen desktop theme
- The Oxygen desktop theme is used by Plasma and other KDE Software.
- .
- This package contains the Oxygen Look-and-Feel and settings modules.
-
 Package: kde-style-oxygen-qt5
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/oxygen-look-and-feel.install b/debian/plasma-theme-oxygen.install
similarity index 100%
rename from debian/oxygen-look-and-feel.install
rename to debian/plasma-theme-oxygen.install
index 4b4c373..55d86ed 100644
--- a/debian/oxygen-look-and-feel.install
+++ b/debian/plasma-theme-oxygen.install
@@ -1,9 +1,9 @@
+
 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/contents/splash/Splash.qml
 usr/share/plasma/look-and-feel/org.kde.oxygen/metadata.desktop
-

-- 
oxygen packaging