[SCM] plasma-workspace packaging branch, kubuntu_unstable, updated. debian/5.4.3-1-105-gea42829

[Clive Johnston]

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

The following commit has been merged in the kubuntu_unstable branch:
commit ea42829750c0ddc49aacc5a886d40edc03256183
Merge: f52ee6d84cdbc2c58e614cb515d2c53446ae5eee 1e3b84eec7a92ea24e48ecd199a6496583fa3d35
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 4 00:14:58 2016 +0000

    Fixing merge conflict

 debian/changelog                            |  131 ++-
 debian/control                              |   37 +-
 debian/copyright                            | 1166 ++++++++++++++++-----------
 debian/patches/disable_incompatible_tests   |   13 +
 debian/patches/kubuntu_startkde-qtpath.diff |    6 +-
 debian/patches/series                       |    1 +
 debian/plasma-workspace.install             |    1 +
 debian/rules                                |    7 +-
 debian/tests/control                        |    6 +-
 debian/tests/testsuite                      |    3 +-
 10 files changed, 869 insertions(+), 502 deletions(-)

diff --cc debian/changelog
index 0a7715f,d41b7fa..440a3e1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -14,31 -15,25 +15,45 @@@ plasma-workspace (4:5.5.4-0ubuntu1) UNR
      into plasma-workspace-wayland.install
    * New upstream release
  
-   [ Scarlett Clark ]
-   * Merge xenial_archive manual. 
+   [ Philip Muškovac ]
+   * Merge with debian git master 
  
-  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:02:18 +0000
+  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:19:19 +0000
  
 +plasma-workspace (4:5.5.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial. 
 +  * Upstream version bumped by 1. 
 +  * Version number is coming up None. Trying a different approach 
 +    with appending a. 
 +  * Silly me, lost the ubuntu in the version. Final fix I hope.
 +
 +  [ Clive Johnston ]
 +  * new upstream release
 +  * Removing a file from plasma-workspace.install which is no longer built
 +  * Adding missing file usr/share/wayland-sessions/plasmawayland.desktop
 +    into plasma-workspace-wayland.install
 +
 +  [ Bhushan Shah ]
 +  * Add depend to libkf5sysguard-dev in plasma-workspace-dev
 +
 + -- Clive Johnston <clivejo at aol.com>  Tue, 29 Dec 2015 17:54:26 +0000
 +
+ plasma-workspace (4:5.4.3-2) UNRELEASED; urgency=medium
+ 
+   [ Dmitry Shachnev ]
+   * Stop depending on qtdeclarative5-* transitional packages.
+ 
+  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 12 Jan 2016 16:57:56 +0300
+ 
+ plasma-workspace (4:5.4.3-1) unstable; urgency=medium
+ 
+   * Really add the Provides: notification-daemon. (Closes: #798377)
+   * New upstream release (5.4.3).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:46:11 +0100
+ 
  plasma-workspace (4:5.4.3-0ubuntu1) xenial; urgency=medium
  
    [ Scarlett Clark ]
diff --cc debian/control
index 838a6a1,9a333b9..447a88a
--- a/debian/control
+++ b/debian/control
@@@ -91,9 -88,9 +88,10 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  
  Package: plasma-workspace-dev
  Architecture: any
 -Depends: libkf5windowsystem-dev (>= 5.4.0),
 +Depends: libkf5sysguard-dev,
 +         libkf5windowsystem-dev (>= 5.4.0),
-          plasma-framework-dev (>= 5.8.0~),
+          plasma-framework-dev (>= 5.13.0~),
+          plasma-workspace (= ${binary:Version}),
           qtbase5-dev (>= 5.4.0~),
           ${allLibraries},
           ${misc:Depends}

-- 
plasma-workspace packaging