[SCM] kwin packaging branch, kubuntu_wily_archive, updated. fc6a27af8bad842e38b439da509b9c0ea37858b2

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit fc6a27af8bad842e38b439da509b9c0ea37858b2
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sat Jun 6 08:35:46 2015 +0200

     build-dep on libhybris
    
    * build-dep on libhybris
    * "Automatic Kubuntu Build"
---
 debian/changelog    | 16 ++++++++++++++--
 debian/control      | 20 +++++++++++++++++++-
 debian/kwin.install |  9 ++++++++-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 04900e2..1a0fa6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
+kwin (4:5.3.1+git20150605.0450+15.04-0ubuntu1) vivid; urgency=medium
+
+  * build-dep on libhybris
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 02:44:00 +0200
+
+kwin (4:5.3.1+git20150605.0450+15.04-0) vivid; urgency=medium
+
+  * "Automatic Kubuntu Build"
+
+ -- Kubuntu CI <kubuntu-ci at lists.launchpad.net>  Fri, 05 Jun 2015 04:50:57 +0000
+
+kwin (4:5.3.1-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Scarlett Clark ]
   * Manual merge kubuntu_stable.
@@ -13,7 +25,7 @@ kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
   [ Jonathan Riddell ]
   * New upstream release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:34:16 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:27:57 +0200
 
 kwin (4:5.2.2a-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 28155b8..ed6d3c2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: kwin
 Priority: extra
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+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),
                extra-cmake-modules (>= 1.3.0~),
@@ -10,6 +11,8 @@ Build-Depends: cmake,
                kwayland-dev (>= 5.1.95),
                libegl1-mesa-dev,
                libepoxy-dev (>= 1.2),
+               libgbm-dev,
+               libhybris-dev,
                libice-dev,
                libinput-dev,
                libkdecorations2-dev,
@@ -184,6 +187,21 @@ Description: KDE window manager render utils library
  .
  This package is part of the KDE base workspace module.
 
+Package: kwin-hwcompositor-backend
+Section: libs
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: KDE window manager hwcompositor plugin
+ KWin (pronounced as one syllable "kwin") is the window
+ manager for the KDE Plasma Desktop. It gives you complete
+ control over your windows, making sure they're not in the way
+ but aid you in your task. It paints the window decoration,
+ the bar on top of every window with (configurable) buttons
+ like close, maximize and minimize. It also handles placing
+ of windows and switching between them.
+ .
+ This package is part of the KDE base workspace module.
+
 Package: kwin-data
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
diff --git a/debian/kwin.install b/debian/kwin.install
index 12ec54b..ef9a539 100644
--- a/debian/kwin.install
+++ b/debian/kwin.install
@@ -4,4 +4,11 @@ usr/lib/*/kconf_update_bin
 usr/lib/*/libexec
 usr/lib/*/libkdeinit5_kwin_*.so
 usr/lib/*/libkwin.so.5*
-usr/lib/*/qt5
+usr/lib/*/qt5/plugins/kcm*
+usr/lib/*/qt5/plugins/kwin*
+usr/lib/*/qt5/plugins/org.kde.kdecoration2
+usr/lib/*/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandDrmBackend.so
+usr/lib/*/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandFbdevBackend.so
+usr/lib/*/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandWaylandBackend.so
+usr/lib/*/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandX11Backend.so
+usr/lib/*/qt5/qml

-- 
kwin packaging