[SCM] plasma-workspace packaging branch, kubuntu_wily_archive, updated. 3eca90c4795668b70de1efb881dd67b94a38e646

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 3eca90c4795668b70de1efb881dd67b94a38e646
Merge: cbb50ee34476b114d54fab9085ab7a5a0c45df20 46d616f9b89c5aeaedf0bf2c3eaab8e97672a6ae
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:50:16 2015 +0200

    merge master

 debian/.gitattributes                       |    1 +
 debian/changelog                            |   35 +
 debian/control                              |  148 +--
 debian/copyright                            | 1533 +++++++++++++++++----------
 debian/libkworkspace5-5.install             |    3 +-
 debian/libtaskmanager5.install              |    3 +-
 debian/libweather-ion7.install              |    2 +-
 debian/patches/install_missing_header       |   16 +
 debian/patches/kubuntu_startkde-qtpath.diff |   20 +-
 debian/patches/series                       |    1 +
 debian/plasma-workspace-dev.acc.in          |   28 +
 debian/plasma-workspace-dev.install         |   20 +-
 debian/plasma-workspace.install             |  276 ++++-
 debian/plasma-workspace.prerm               |   44 +
 debian/tests/acc                            |   11 +
 debian/tests/control                        |    6 +
 debian/tests/testsuite                      |    3 +
 debian/watch                                |    5 +-
 18 files changed, 1471 insertions(+), 684 deletions(-)

diff --cc debian/changelog
index 36a1034,3fb1db0..8c91497
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,23 +1,43 @@@
 +plasma-workspace (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:37:47 +0200
 +
 +plasma-workspace (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * Plasma 5.3 beta
 +  * new upstream release
 +
 +  [ Scarlett Clark ]
 +  * Vivid backport
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:51:14 +0200
 +
+ plasma-workspace (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 12:01:18 +0200
+ 
+ plasma-workspace (4:5.2.2-2) experimental; urgency=medium
+ 
+   * Merge with kubuntu changes.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 23 Apr 2015 14:54:20 +0200
+ 
+ plasma-workspace (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:18:03 +0100
+ 
  plasma-workspace (4:5.2.2-0ubuntu3) vivid; urgency=medium
  
    * Add kubuntu_no-install-libkxmlrpcclient5.po.diff to remove

-- 
plasma-workspace packaging