[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=d957ca4

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d957ca455dd77d155d172335a89980873d65ba70
Merge: 8114342c55250647daac0188e5fc47596409c45c 68d97c4e2e4f2ad6fe744a2665d51992d390b8b2
Author: Kubuntu CI <kubuntu-ci at lists.launchpad.net>
Date:   Mon Dec 15 12:30:02 2014 +0000

    Merge remote-tracking branch 'origin/kubuntu_vivid_archive' into HEAD

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8914e10,4786a51..c7441db
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,21 -2,8 +2,21 @@@ plasma-workspace (4:5.1.2-0ubuntu1) viv
  
    * New upstream release
  
-  -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 12 Dec 2014 14:40:41 +0100
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 15 Dec 2014 13:27:55 +0100
  
 +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.
 +    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

-- 
plasma-workspace packaging