[SCM] frameworkintegration packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-6-g598f28c

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 598f28c9a9491bc6466945ce076b32c04328bcbd
Merge: b0bb10150ad2217b4dc08c1a7df193459eea744f e746b0ebca766d1c0274ac3c91c0d8ad8901cde5
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 8 17:47:49 2015 +0200

    Merge branch 'kubuntu_vivid_backports' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 7 +++++++
 debian/control   | 5 +++++
 2 files changed, 12 insertions(+)

diff --cc debian/changelog
index 7dbf14b,d881451..e7285ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
 +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.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:02:16 -0700
+ 
  frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
@@@ -109,3 -108,3 +115,4 @@@ frameworkintegration (5.0.0-0ubuntu1) u
    * Initial stable upstream release
  
   -- Scarlett Clark <scarlett at scarlettgatelyclark.com>  Tue, 22 Jul 2014 16:10:38 +0200
++
diff --cc debian/control
index d7d8d86,3c52cac..3b162b9
--- 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),
++>>>>>>> kubuntu_vivid_backports
           libkf5style5 (= ${binary:Version}),
           ${misc:Depends}
  Description: KF5 cross-framework integration plugins - KStyle

-- 
frameworkintegration packaging