[SCM] kemoticons packaging branch, master, updated. debian/5.37.0-2-86-gcaf9daf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6b47db4f99f8b0421f65e25b9be982861b155159
Merge: 014eb79dedf120823d7ab85573ad380019176cb7 1c42954189a5d64c11c2fc706329b1cb4bc681b4
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Jul 10 14:29:40 2015 -0700

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

 debian/changelog | 15 +++++++++++++++
 debian/control   | 14 +++++++-------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 4e2bfe9,45dfef3..16f1206
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,15 +1,23 @@@
++<<<<<<< HEAD
 +kemoticons (5.12.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 10 Jul 2015 08:07:41 -0700
++=======
+ kemoticons (5.11.0-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * Vivid backport
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Wed, 08 Jul 2015 08:16:47 -0700
+ 
+ kemoticons (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:03:48 +0200
++>>>>>>> origin/kubuntu_unstable
  
  kemoticons (5.10.0-0ubuntu1) wily; urgency=medium
  
diff --cc debian/control
index 438b0b6,a903a13..5868f7c
--- 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),
-                libkf5archive-dev (>= 5.12.0),
-                libkf5config-dev (>= 5.12.0),
-                libkf5coreaddons-dev (>= 5.12.0),
-                libkf5service-dev (>= 5.12.0),
 -               extra-cmake-modules (>= 5.11.0~),
 -               libkf5archive-dev (>= 5.11.0~),
 -               libkf5config-dev (>= 5.11.0~),
 -               libkf5coreaddons-dev (>= 5.11.0~),
 -               libkf5service-dev (>= 5.11.0~),
++               extra-cmake-modules (>= 5.12.0~),
++               libkf5archive-dev (>= 5.12.0~),
++               libkf5config-dev (>= 5.12.0~),
++               libkf5coreaddons-dev (>= 5.12.0~),
++               libkf5service-dev (>= 5.12.0~),
                 pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev (>= 5.4)
  Standards-Version: 3.9.6
@@@ -21,9 -21,9 +21,9 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  Package: libkf5emoticons-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5archive-dev (>= 5.12.0),
 -Depends: libkf5archive-dev (>= 5.11.0~),
++Depends: libkf5archive-dev (>= 5.12.0~),
           libkf5emoticons5 (= ${binary:Version}),
-          libkf5service-dev (>= 5.12.0),
 -         libkf5service-dev (>= 5.11.0~),
++         libkf5service-dev (>= 5.12.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
  Description: Support for emoticons and emoticons themes.

-- 
kemoticons packaging