[SCM] kwin packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.2-0ubuntu1-20-gbb2e22c

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_unstable branch:
commit bb2e22cec5d16cfbc199325fedd760f89e09d0aa
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Oct 14 12:16:54 2015 +0100

    Only build kwin-wayland-backend-hwcomposer on armhf now that libhybris is arm only
---
 debian/changelog | 4 ++++
 debian/control   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b8509c..69c006e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ kwin (4:5.4.80-0ubuntu1) UNRELEASED; urgency=medium
   [ Harald Sitter ]
   * Multi-archify the package
 
+  [ Jonathan Riddell ]
+  * Only build kwin-wayland-backend-hwcomposer on armhf now that libhybris
+    is arm only
+
  -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 15 Sep 2015 10:52:54 +0100
 
 kwin (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
diff --git a/debian/control b/debian/control
index 20c80b0..62870ec 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends: cmake (>= 2.8.12),
                libfontconfig1-dev,
                libfreetype6-dev,
                libgbm-dev,
-               libhybris-dev [amd64 armhf i386],
+               libhybris-dev [armhf],
                libice-dev,
                libinput-dev (>= 0.10~),
                libkdecorations2-dev,
@@ -264,7 +264,7 @@ Description: transitional dummy package
 
 Package: kwin-wayland-backend-hwcomposer
 Section: libs
-Architecture: amd64 armhf i386
+Architecture: armhf
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Breaks: kwin-hwcomposer-backend (<< 4:5.3.90+git20150807)

-- 
kwin packaging