[SCM] kiconthemes packaging branch, kubuntu_unstable, updated. debian/5.11.0-1-6-g35d479e

[Rohan Garg]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 35d479e14f2567383ab29a7c70814a52fcde2ddd
Merge: a78a43e37736c7374e7ac1550aba56f4c1f78f02 24b5be06d1bb1352e946ad405865512571b32452
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Jul 1 21:27:38 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                 | 10 ++++++++--
 debian/control                   | 18 +++++++++++++-----
 debian/libkf5iconthemes5.symbols |  3 ++-
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index fadbef2,4cb3db5..81da527
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,19 @@@
- kiconthemes (5.10.0-0ubuntu1) wily; urgency=medium
+ kiconthemes (5.11.0-1) unstable; urgency=medium
  
 +  [ Maximiliano Curia ]
    * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+   * Update symbols files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:02:29 +0200
+ 
++kiconthemes (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:47:45 +0200
 +
  kiconthemes (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
@@@ -99,7 -97,7 +105,7 @@@ kiconthemes (5.1.0-0ubuntu1) utopic; ur
    * Make sure we add the XS-Testsuite field to debian/control
  
    [ Scarlett Clark ]
--  * Update copyright to match licensing to source 
++  * Update copyright to match licensing to source
  
    [ José Manuel Santamaría Lema ]
    * Update libraries *.install paths so a soname bump doesn't go
diff --cc debian/control
index 3125f07,1ab5f70..7992418
--- a/debian/control
+++ b/debian/control
@@@ -31,11 -31,11 +31,19 @@@ Description: Support for icon theme
  Package: libkf5iconthemes-dev
  Section: libdevel
  Architecture: any
++<<<<<<< HEAD
 +Depends: libkf5configwidgets-dev (>= 5.10.0),
 +         libkf5i18n-dev (>= 5.10.0),
 +         libkf5iconthemes5 (= ${binary:Version}),
 +         libkf5itemviews-dev (>= 5.10.0),
 +         libkf5widgetsaddons-dev (>= 5.10.0),
++=======
+ Depends: libkf5configwidgets-dev (>= 5.11.0~),
+          libkf5i18n-dev (>= 5.11.0~),
+          libkf5iconthemes5 (= ${binary:Version}),
+          libkf5itemviews-dev (>= 5.11.0~),
+          libkf5widgetsaddons-dev (>= 5.11.0~),
++>>>>>>> master
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: development files for kiconthemes

-- 
kiconthemes packaging