[SCM] plasma-workspace packaging branch, kubuntu_vivid_archive, updated. d28a429170cac50ee2e637cce359ccadb9ca76dd

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit f0225d20c9fa57d9732247de050f436bb422e64d
Author: Scarlett Clark <sgclark at kubuntu.org>
Date:   Wed Nov 19 16:11:18 2014 -0800

    Add kubuntu_temp_fix_path.diff to add usr/games to PATH. This is a temp fix that really needs to be fixed.
---
 debian/changelog                                |  7 +++++++
 debian/patches/kubuntu_temp_fix_games_path.diff | 10 ++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 18 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b00df33..04199e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+plasma-workspace (4:5.1.1-0ubuntu2) vivid; urgency=medium
+
+  * Add kubuntu_temp_fix_path.diff to add usr/games to PATH.
+    This is a temp fix that really needs to be fixed.  
+
+ -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 19 Nov 2014 16:09:22 -0800
+
 plasma-workspace (4:5.1.1-0ubuntu1) vivid; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/kubuntu_temp_fix_games_path.diff b/debian/patches/kubuntu_temp_fix_games_path.diff
new file mode 100644
index 0000000..b731fa1
--- /dev/null
+++ b/debian/patches/kubuntu_temp_fix_games_path.diff
@@ -0,0 +1,10 @@
+--- 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 1783faa..38fd245 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_add-qml2-path.diff
 kubuntu_startkde-qtpath.diff
 upstream_gdb-7.8-fix.diff
+kubuntu_temp_fix_games_path.diff

-- 
plasma-workspace packaging