[SCM] kinfocenter packaging branch, kubuntu_wily_backports, updated. debian/5.4.3-1-19-g0418305

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 3b2fd2b4fd7859ff9c75170ba97fedcc9bf488a5
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Dec 9 22:34:31 2015 +0100

    Fix merge markers
---
 debian/control | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/control b/debian/control
index 41e9445..334adb5 100644
--- a/debian/control
+++ b/debian/control
@@ -9,12 +9,8 @@ Build-Depends: cmake (>= 2.8.12),
                kdoctools-dev (>= 5.9.0~),
                kinit-dev,
                kio-dev (>= 5.9.0~),
-<<<<<<< HEAD
                kwayland-dev (>= 4:5.4.3~),
-=======
-               kwayland-dev (>= 4:5.4.1~),
                libegl1-mesa-dev,
->>>>>>> master
                libkf5completion-dev (>= 5.9.0~),
                libkf5config-dev (>= 5.9.0~),
                libkf5configwidgets-dev (>= 5.9.0~),
@@ -42,15 +38,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/plasma/kinfocenter.git
 
 Package: kinfocenter
 Architecture: any
-<<<<<<< HEAD
-Depends: baloo-kf5, plasma-workspace, ${misc:Depends}, ${shlibs:Depends}
-=======
-Depends: ieee-data,
+Depends: baloo-kf5,
+         ieee-data,
          plasma-workspace,
          usbutils,
          ${misc:Depends},
          ${shlibs:Depends}
->>>>>>> master
 Breaks: about-distro (<< 4:5.2.95),
         kinfocenter5 (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),
         kinfocenter5-data (<< 4:5.2.0-0ubuntu1~ubuntu14.10~ppa3),

-- 
kinfocenter packaging