[SCM] kscreen packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-35-ge4ca5ae

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 43effd7f03a170e8a0b5d20a0a41c6b85a24d1ad
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 4 22:12:59 2015 -0800

    Fix control file merge.
---
 debian/changelog | 1 +
 debian/control   | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bff071a..2a395a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kscreen (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
 
   * Debian merge: No remaining changes. 
+  * Fix control file merge. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 04 Dec 2015 21:52:33 -0800
 
diff --git a/debian/control b/debian/control
index 4e23b26..20c7897 100644
--- a/debian/control
+++ b/debian/control
@@ -13,12 +13,8 @@ Build-Depends: cmake (>= 2.8.12),
                libkf5dbusaddons-dev (>= 5.1.0),
                libkf5globalaccel-dev (>= 5.1.0),
                libkf5i18n-dev,
-<<<<<<< HEAD
-               libkf5screen-dev (>= 4:5.4.3~),
-=======
                libkf5screen-dev (>= 4:5.2.91~),
                libkf5widgetsaddons-dev,
->>>>>>> master
                libkf5xmlgui-dev (>= 5.1.0),
                libqjson-dev,
                libqt5x11extras5-dev (>= 5.4),
@@ -33,12 +29,8 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kscreen.git
 
 Package: kscreen
 Architecture: any
-<<<<<<< HEAD
-Depends: plasma-framework,
-=======
 Depends: kde-cli-tools,
          plasma-framework,
->>>>>>> master
          qml-module-qtgraphicaleffects,
          ${misc:Depends},
          ${shlibs:Depends}

-- 
kscreen packaging