[SCM] plasma-desktop packaging branch, kubuntu_wily_archive, updated. f91d98bc1812280bfbc3d7a76453eda78e01a6fc

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit f91d98bc1812280bfbc3d7a76453eda78e01a6fc
Merge: 3b28102782665f4f037e34511c906269816f6f28 4e0e95e7ee54e2c753cdee55d5ca84b40b1327f9
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:42:30 2015 +0200

    merge master

 debian/.gitattributes              |    1 +
 debian/changelog                   |   25 +
 debian/control                     |   89 ++-
 debian/copyright                   | 1368 +++++++++++-------------------------
 debian/libkfontinst5.install       |    3 +-
 debian/libkfontinstui5.install     |    3 +-
 debian/plasma-desktop-data.install |    1 -
 debian/plasma-desktop-dev.install  |    2 +-
 debian/plasma-desktop.install      |   15 +-
 debian/rules                       |    5 +-
 debian/source/lintian-overrides    |    1 -
 11 files changed, 519 insertions(+), 994 deletions(-)

diff --cc debian/changelog
index 7d10290,8ce668c..272847d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,42 -1,17 +1,56 @@@
 +plasma-desktop (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:32:59 +0200
 +
 +plasma-desktop (4:5.3.1-0ubuntu3) wily; urgency=medium
 +
 +  * Remove dep on plasma-nm at upstream's request
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 25 Jun 2015 12:48:15 +0200
 +
 +plasma-desktop (4:5.3.1-0ubuntu2) wily; urgency=medium
 +
 +  * Recommend renamed oxygen fonts package fonts-oxygen
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 22 Jun 2015 14:59:23 +0200
 +
 +plasma-desktop (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 21:08:18 +0200
 +
 +plasma-desktop (4:5.2.2-0ubuntu3) vivid; urgency=medium
 +
 +  * Add upstream_kfontinst-header-alignment.diff from upstream to fix
 +    headers in kfontinst kcm
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Apr 2015 15:43:04 +0200
 +
 +plasma-desktop (4:5.2.2-0ubuntu2) vivid; urgency=medium
 +
 +  * Add upstream_Hide-pager-when-there-s-only-one-virtual-desktop.patch
 +    to hide the pager applet when there is only one virtual desktop.
 +    with only one desktop it is pretty useless.
 +
 + -- Harald Sitter <sitter at kde.org>  Thu, 26 Mar 2015 14:21:41 +0100
 +
+ plasma-desktop (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 11:54:10 +0200
+ 
+ plasma-desktop (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:17:22 +0100
+ 
  plasma-desktop (4:5.2.2-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 36a4e01,48eecc4..08d64f5
--- a/debian/control
+++ b/debian/control
@@@ -202,24 -211,9 +218,25 @@@ Description: Tools and widgets for the 
   .
   This package contains the data files
  
 +Package: kde-touchpad
 +Architecture: any
 +Depends: plasma-desktop, ${misc:Depends}
 +Section: oldlibs
 +Priority: extra
 +Description: transitional dummy package
 + This is a transitional dummy package. It can safely be removed.
 +
 +Package: kde-config-touchpad
 +Depends: plasma-desktop, ${misc:Depends}
 +Architecture: all
 +Priority: extra
 +Section: oldlibs
 +Description: transitional dummy package
 + This is a transitional dummy package. It can safely be removed.
 +
  Package: plasma-desktop-dbg
  Section: debug
+ Priority: extra
  Architecture: any
  Recommends: qtbase5-dbg
  Depends: plasma-desktop (= ${binary:Version}), ${misc:Depends}

-- 
plasma-desktop packaging