[SCM] oxygen packaging branch, kubuntu_utopic_next, updated. 528e131158e1a9dc5eaade9da5c67723196129b2

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 528e131158e1a9dc5eaade9da5c67723196129b2
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Thu Oct 2 22:21:57 2014 +0000

    Correct the filename for the lintian override.
    * 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.
---
 debian/changelog                                                      | 3 +++
 ...gen.lintian-overrides => kwin-decoration-oxygen.lintian-overrides} | 0
 debian/not-installed                                                  | 3 +++
 debian/rules                                                          | 4 ----
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13adc5c..dbcd158 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ oxygen (4:5.0.95-0ubuntu1) UNRELEASED; urgency=medium
   * wrap-and sort 
   * Fix script-not-executable usr/share/plasma/look-and-feel/org.kde.oxygen/Messages.sh
   * Override missing manpage lintian error. 
+  * 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.
 
  -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 01 Oct 2014 15:28:27 +0200
 
diff --git a/debian/oxygen.lintian-overrides b/debian/kwin-decoration-oxygen.lintian-overrides
similarity index 100%
rename from debian/oxygen.lintian-overrides
rename to debian/kwin-decoration-oxygen.lintian-overrides
diff --git a/debian/not-installed b/debian/not-installed
index bc4194b..b34558c 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -451,3 +451,6 @@
 ./usr/share/icons/Oxygen_Zion/cursors/whats_this
 ./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
diff --git a/debian/rules b/debian/rules
index d69eb2d..da23512 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,3 @@ include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=oxygen-dbg
-
-override_dh_fixperms:
-	chmod +x debian/oxygen-look-and-feel/usr/share/plasma/look-and-feel/org.kde.oxygen/Messages.sh
-	$(overridden_command)
\ No newline at end of file

-- 
oxygen packaging