[SCM] frameworkintegration packaging branch, master, updated. debian/5.37.0-2-105-ge9c37f4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 243447d1baa1ef7c33e2100c406411ecc9c89b8c
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 08:48:19 2015 -0700

    Merge unstable.
---
 debian/changelog | 1 +
 debian/control   | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55350a3..d5c788f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 frameworkintegration (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * Vivid backport
+  * Merge and wrap-and-sort. 
 
  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:02:16 -0700
 
diff --git a/debian/control b/debian/control
index e0f19d1..8c77bb1 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,9 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/frameworkintegration.git
 
 Package: frameworkintegration
 Architecture: any
-Depends: ttf-oxygen-font-family | fonts-oxygen (>= 0.4~), ${misc:Depends}, ${shlibs:Depends}
+Depends: ttf-oxygen-font-family | fonts-oxygen (>= 0.4~),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: kf5-infopage, kf5-integrationplugin, kf5-platformtheme
 Replaces: kf5-infopage, kf5-integrationplugin, kf5-platformtheme
 Description: KF5 cross-framework integration plugins
@@ -40,13 +42,8 @@ Description: KF5 cross-framework integration plugins
 Package: libkf5style-dev
 Section: libdevel
 Architecture: any
-<<<<<<< HEAD
-Depends: libkf5configwidgets-dev (>= 5.11.0),
-         libkf5iconthemes-dev (>= 5.11.0),
-=======
 Depends: libkf5configwidgets-dev (>= 5.11.0~),
          libkf5iconthemes-dev (>= 5.11.0~),
->>>>>>> origin/kubuntu_unstable
          libkf5style5 (= ${binary:Version}),
          ${misc:Depends}
 Description: KF5 cross-framework integration plugins - KStyle

-- 
frameworkintegration packaging