[SCM] powerdevil packaging branch, kubuntu_wily_archive, updated. 1c4f8dff02f1f6392d9abed356324f4ba1d70456

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 1c4f8dff02f1f6392d9abed356324f4ba1d70456
Merge: 73c4eb4b5383a94d86a8667674e56bbffc1fcb25 e33a7a85decd6c8f2be61d34c44375518c3a733c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:53:25 2015 +0200

    merge master

 debian/.gitattributes             |   1 +
 debian/changelog                  |  27 ++++-
 debian/control                    |  40 ++++---
 debian/copyright                  | 229 ++++++++++++++++++++------------------
 debian/libpowerdevilcore2.install |   3 +-
 debian/libpowerdevilui5.install   |   3 +-
 debian/powerdevil-data.install    |   6 +-
 debian/powerdevil.install         |   2 +-
 debian/source/lintian-overrides   |   1 -
 debian/watch                      |   5 +-
 10 files changed, 184 insertions(+), 133 deletions(-)

diff --cc debian/changelog
index 93a849f,1592b41..9e8e9aa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,29 -1,16 +1,42 @@@
 +powerdevil (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 17:41:52 +0200
 +
 +powerdevil (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:53:43 +0200
 +
 +powerdevil (4:5.2.2-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:45:23 -0700
 +
+ powerdevil (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:59:37 +0200
+ 
+ powerdevil (4:5.2.1-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:59 +0100
+ 
  powerdevil (4:5.2.1-0ubuntu1) vivid; urgency=medium
  
    * New upstream release
diff --cc debian/control
index 44684ca,47f024d..841830b
--- a/debian/control
+++ b/debian/control
@@@ -9,20 -17,15 +17,20 @@@ Build-Depends: cmake (>= 2.8.12)
                 libkf5idletime-dev (>= 5.2.0),
                 libkf5kdelibs4support-dev (>= 5.2.0),
                 libkf5notifyconfig-dev (>= 5.2.0),
-                libkf5screen-dev (>= 5.2.0),
-                libqt5x11extras5-dev,
+                libkf5screen-dev,
+                libkf5solid-dev,
+                libqt5x11extras5-dev (>= 5.4.0~),
                 libudev-dev,
+                libx11-dev,
                 libx11-xcb-dev,
 +               libxcb-composite0-dev,
 +               libxcb-damage0-dev,
                 libxcb-dpms0-dev,
 +               libxcb-icccm4-dev,
 +               libxcb-image0-dev,
 +               libxcb-keysyms1-dev,
                 libxcb-randr0-dev,
-                libxcb-shm0-dev,
-                libxcb-sync-dev,
-                libxcb-xtest0-dev,
+                libxcb1-dev,
                 libxrandr-dev,
                 pkg-config,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),

-- 
powerdevil packaging