[SCM] ktextwidgets packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-8-g762ea1a

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 762ea1aae1e84bd67b929166ffd264ee21df3b7a
Author: Rohan Garg <rohan at garg.io>
Date:   Thu Jul 2 00:03:13 2015 +0200

    Finish merge
---
 debian/control | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/debian/control b/debian/control
index 41a63e7..37e9190 100644
--- a/debian/control
+++ b/debian/control
@@ -5,19 +5,6 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.10.20130309),
                debhelper (>= 9),
-<<<<<<< HEAD
-               extra-cmake-modules (>= 5.10.0),
-               libkf5completion-dev (>= 5.10.0),
-               libkf5config-dev (>= 5.10.0),
-               libkf5configwidgets-dev (>= 5.10.0),
-               libkf5i18n-dev (>= 5.10.0),
-               libkf5iconthemes-dev (>= 5.10.0),
-               libkf5itemviews-dev (>= 5.10.0),
-               libkf5service-dev (>= 5.10.0),
-               libkf5sonnet-dev (>= 5.10.0),
-               libkf5widgetsaddons-dev (>= 5.10.0),
-               libkf5windowsystem-dev (>= 5.10.0),
-=======
                extra-cmake-modules (>= 5.11.0~),
                libkf5completion-dev (>= 5.11.0~),
                libkf5config-dev (>= 5.11.0~),
@@ -29,7 +16,6 @@ Build-Depends: cmake (>= 2.8.10.20130309),
                libkf5sonnet-dev (>= 5.11.0~),
                libkf5widgetsaddons-dev (>= 5.11.0~),
                libkf5windowsystem-dev (>= 5.11.0~),
->>>>>>> master
                pkg-kde-tools (>= 0.15.15ubuntu1~),
                qtbase5-dev (>= 5.4),
                xauth,
@@ -43,15 +29,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/ktextwidgets.git
 Package: libkf5textwidgets-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
-Depends: libkf5completion-dev (>= 5.10.0),
-         libkf5configwidgets-dev (>= 5.10.0),
-         libkf5iconthemes-dev (>= 5.10.0),
-         libkf5service-dev (>= 5.10.0),
-         libkf5sonnet-dev (>= 5.10.0),
-         libkf5textwidgets5 (= ${binary:Version}),
-         libkf5windowsystem-dev (>= 5.10.0),
-=======
 Depends: libkf5completion-dev (>= 5.11.0~),
          libkf5configwidgets-dev (>= 5.11.0~),
          libkf5iconthemes-dev (>= 5.11.0~),
@@ -59,7 +36,6 @@ Depends: libkf5completion-dev (>= 5.11.0~),
          libkf5sonnet-dev (>= 5.11.0~),
          libkf5textwidgets5 (= ${binary:Version}),
          libkf5windowsystem-dev (>= 5.11.0~),
->>>>>>> master
          qtbase5-dev (>= 5.4),
          ${misc:Depends}
 Description: development files for ktextwidgets

-- 
ktextwidgets packaging