[SCM] kwin packaging branch, kubuntu_wily_archive, updated. 84bbdbcb12b67d1de8f8352055284be3a78dfe7c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 84bbdbcb12b67d1de8f8352055284be3a78dfe7c
Merge: 9007ac7b3c5e97ce4c2c71b1256c6f0e9e2ac37e 8137c1928d0d3e2b7dd48b784ff98f886250e390
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 18:24:53 2015 +0200

    merge master

 debian/.gitattributes                 |   1 +
 debian/changelog                      |  31 ++
 debian/control                        | 131 +++++---
 debian/copyright                      | 604 ++++++++++++----------------------
 debian/kwin-common.install            |  12 +
 debian/kwin-common.lintian-overrides  |   4 +
 debian/kwin-data.install              |  28 +-
 debian/kwin-dev.acc.in                |  36 ++
 debian/kwin-dev.install               |   9 +-
 debian/kwin-dev.install.armhf         |   7 -
 debian/kwin-wayland.install           |   2 +
 debian/kwin-wayland.lintian-overrides |   5 +
 debian/kwin-x11.install               |   2 +
 debian/kwin-x11.lintian-overrides     |   5 +
 debian/kwin.install                   |   7 -
 debian/kwin.lintian-overrides         |  10 -
 debian/libkwineffects6.symbols        |   8 +-
 debian/libkwinglutils6.install        |   4 +-
 debian/libkwinglutils6.install.armhf  |   0
 debian/libkwinglutils6.symbols        |   4 +-
 debian/rules                          |   4 +-
 debian/source/lintian-overrides       |   1 -
 debian/tests/acc                      |  11 +
 debian/tests/control                  |   6 +
 debian/tests/testsuite                |   3 +
 debian/watch                          |   5 +-
 26 files changed, 463 insertions(+), 477 deletions(-)

diff --cc debian/changelog
index 04900e2,644fb48..2309421
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,20 +1,45 @@@
 +kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Manual merge kubuntu_stable.
 +
 +  [ 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:34:16 +0200
 +
 +kwin (4:5.2.2a-0ubuntu1) vivid; urgency=medium
 +
 +  * New upstream release 
 +  * New upstream tar. 
 +  * Append a to version so launchpad accepts new tar.
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Tue, 24 Mar 2015 07:33:08 -0700
 +
+ kwin (4:5.3.1-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release (5.3.0).
+   * Update symbols files.
+   * New upstream release (5.3.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:52:39 +0200
+ 
+ kwin (4:5.2.2-1) experimental; urgency=medium
+ 
+   * New upstream release (5.2.1).
+   * Split kwin package in common, x11 and wayland.
+   * Update symbols files.
+   * New upstream release (5.2.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 25 Mar 2015 23:17:20 +0100
+ 
  kwin (4:5.2.1-0ubuntu1) vivid; urgency=medium
  
    * New upstream release 
diff --cc debian/control
index 28155b8,76e543e..6bf797c
--- a/debian/control
+++ b/debian/control
@@@ -1,42 -1,45 +1,46 @@@
  Source: kwin
- Priority: extra
+ Section: kde
+ Priority: optional
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Build-Depends: cmake,
-                debhelper (>= 9.0.0),
+ Uploaders: Maximiliano Curia <maxy at debian.org>
+ Build-Depends: cmake (>= 2.8.12),
+                debhelper (>= 9),
                 extra-cmake-modules (>= 1.3.0~),
-                kdoctools-dev (>= 5.2.0),
-                kinit-dev (>= 5.2.0),
-                kio-dev (>= 5.2.0),
+                kdoctools-dev (>= 5.8.0~),
+                kinit-dev (>= 5.8.0~),
+                kio-dev (>= 5.8.0~),
                 kwayland-dev (>= 5.1.95),
-                libegl1-mesa-dev,
+                libegl1-mesa-dev (>= 1.2~),
                 libepoxy-dev (>= 1.2),
                 libice-dev,
-                libinput-dev,
+                libinput-dev (>= 0.10~),
                 libkdecorations2-dev,
-                libkf5activities-dev (>= 5.2.0),
-                libkf5completion-dev (>= 5.2.0),
-                libkf5config-dev (>= 5.2.0),
-                libkf5configwidgets-dev (>= 5.2.0),
-                libkf5coreaddons-dev (>= 5.2.0),
-                libkf5crash-dev (>= 5.2.0),
-                libkf5declarative-dev (>= 5.2.0),
-                libkf5globalaccel-dev (>= 5.2.0),
-                libkf5i18n-dev (>= 5.2.0),
-                libkf5kcmutils-dev (>= 5.2.0),
-                libkf5newstuff-dev (>= 5.2.0),
-                libkf5notifications-dev (>= 5.2.0),
-                libkf5service-dev (>= 5.2.0),
-                libkf5widgetsaddons-dev (>= 5.2.0),
-                libkf5windowsystem-dev (>= 5.3.0~),
-                libkf5xmlgui-dev (>= 5.2.0),
-                libqt5x11extras5-dev,
+                libkf5activities-dev (>= 5.8.0~),
+                libkf5completion-dev (>= 5.8.0~),
+                libkf5config-dev (>= 5.8.0~),
+                libkf5configwidgets-dev (>= 5.8.0~),
+                libkf5coreaddons-dev (>= 5.8.0~),
+                libkf5crash-dev (>= 5.8.0~),
+                libkf5declarative-dev (>= 5.8.0~),
+                libkf5globalaccel-dev (>= 5.8.0~),
+                libkf5i18n-dev (>= 5.8.0~),
+                libkf5iconthemes-dev (>= 5.8.0~),
+                libkf5kcmutils-dev (>= 5.8.0~),
+                libkf5newstuff-dev (>= 5.8.0~),
+                libkf5notifications-dev (>= 5.8.0~),
+                libkf5service-dev (>= 5.8.0~),
+                libkf5widgetsaddons-dev (>= 5.8.0~),
+                libkf5windowsystem-dev (>= 5.8.0~),
+                libkf5xmlgui-dev (>= 5.8.0~),
+                libqt5x11extras5-dev (>= 5.4.0~),
                 libsm-dev,
-                libudev-dev,
-                libwayland-dev,
+                libudev-dev [linux-any],
+                libwayland-dev (>= 1.2),
                 libx11-xcb-dev,
                 libxcb-composite0-dev,
 +               libxcb-cursor-dev,
                 libxcb-damage0-dev,
+                libxcb-glx0-dev,
                 libxcb-icccm4-dev,
                 libxcb-image0-dev,
                 libxcb-keysyms1-dev,

-- 
kwin packaging