[SCM] plasma-workspace packaging branch, kubuntu_unstable, updated. 022cf37d5b2ebcc69ab74ba602c3719aa8dc4340

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 022cf37d5b2ebcc69ab74ba602c3719aa8dc4340
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Mon Dec 1 06:22:16 2014 -0800

    Remove kubuntu_temp_fix_games_path.diff per shadeslayer.
---
 debian/changelog                                |  6 ++++++
 debian/patches/kubuntu_temp_fix_games_path.diff | 18 ------------------
 debian/patches/series                           |  1 -
 3 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04199e0..26b0c2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+plasma-workspace (4:5.1.1-0ubuntu3) UNRELEASED; urgency=medium
+
+  * Remove kubuntu_temp_fix_games_path.diff per shadeslayer. 
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 01 Dec 2014 06:14:46 -0800
+
 plasma-workspace (4:5.1.1-0ubuntu2) vivid; urgency=medium
 
   * Add kubuntu_temp_fix_path.diff to add usr/games to PATH.
diff --git a/debian/patches/kubuntu_temp_fix_games_path.diff b/debian/patches/kubuntu_temp_fix_games_path.diff
deleted file mode 100644
index a8c0136..0000000
--- a/debian/patches/kubuntu_temp_fix_games_path.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: add /usr/games to path
- For unknown reasons the $PATH is not set right in Kubuntu.
- Until this bug is fixed properly add a workaround to just
- add /usr/games to startkde
-Author: Scarlett Clark <sgclark at kubuntu.org>
-Last-Update: 2014-11-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/startkde/startkde.cmake
-+++ b/startkde/startkde.cmake
-@@ -3,6 +3,7 @@
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
- 
-+export PATH=$PATH:usr/games
- export QML2_IMPORT_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/qml/
- QTPATHS=/usr/lib/@DEB_HOST_MULTIARCH@/qt5/bin/qtpaths
- 
diff --git a/debian/patches/series b/debian/patches/series
index 38fd245..1783faa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_add-qml2-path.diff
 kubuntu_startkde-qtpath.diff
 upstream_gdb-7.8-fix.diff
-kubuntu_temp_fix_games_path.diff

-- 
plasma-workspace packaging