[SCM] plasma-desktop packaging branch, master, updated. 177b98b29fbfbd8312edc57c06ba7f9254196299

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit a5d8e9f0f6c6affb7ab861871605ce77c625acc4
Merge: e1a1482fcf5b38d9e9de7eca6926d651eddd1d58 f91d98bc1812280bfbc3d7a76453eda78e01a6fc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 2 08:31:15 2015 +0200

    Merge remote-tracking branch 'origin/kubuntu_stable'

 debian/changelog                        | 39 +++++++++++++++++++++++++++++++++
 debian/control                          | 25 ++++++++++++++++++++-
 debian/meta/upstream_scm.json           |  1 -
 debian/plasma-desktop-data.qml-ignore   |  8 +++++++
 debian/plasma-desktop.lintian-overrides |  1 +
 5 files changed, 72 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8b9e900,272847d..e2240e3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,49 +1,50 @@@
 +plasma-desktop (4:5.3.2-1~) UNRELEASED; urgency=medium
 +
 +  * New upstream release (5.3.0).
 +  * New upstream release (5.3.1).
 +  * New upstream release (5.3.2).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 30 Jun 2015 12:22:09 +0200
 +
+ 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).

-- 
plasma-desktop packaging