[SCM] kscreen packaging branch, kubuntu_unstable, updated. debian/1.0.2.1-1-8-g274a89d

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 274a89d10de4b7f6aa41b3af3bd675d933ccb4d7
Merge: 349f37c9fc68cccd7a14de947839c53255ba3707 b6aa9916f4b1f519591711471d7016d50bff7f93
Author: Rohan Garg <rohan at kde.org>
Date:   Wed Dec 17 15:26:51 2014 +0100

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/control

 debian/control | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --cc debian/control
index 6c24032,c63e3a2..f5fd67b
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,22 +1,28 @@@
  Source: kscreen
  Section: kde
- Priority: extra
- Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
- XSBC-Original-Maintainer: Achim Bohnet <allee at kubuntu.org>
+ Priority: optional
+ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+ Uploaders: Felix Geyer <fgeyer at debian.org>,
+            Maximiliano Curia <maxy at debian.org>,
+            Rohan Garg <rohan at kde.org>
 -Build-Depends: debhelper (>= 9),
 -               pkg-kde-tools,
 -               cmake,
 -               kdelibs5-dev,
 -               libkscreen-dev (>= 1.0.2),
 -               libqjson-dev (>= 0.8),
 -               libxrandr-dev
 +Build-Depends: cmake,
 +               debhelper (>= 9.0.0),
 +               extra-cmake-modules (>= 1.0.0),
 +               libkf5globalaccel-dev (>= 5.1.0),
 +               libkf5screen-dev,
 +               libkf5xmlgui-dev (>= 5.1.0),
 +               libqjson-dev,
 +               libqt5x11extras5-dev,
 +               libxrandr-dev,
 +               pkg-kde-tools (>= 0.15.14),
 +               plasma-framework-dev (>= 5.1.0),
 +               qtbase5-dev,
 +               qtdeclarative5-dev
  Standards-Version: 3.9.5
  XS-Testsuite: autopkgtest
- Homepage: https://projects.kde.org/projects/playground/base/kscreen
- Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kscreen
- Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging-next/kscreen
+ Homepage: https://projects.kde.org/projects/extragear/base/kscreen
+ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kscreen.git
+ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-kde/kde-extras/kscreen.git
  
  Package: kscreen
  Architecture: any

-- 
kscreen packaging