[SCM] plasma-workspace packaging branch, kubuntu_utopic_next, updated. 5c4aa24c4552683ed811161884aee0024819aaae

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_utopic_next branch:
commit 5c4aa24c4552683ed811161884aee0024819aaae
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Oct 3 12:03:20 2014 +0200

    fix license field
---
 debian/copyright | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 3ec5994..e5b89a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -530,7 +530,7 @@ License: BSD-BY-LC-NE
 
 Files: shell/scripting/backportglobal.h
 Copyright: 1992-2007 Trolltech ASA. All rights reserved.
-License: GPL-2 + Trolltech GPL Exception version 1.0
+License: GPL-2
  This file is part of the plugins of the Qt Toolkit.
  .
  This file may be used under the terms of the GNU General Public

-- 
plasma-workspace packaging