[SCM] kwin packaging branch, kubuntu_wily_archive, updated. 9007ac7b3c5e97ce4c2c71b1256c6f0e9e2ac37e

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit 9007ac7b3c5e97ce4c2c71b1256c6f0e9e2ac37e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jun 10 19:44:37 2015 +0200

    this should have gone to unstable
---
 debian/changelog                       | 14 +-------------
 debian/control                         | 20 +-------------------
 debian/kwin-hwcomposer-backend.install |  1 -
 debian/kwin.install                    |  9 +--------
 4 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a75c4de..04900e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-kwin (4:5.3.1+git20150608.2024+15.04-0ubuntu1) wily; urgency=medium
-
-  * Upgrade to git snapshot for better wayland
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 10 Jun 2015 03:04:09 +0200
-
-kwin (4:5.3.1-0ubuntu2) wily; urgency=medium
-
-  * build-dep on libhybris and add kwin-hwcompositor-backend package
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Sat, 06 Jun 2015 02:44:00 +0200
-
 kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
 
   [ Scarlett Clark ]
@@ -25,7 +13,7 @@ kwin (4:5.3.1-0ubuntu1) wily; urgency=medium
   [ Jonathan Riddell ]
   * New upstream release
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 04 Jun 2015 20:27:57 +0200
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 02:34:16 +0200
 
 kwin (4:5.2.2a-0ubuntu1) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 6e8fa62..28155b8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,6 @@
 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>
+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~),
@@ -11,8 +10,6 @@ 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,
@@ -187,21 +184,6 @@ Description: KDE window manager render utils library
  .
  This package is part of the KDE base workspace module.
 
-Package: kwin-hwcomposer-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-hwcomposer-backend.install b/debian/kwin-hwcomposer-backend.install
deleted file mode 100644
index 7ae584b..0000000
--- a/debian/kwin-hwcomposer-backend.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/qt5/plugins/org.kde.kwin.waylandbackends/KWinWaylandHwcomposerBackend.so
diff --git a/debian/kwin.install b/debian/kwin.install
index ef9a539..12ec54b 100644
--- a/debian/kwin.install
+++ b/debian/kwin.install
@@ -4,11 +4,4 @@ usr/lib/*/kconf_update_bin
 usr/lib/*/libexec
 usr/lib/*/libkdeinit5_kwin_*.so
 usr/lib/*/libkwin.so.5*
-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
+usr/lib/*/qt5

-- 
kwin packaging