[SCM] kiconthemes packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-11-g3b54e60

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 3b54e6098457d896a33d6900e07730a31d521ae0
Merge: 5703e9bd73fe7e8d9d91dc39881c1a5a43da311d 8e42630538020ebbeeb3e1a4a0b52d88241f6dde
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 15:25:12 2015 -0700

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

 debian/changelog                 | 16 +++++++++++++++-
 debian/control                   | 18 +++++++++---------
 debian/libkf5iconthemes5.symbols |  3 ++-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --cc debian/changelog
index 175354f,02f6f02..d1f7313
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,9 @@@
 -kiconthemes (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
 +kiconthemes (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:20:04 -0700
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:10:57 -0700
  
  kiconthemes (5.10.0-0ubuntu1) wily; urgency=medium
  
diff --cc debian/control
index e19ab6e,1ab5f70..dcd3231
--- a/debian/control
+++ b/debian/control
@@@ -5,11 -5,11 +5,11 @@@ 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),
-                libkf5configwidgets-dev (>= 5.12.0),
-                libkf5i18n-dev (>= 5.12.0),
-                libkf5itemviews-dev (>= 5.12.0),
-                libkf5widgetsaddons-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5configwidgets-dev (>= 5.11.0~),
 -               libkf5i18n-dev (>= 5.11.0~),
 -               libkf5itemviews-dev (>= 5.11.0~),
 -               libkf5widgetsaddons-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5configwidgets-dev (>= 5.12.0~),
++               libkf5i18n-dev (>= 5.12.0~),
++               libkf5itemviews-dev (>= 5.12.0~),
++               libkf5widgetsaddons-dev (>= 5.12.0~),
                 libqt5svg5-dev (>= 5.4),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
@@@ -31,11 -31,11 +31,11 @@@ Description: Support for icon theme
  Package: libkf5iconthemes-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5configwidgets-dev (>= 5.12.0),
-          libkf5i18n-dev (>= 5.12.0),
 -Depends: libkf5configwidgets-dev (>= 5.11.0~),
 -         libkf5i18n-dev (>= 5.11.0~),
++Depends: libkf5configwidgets-dev (>= 5.12.0~),
++         libkf5i18n-dev (>= 5.12.0~),
           libkf5iconthemes5 (= ${binary:Version}),
-          libkf5itemviews-dev (>= 5.12.0),
-          libkf5widgetsaddons-dev (>= 5.12.0),
 -         libkf5itemviews-dev (>= 5.11.0~),
 -         libkf5widgetsaddons-dev (>= 5.11.0~),
++         libkf5itemviews-dev (>= 5.12.0~),
++         libkf5widgetsaddons-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for kiconthemes

-- 
kiconthemes packaging