[SCM] kscreen packaging branch, kubuntu_unstable, updated. debian/1.0.2.1-1-12-g3d80b58

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 75e02c5f021ddd2f0c7c743177d95c551b3c7911
Merge: a9c3b11b8057a4efec386b3e975f8b67e6fef49f 83a51d5aa275840df63e5bf00928a2d38fe4c20b
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Jan 13 18:38:02 2015 +0100

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

 debian/TODO.Debian                                 |   2 -
 debian/changelog                                   |  83 +++++++++-
 debian/control                                     |  43 +++---
 debian/copyright                                   | 107 ++-----------
 debian/kscreen-console.1                           | 168 ---------------------
 debian/kscreen.install                             |   1 +
 debian/kscreen.lintian-overrides                   |   1 +
 debian/kscreen.manpages                            |   1 -
 .../add_switchDisplayTwoScreensNoCommonMode_json   | 135 -----------------
 debian/patches/series                              |   1 -
 debian/rules                                       |  16 +-
 debian/tests/control                               |   6 +-
 debian/tests/testsuite                             |   7 +-
 debian/tests/testsuite.xsession                    |   8 +-
 debian/watch                                       |   3 +-
 15 files changed, 138 insertions(+), 444 deletions(-)

-- 
kscreen packaging