[SCM] kwin packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.1-0ubuntu1-15-g2c5147f

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 2c5147f29801668cf7b015ef15038a7c1bb751a6
Merge: 0275def50440aa0d6904bc9037b5a152928b1ee5 94b04cd036f34ae68e60b80015fd63daee083cbc
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Sep 22 11:33:28 2015 +0200

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    Conflicts:
    	debian/libkwineffects7.symbols
    	debian/libkwinxrenderutils7.symbols

 debian/libkwineffects7.symbols      | 2 +-
 debian/libkwinxrenderutils7.symbols | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/libkwineffects7.symbols
index 6756e6c,d89c269..704c0b7
--- a/debian/libkwineffects7.symbols
+++ b/debian/libkwineffects7.symbols
@@@ -1,5 -1,5 +1,5 @@@
- # SymbolsHelper-Confirmed: 4:5.4.80+git20150917.2123+15.10 amd64 i386
+ # SymbolsHelper-Confirmed: 4:5.4.1+git20150919.0159 amd64 i386
 -libkwineffects.so.6 libkwineffects6 #MINVER#
 +libkwineffects.so.7 libkwineffects7 #MINVER#
   _ZN4KWin11EffectFrame15enableCrossFadeEb at Base 4:5.1.95+git20150122
   _ZN4KWin11EffectFrame20setCrossFadeProgressEd at Base 4:5.1.95+git20150122
   _ZN4KWin11EffectFrameC1Ev at Base 4:5.1.95+git20150122
diff --cc debian/libkwinxrenderutils7.symbols
index 24730d5,5199bce..6e9f2a9
--- a/debian/libkwinxrenderutils7.symbols
+++ b/debian/libkwinxrenderutils7.symbols
@@@ -1,5 -1,5 +1,5 @@@
- # SymbolsHelper-Confirmed: 4:5.4.80+git20150917.2123+15.10 amd64 i386
+ # SymbolsHelper-Confirmed: 4:5.4.1+git20150919.0159 amd64 i386
 -libkwinxrenderutils.so.6 libkwinxrenderutils6 #MINVER#
 +libkwinxrenderutils.so.7 libkwinxrenderutils7 #MINVER#
   _ZN4KWin11preMultiplyERK6QColorf at Base 4:5.1.95+git20150122
   _ZN4KWin11xRenderFillERK18xcb_render_color_t at Base 4:5.1.95+git20150122
   _ZN4KWin11xRenderFillERK6QColor at Base 4:5.1.95+git20150122

-- 
kwin packaging