[SCM] oxygen packaging branch, kubuntu_utopic_next, updated. 353b04d33a35d0f7239c624f9c3c0ab3d0e4a3b7

Scarlett Clark sgclark-guest at moszumanska.debian.org
Thu Oct 2 23:25:09 UTC 2014


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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 353b04d33a35d0f7239c624f9c3c0ab3d0e4a3b7
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Thu Oct 2 23:24:53 2014 +0000

    Actually remove the problem files from the install file..
---
 debian/changelog                    |  1 +
 debian/not-installed                |  5 +++--
 debian/oxygen-look-and-feel.install | 10 +++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbcd158..c223032 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ oxygen (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
   * Correct the filename for the lintian override.
   * Add usr/share/plasma/look-and-feel/org.kde.oxygen/Messages.sh
     - per HS this file is never to be installed. #339620 filed upstream.
+  * Actually remove the problem files from the install file.. 
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:28:27 +0200
 
diff --git a/debian/not-installed b/debian/not-installed
index b34558c..565434d 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -452,5 +452,6 @@
 ./usr/share/icons/Oxygen_Zion/cursors/xterm
 ./usr/share/icons/Oxygen_Zion/index.theme
 
-#I am told nver to be installed, bug filed upstream 339620.
-./usr/share/plasma/look-and-feel/org.kde.oxygen/Messages.sh
\ No newline at end of file
+#I am told never to be installed, bug filed upstream 339620.
+./usr/share/plasma/look-and-feel/org.kde.oxygen/Messages.sh
+./usr/share/plasma/look-and-feel/org.kde.oxygen/contents/splash/CMakeLists.txt
\ No newline at end of file
diff --git a/debian/oxygen-look-and-feel.install b/debian/oxygen-look-and-feel.install
index 4cd94f8..4b4c373 100644
--- a/debian/oxygen-look-and-feel.install
+++ b/debian/oxygen-look-and-feel.install
@@ -1 +1,9 @@
-usr/share/plasma/look-and-feel/org.kde.oxygen
+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/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



More information about the pkg-kde-commits mailing list