[SCM] kconfigwidgets packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-9-g9b8fd21

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kconfigwidgets.git;a=commitdiff;h=9b8fd21

The following commit has been merged in the kubuntu_unstable branch:
commit 9b8fd216286c0c77be40362a3e4f439391506d26
Merge: b6c9078eca960f294f46c10becf5e33e5004762a 7f6aace4d7ed166bf7d1edcc52c5fad5fb783ac3
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Jul 8 09:40:34 2015 -0700

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

 debian/changelog |  6 ++++++
 debian/control   | 10 ++++++++++
 2 files changed, 16 insertions(+)

diff --cc debian/changelog
index 702d002,fec4b1f..e77727a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
+ kconfigwidgets (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:09:15 -0700
+ 
 -kconfigwidgets (5.10.0-0ubuntu1) wily; urgency=medium
 +kconfigwidgets (5.11.0-1) unstable; urgency=medium
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
diff --cc debian/control
index f2ba33e,9736162..1d238ef
--- a/debian/control
+++ b/debian/control
@@@ -30,13 -30,13 +30,23 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5configwidgets-dev
  Section: libdevel
  Architecture: any
++<<<<<<< HEAD
 +Depends: libkf5auth-dev (>= 5.11.0~),
 +         libkf5codecs-dev (>= 5.11.0~),
 +         libkf5config-dev (>= 5.11.0~),
 +         libkf5configwidgets5 (= ${binary:Version}),
 +         libkf5guiaddons-dev (>= 5.11.0~),
 +         libkf5i18n-dev (>= 5.11.0~),
 +         libkf5widgetsaddons-dev (>= 5.11.0~),
++=======
+ Depends: libkf5auth-dev (>= 5.11.0),
+          libkf5codecs-dev (>= 5.11.0),
+          libkf5config-dev (>= 5.11.0),
+          libkf5configwidgets5 (= ${binary:Version}),
+          libkf5guiaddons-dev (>= 5.11.0),
+          libkf5i18n-dev (>= 5.11.0),
+          libkf5widgetsaddons-dev (>= 5.11.0),
++>>>>>>> origin/kubuntu_vivid_backports
           ${misc:Depends}
  Description: development files for kconfigwidgets
   KConfigWidgets provides easy-to-use classes to create

-- 
kconfigwidgets packaging