[SCM] kwin packaging branch, kubuntu_xenial_archive, updated. debian/5.4.3-1-141-g3fcbfe9

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 3fcbfe9b09a2efbd58aad38b9a2a2e86a68140ee
Author: Philip Muškovac <pmuskovac at proqrent.de>
Date:   Thu Jan 28 16:06:50 2016 +0100

    Disable libhybris
---
 debian/changelog |  2 ++
 debian/control   | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3eb3d91..0eda356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,8 @@ kwin (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Philip Muškovac ]
   * kwin-common breaks/replaces kwin-data << 4:5.5.3~
+  * Disable libhybris entirely on upstream recommendation, as it requires
+    libhybris upstream git, not the ubuntu fork
 
   [ Clive Johnston ]
   * New upstream release
diff --git a/debian/control b/debian/control
index acb980a..04b5f2f 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends: cmake (>= 2.8.12),
                libfontconfig1-dev,
                libfreetype6-dev,
                libgbm-dev,
-               libhybris-dev [armhf],
                libice-dev,
                libinput-dev (>= 0.10~),
                libkdecorations2-dev (>= 4:5.5.1~),
@@ -248,23 +247,24 @@ Section: oldlibs
 Description: transitional dummy package
  This is a transitional dummy package. It can safely be removed.
 
-Package: kwin-wayland-backend-hwcomposer
-Section: libs
-Architecture: armel armhf
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
-Replaces: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
-Provides: kwin-wayland-backend
-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.
+# requires libhybris but the not the ubuntu version of it
+#Package: kwin-wayland-backend-hwcomposer
+#Section: libs
+#Architecture: armel armhf
+#Depends: ${misc:Depends}, ${shlibs:Depends}
+#Breaks: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
+#Replaces: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)
+#Provides: kwin-wayland-backend
+#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-wayland-backend-drm
 Section: libs

-- 
kwin packaging