[SCM] libkscreen packaging branch, kubuntu_stable, updated. e0932134582552d088030c4a78e39e60365b7951

Tue Jan 13 16:58:07 UTC 2015

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

The following commit has been merged in the kubuntu_stable branch:
commit e0932134582552d088030c4a78e39e60365b7951
Merge: d3a54e698f43fd02af40f08bfec804bd6e4efd16 34b2204ffdb8b883bac833356fcdc5861d747443
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 17:57:51 2015 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_stable
    
    Conflicts:
    	debian/meta/upstream_scm.json

 debian/changelog             |  41 +++++-
 debian/control               |  26 +++-
 debian/libkf5screen5.install |   2 -
 debian/libkf5screen6.install |   4 +
 debian/libkf5screen6.symbols | 327 +++++++++++++++++++++++++++++++++++++++++++
 debian/watch                 |   2 +-
 6 files changed, 394 insertions(+), 8 deletions(-)

-- 
libkscreen packaging