[SCM] kconfigwidgets packaging branch, kubuntu_wily_archive, updated. debian/5.11.0-1-12-gdb731ab

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit db731ab5c00cff7fec4f35de15f15700ca213889
Merge: bcea5284e6694ef57ac9fbf7b3523f331557a4d3 d5855c15fc6dcfca91981d45d1caf6032e105129
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 12:06:21 2015 -0700

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

 debian/changelog                        |  8 +++++++-
 debian/control                          | 30 +++++++++++++++---------------
 debian/libkf5configwidgets-data.install |  3 +--
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --cc debian/changelog
index eac26c7,5aaf8d1..6a9e3ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,11 +1,11 @@@
 -kconfigwidgets (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kconfigwidgets (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 -  * Vivid backport
 -  * Clean merge. 
 +  * New upstream release
++  * Fix merge, remove unused broken backport.
  
 - -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:09:15 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:00:19 -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 9cbca0c,f2ba33e..576a55b
--- a/debian/control
+++ b/debian/control
@@@ -7,15 -7,15 +7,15 @@@ Build-Depends: cmake (>= 2.8.12)
                 debhelper (>= 9),
                 docbook-xml,
                 docbook-xsl,
-                extra-cmake-modules (>= 5.10.0),
-                kdoctools-dev (>= 5.12.0),
-                libkf5auth-dev (>= 5.12.0),
-                libkf5codecs-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5guiaddons-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               kdoctools-dev (>= 5.11.0~),
 -               libkf5auth-dev (>= 5.11.0~),
 -               libkf5codecs-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5guiaddons-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               kdoctools-dev (>= 5.12.0~),
++               libkf5auth-dev (>= 5.12.0~),
++               libkf5codecs-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5guiaddons-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
                 libxml2-utils,
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4),
@@@ -30,13 -30,13 +30,13 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5configwidgets-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5auth-dev (>= 5.12.0),
-          libkf5codecs-dev (>= 5.12.0),
-          libkf5config-dev (>= 5.12.0),
 -Depends: libkf5auth-dev (>= 5.11.0~),
 -         libkf5codecs-dev (>= 5.11.0~),
 -         libkf5config-dev (>= 5.11.0~),
++Depends: libkf5auth-dev (>= 5.12.0~),
++         libkf5codecs-dev (>= 5.12.0~),
++         libkf5config-dev (>= 5.12.0~),
           libkf5configwidgets5 (= ${binary:Version}),
-          libkf5guiaddons-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
-          libkf5widgetsaddons-dev (>= 5.12.0),
 -         libkf5guiaddons-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
 -         libkf5widgetsaddons-dev (>= 5.11.0~),
++         libkf5guiaddons-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
++         libkf5widgetsaddons-dev (>= 5.12.0~),
           ${misc:Depends}
  Description: development files for kconfigwidgets
   KConfigWidgets provides easy-to-use classes to create

-- 
kconfigwidgets packaging