[SCM] oxygen packaging branch, kubuntu_utopic_next, updated. 537886aa8ae14b3443043e259a97db7e6e603b95

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 537886aa8ae14b3443043e259a97db7e6e603b95
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Oct 9 16:17:24 2014 +0200

    remove patch
---
 debian/changelog                                   |  2 +-
 debian/patches/series                              |  1 -
 .../patches/upstream_dont-install-build-files.diff | 22 ----------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 774d114..a0bce24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 oxygen (4:5.1.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
-  * New upstream beta release
+  * New upstream release
   * Add upstream_dont-install-build-files.diff to not install unused files
 
   [ Scarlett Clark ]
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 44afa0a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index c67d617..0000000
--- a/debian/patches/upstream_dont-install-build-files.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-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