[SCM] kcompletion packaging branch, master, updated. debian/5.37.0-2-84-g440a1d9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c39ef80aa2d465cbb7fd512661760862430101e6
Merge: a37df3f67ca11f4e3c9aacbb8702fa66786bdc32 89a622e465d532a3a558fd777835f1faef7305c2
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 11:48:48 2015 -0700

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

 debian/changelog |  8 +++++++-
 debian/control   | 10 +++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 8467c62,4f1b311..d265cc7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,10 +1,11 @@@
 -kcompletion (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kcompletion (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:07:56 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 07:59:07 -0700
  
- kcompletion (5.10.0-0ubuntu1) wily; urgency=medium
+ kcompletion (5.11.0-1) unstable; urgency=medium
  
    [ Maximiliano Curia ]
    * New upstream release (5.10.0).
diff --cc debian/control
index ffb51e0,ff817e6..b2ac540
--- a/debian/control
+++ b/debian/control
@@@ -5,9 -5,9 +5,9 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
-                extra-cmake-modules (>= 5.10.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
                 qttools5-dev (>= 5.4),
@@@ -24,8 -24,8 +24,8 @@@ Package: libkf5completion-de
  Section: libdevel
  Architecture: any
  Depends: libkf5completion5 (= ${binary:Version}),
-          libkf5config-dev (>= 5.12.0),
-          libkf5widgetsaddons-dev (>= 5.12.0),
 -         libkf5config-dev (>= 5.11.0~),
 -         libkf5widgetsaddons-dev (>= 5.11.0~),
++         libkf5config-dev (>= 5.12.0~),
++         libkf5widgetsaddons-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: development files for kcompletion
   KCompletion provides widgets with advanced completion support as well as a

-- 
kcompletion packaging