[SCM] kwin packaging branch, kubuntu_xenial_mobile, updated. ubuntu/4%5.5.4-0ubuntu1-21-g930da12

[Bhushan Shah]

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

The following commit has been merged in the kubuntu_xenial_mobile branch:
commit 930da12f49b86c1459f05e691bafa9a3f26b7130
Merge: d56ffffabaa75ae629035bdcbcbeffa98685ce7e 73fff4b53164c9b0b6603026721af4f615466a13
Author: Bhushan Shah <bshah at kde.org>
Date:   Wed Mar 9 16:24:00 2016 +0530

    Merge branch 'kubuntu_unstable' into kubuntu_xenial_mobile

 debian/changelog | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 debian/control   | 12 +++++++-----
 2 files changed, 59 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index ea87935,9dc15b7..149423b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,38 -1,54 +1,88 @@@
- kwin (4:5.5.4-0ubuntu1) UNRELEASED; urgency=medium
+ kwin (4:5.5.4-0ubuntu1) xenial; urgency=medium
  
++<<<<<<<
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial.
 +  * Batchpatch symbols amd64,i386.
 +  * Debian Merge: Remaining changes:
 +    Changes for new release.
 +    Build libkwinglutils7 on any architecture, unbreaks build on armhf
 +  * Fix several merge markers, another batch patch symbols.
 +
 +  [ Clive Johnston ]
 +  * new upstream release
 +  * Removed Add_workaround_for_broken_no-XRandr_in_screen_edge_test.patch
 +  * Added missing kwin_scripts.mo files to kwin-data.install
 +
 +  [ Bhushan Shah ]
 +  * Build libkwinglutils7 on any architecture, unbreaks build on armhf
 +
 +  [ Scarlett Clark ]
 +  * Merging unstable in a desperate attempt to fix merger. 
 +  * Fix merge. 
 +  * Merge unstable to get debian merge in archive. 
 +  * Bump version. 
 +
 +  [ Philip Muškovac ]
 +  * kwin-common breaks/replaces kwin-data << 4:5.5.3~
 +
 +  [ Clive Johnston ]
 +  * New upstream release
 +
 +  [ Bhushan Shah ]
 +  * Bump versions for libkwinglutils, libkwinxenderutils and
 +    libkwineffects
++=======
+   [ Scarlett Clark ]
+   * New upstream release Xenial.
+   * Batchpatch symbols amd64,i386.
+   * Debian Merge: Remaining changes:
+     Changes for new release.
+     Build libkwinglutils7 on any architecture, unbreaks build on armhf
+   * Fix several merge markers, another batch patch symbols.
+ 
+   [ Clive Johnston ]
+   * new upstream release
+   * Removed Add_workaround_for_broken_no-XRandr_in_screen_edge_test.patch
+   * Added missing kwin_scripts.mo files to kwin-data.install
+ 
+   [ Bhushan Shah ]
+   * Build libkwinglutils7 on any architecture, unbreaks build on armhf
+ 
+   [ Scarlett Clark ]
+   * Merging unstable in a desperate attempt to fix merger. 
+   * Fix merge. 
+   * Merge unstable to get debian merge in archive. 
+   * Bump version. 
+ 
+   [ Philip Muškovac ]
+   * kwin-common breaks/replaces kwin-data << 4:5.5.3~
+ 
+   [ Clive Johnston ]
+   * New upstream release
+ 
+   [ Bhushan Shah ]
+   * Bump versions for libkwinglutils, libkwinxenderutils and
+     libkwineffects
+ 
+   [ Scarlett Clark ]
+   * Refresh symbols. 
+   * Add Multi-Arch same to libkwin4-effect-builtins1 to make
+     lintain happy. 
+   * Refresh symbols with correct version. 
+ 
+   [ Clive Johnston ]
+   * Adding min versions for build deps
++>>>>>>>
+ 
+  -- Clive Johnston <clivejo at aol.com>  Mon, 07 Mar 2016 21:24:43 +0100
+ 
+ kwin (4:5.4.3-0ubuntu5) xenial; urgency=medium
+ 
+   * Disable libhybris entirely on upstream recommendation, as it requires
+     libhybris upstream git, not the ubuntu fork
  
-  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:12:59 +0000
+  -- Philip Muškovac <yofel at kubuntu.org>  Wed, 03 Feb 2016 22:44:44 +0100
  
  kwin (4:5.4.3-0ubuntu4) xenial; urgency=medium
  
diff --cc debian/control
index d997942,9dd9f9e..d540328
--- a/debian/control
+++ b/debian/control
@@@ -17,10 -18,9 +18,10 @@@ 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~),
+                libkdecorations2-dev (>= 4:5.5.4~),
                 libkf5activities-dev (>= 5.18.0~),
                 libkf5completion-dev (>= 5.18.0~),
                 libkf5config-dev (>= 5.18.0~),

-- 
kwin packaging