[SCM] oxygen packaging branch, kubuntu_utopic_next, updated. 6d94e8560e23e2044cd49443491dba3f7983de9f

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 6d94e8560e23e2044cd49443491dba3f7983de9f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 3 11:57:05 2014 +0200

    add patch
---
 .../{liboxygenstyle5-5.install => patches/series}  |  2 +-
 .../patches/upstream_dont-install-build-files.diff | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/debian/liboxygenstyle5-5.install b/debian/patches/series
similarity index 82%
copy from debian/liboxygenstyle5-5.install
copy to debian/patches/series
index dc60e33..44afa0a 100644
--- a/debian/liboxygenstyle5-5.install
+++ b/debian/patches/series
@@ -1 +1 @@
-usr/lib/*/liboxygenstyle5.so.5*
+upstream_dont-install-build-files.diff
diff --git a/debian/patches/upstream_dont-install-build-files.diff b/debian/patches/upstream_dont-install-build-files.diff
new file mode 100644
index 0000000..c67d617
--- /dev/null
+++ b/debian/patches/upstream_dont-install-build-files.diff
@@ -0,0 +1,22 @@
+Description: don't install build files
+Author: Jonathan Riddell <jriddell at ubuntu.com>
+Origin: upstream
+Bug: https://bugs.kde.org/339620
+Applied-Upstream: http://commits.kde.org/oxygen/744ec0238716a47b2837157bb8d5ebd72a696d46
+Last-Update: 2014-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: oxygen-5.0.95/CMakeLists.txt
+===================================================================
+--- oxygen-5.0.95.orig/CMakeLists.txt
++++ oxygen-5.0.95/CMakeLists.txt
+@@ -101,7 +101,8 @@ else()
+ 
+   add_subdirectory(sounds)
+ 
+-  install(DIRECTORY lookandfeel/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/plasma/look-and-feel/org.kde.oxygen)
++  install(DIRECTORY lookandfeel/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/plasma/look-and-feel/org.kde.oxygen
++          PATTERN "Messages.sh" EXCLUDE PATTERN "CMakeLists.txt" EXCLUDE)
+ 
+ endif()
+ 

-- 
oxygen packaging