[SCM] kcmutils packaging branch, master, updated. debian/5.37.0-2-83-g25e1622

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kcmutils.git;a=commitdiff;h=0179207

The following commit has been merged in the master branch:
commit 0179207e4423aee67feeb6650ce3bac14f9ee861
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Dec 2 21:52:31 2015 +0100

    Fix control file post merge
---
 debian/control | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/debian/control b/debian/control
index 6ed3abb..520ac1c 100644
--- a/debian/control
+++ b/debian/control
@@ -26,21 +26,12 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/kcmutils.git
 Package: libkf5kcmutils-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
-Depends: libkf5configwidgets-dev (>= 5.15.0~),
-         libkf5iconthemes-dev (>= 5.15.0~),
-         libkf5itemviews-dev (>= 5.15.0~),
-         libkf5kcmutils5 (= ${binary:Version}),
-         libkf5service-dev (>= 5.15.0~),
-         libkf5xmlgui-dev (>= 5.15.0~),
-=======
 Depends: libkf5configwidgets-dev (>= 5.16.0~),
          libkf5iconthemes-dev (>= 5.16.0~),
          libkf5itemviews-dev (>= 5.16.0~),
          libkf5kcmutils5 (= ${binary:Version}),
          libkf5service-dev (>= 5.16.0~),
          libkf5xmlgui-dev (>= 5.16.0~),
->>>>>>> master
          ${misc:Depends}
 Description: Extra APIs to write KConfig modules.
  Some utility classes for KSettings, KCModule and KPlugin.

-- 
kcmutils packaging