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

The following commit has been merged in the master branch:
commit e73b62985c4904b4c43b1c359aea10eeedaa5089
Merge: 243447d1baa1ef7c33e2100c406411ecc9c89b8c 598f28c9a9491bc6466945ce076b32c04328bcbd
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:00:10 2015 -0700

    Merge branch 'kubuntu_unstable' of ssh://git.debian.org:/git/pkg-kde/frameworks/frameworkintegration into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog | 4 ++--
 debian/control   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index d5c788f,e7285ce..e41a8c1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,3 +1,9 @@@
 +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
 +
  frameworkintegration (5.11.0-1) unstable; urgency=medium
  
    * New upstream release (5.10.0).
@@@ -12,7 -5,13 +11,7 @@@
  
   -- 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
++ frameworkintegration (5.10.0-0ubuntu1) wily; urgency=medium
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
diff --cc debian/control
index 8c77bb1,3b162b9..c39d6fa
--- a/debian/control
+++ b/debian/control
@@@ -42,8 -40,13 +42,8 @@@ 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