[SCM] kwin packaging branch, kubuntu_unstable, updated. a51fa60af995077a9311e58df930f40432622357

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit a51fa60af995077a9311e58df930f40432622357
Merge: f04e39c63eb08f5f655cd18d5542d0f938b4300f 648ab3f29a196870edb0aee17a366563260aa656
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Jun 29 19:40:33 2015 +0200

    merge master

 debian/.gitattributes                 |   1 +
 debian/changelog                      |  43 +++
 debian/control                        | 134 +++++---
 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.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 +-
 25 files changed, 476 insertions(+), 472 deletions(-)

diff --cc debian/changelog
index 9be5db4,acd317f..244ec02
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,15 +1,21 @@@
 +kwin (4:5.3.90-0ubuntu1) wily; urgency=medium
 +
 +  * Build-dep on libhybris and add kwin-hwcomposer-backend package
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 02:44:00 +0200
 +
+ kwin (4:5.3.2-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release
+ 
+  -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 29 Jun 2015 19:34:37 +0200
+ 
+ kwin (4:5.3.1-0ubuntu3) wily; urgency=medium
+ 
+   * No-change rebuild against Qt 5.4.2.
+ 
+  -- Adam Conrad <adconrad at ubuntu.com>  Tue, 16 Jun 2015 00:27:17 -0600
+ 
  kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
  
    [ Scarlett Clark ]
diff --cc debian/control
index 6e8fa62,6bf797c..c5df5b5
--- a/debian/control
+++ b/debian/control
@@@ -1,41 -1,41 +1,43 @@@
  Source: kwin
- Priority: extra
- Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
- XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
- Build-Depends: cmake,
-                debhelper (>= 9.0.0),
+ Section: kde
+ Priority: optional
+ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ 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),
 +               libgbm-dev,
 +               libhybris-dev,
                 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,

-- 
kwin packaging