[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=a3d0bf0

The following commit has been merged in the master branch:
commit a3d0bf019af6332d99087cd05c6cd05ad1ec1ea7
Merge: e746b0ebca766d1c0274ac3c91c0d8ad8901cde5 b0bb10150ad2217b4dc08c1a7df193459eea744f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 08:46:33 2015 -0700

    Merge remote-tracking branch 'origin/kubuntu_unstable' into kubuntu_vivid_backports
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog |  7 +++++++
 debian/control   | 23 ++++++++++++++---------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index d881451,7dbf14b..55350a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
 +frameworkintegration (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:02:16 -0700
 +
+ frameworkintegration (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Mon, 29 Jun 2015 17:27:10 +0200
+ 
  frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
diff --cc debian/control
index 3c52cac,d7d8d86..e0f19d1
--- a/debian/control
+++ b/debian/control
@@@ -40,8 -40,8 +40,13 @@@ Description: KF5 cross-framework integr
  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