[SCM] kwin packaging branch, kubuntu_vivid_archive, updated. bbc64ede6bc5deed46b255bf340c1dd0d07d70d0

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit bbc64ede6bc5deed46b255bf340c1dd0d07d70d0
Merge: fd684089ffc51856d7a65d72559ea40071c1f06e b8331fc853ec4f2ff54b8ef66ce29b58d170b811
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Nov 7 17:14:13 2014 +0100

    New upstream release.
    -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 07 Nov 2014 03:44:39 +0000

 debian/changelog                                    | 12 ++++++++++++
 debian/{kwin-dev.install => kwin-dev.install.armhf} |  1 -
 debian/libkwinglutils5.install.armhf                |  0
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index a80689e,795bdc4..f8b287c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,16 @@@
+ kwin (4:5.1.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 07 Nov 2014 03:44:39 +0000
+ 
 -kwin (4:5.1.0.1-0ubuntu1) UNRELEASED; urgency=medium
++kwin (4:5.1.0.1-0ubuntu2) vivid; urgency=medium
++
++  * Add install.armhf files for armhf
++
++ -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 07 Nov 2014 17:12:18 +0100
++
 +kwin (4:5.1.0.1-0ubuntu1) vivid; urgency=medium
  
    [ Jonathan Riddell ]
    * New upstream beta release
diff --cc debian/kwin-dev.install.armhf
index 43c12bd,43c12bd..9c4fe84
--- a/debian/kwin-dev.install.armhf
+++ b/debian/kwin-dev.install.armhf
@@@ -3,6 -3,6 +3,5 @@@ usr/lib/*/cmak
  usr/lib/*/libkdecorations.so
  usr/lib/*/libkwin4_effect_builtins.so
  usr/lib/*/libkwineffects.so
--usr/lib/*/libkwinglutils.so
  usr/lib/*/libkwinxrenderutils.so
  usr/share/dbus-1/interfaces/
diff --cc debian/libkwinglutils5.install.armhf
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/debian/libkwinglutils5.install.armhf

-- 
kwin packaging