[SCM] kscreen packaging branch, master, updated. f0f41206feda2adfdb7257c2412d319efbc64b74

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ff8f5bfae6753328a80939f38180b0d955e918af
Merge: ec5a69f8cfca40ef37c20bcc45c6699281df306f 9ab2be5111ad9c613dee4ca2bd799fef651a1146
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 5 22:53:57 2013 +0100

    Merge branch 'master' into HEAD
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/rules
    	debian/watch

 debian/changelog       |  2 +-
 debian/control         | 17 ++++++++++++-----
 debian/docs            |  0
 debian/kscreen.install |  1 +
 debian/watch           |  4 ++--
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index ae51e0f,e13e656..441118a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,5 +1,5 @@@
- kscreen (1.0.2.1-1) unstable; urgency=low
+ kscreen (1.0.2.1-1) UNRELEASED; urgency=low
  
 -  * Initial release
 +  * Initial release (Closes: #730356)
  
 - -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Dec 2013 21:16:28 +0100
 + -- Rohan Garg <rohan at kde.org>  Sat, 23 Nov 2013 06:31:01 +1100
diff --cc debian/control
index 97cce21,195cab5..8f4619e
--- a/debian/control
+++ b/debian/control
@@@ -1,11 -1,11 +1,19 @@@
  Source: kscreen
  Section: kde
 -Priority: extra
 -Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
 -XSBC-Original-Maintainer: Achim Bohnet <allee at kubuntu.org>
 -Build-Depends: debhelper (>= 8.0.0), cmake, kdelibs5-dev, libkscreen-dev (>= 1.0.1), libqjson-dev (>= 0.8), libxrandr-dev
 -Standards-Version: 3.9.4
 -Homepage: https://projects.kde.org/projects/playground/base/kscreen
 +Priority: optional
 +Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
- Uploaders: Felix Geyer <fgeyer 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
- Standards-Version: 3.9.4
- Homepage: https://projects.kde.org/projects/playground/base/kscreen
++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
++Standards-Version: 3.9.5
++Homepage: https://projects.kde.org/projects/extragear/base/kscreen
  Vcs-Browser: http://bazaar.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kscreen
  Vcs-Bzr: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/kscreen
  
@@@ -32,4 -31,4 +40,3 @@@ Description: KDE monitor hotplug and sc
   of monitors as simple as plugging them to your computer.
   .
   This package contains the debugging symbols.
--

-- 
kscreen packaging