[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=13ce580

The following commit has been merged in the master branch:
commit 13ce5807bb1fde5f0b30acc9c5b6df3fd1277a9e
Merge: 98ce70e5c2b3e4402988c68ec9acb7ee6d10a27a acb0acf1261ee4828215185592b57d2ed02df297
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:18:43 2016 +0200

    Merging master into Neon/unstable

 debian/changelog                | 20 ++++++++++++++++++++
 debian/control                  | 35 ++++++++++-------------------------
 debian/libkf5emoticons5.symbols |  2 +-
 debian/rules                    |  2 +-
 debian/tests/acc                |  7 +++++++
 debian/upstream/metadata        |  7 +++++++
 debian/watch                    |  1 -
 7 files changed, 46 insertions(+), 28 deletions(-)

diff --cc debian/changelog
index fa7ded0,e7b40a6..b0dace7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,24 -1,22 +1,44 @@@
 +kemoticons (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:22:18 +0000
 +
 +kemoticons (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:06:00 +0000
 +
+ kemoticons (5.19.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.19.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sat, 13 Feb 2016 15:16:19 +0100
+ 
+ kemoticons (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:05 +0100
+ 
 +kemoticons (5.18.0-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 15:00:44 +0100
++
+ kemoticons (5.16.0-2) unstable; urgency=medium
+ 
+   * Add libkf5emoticons-bin to libkf5emoticons5.symbols dependency list
+   * Add myself to uploaders
+ 
+  -- Diane Trout <diane at ghic.org>  Sat, 05 Dec 2015 11:28:07 -0800
  
  kemoticons (5.16.0-1) unstable; urgency=medium
  
diff --cc debian/control
index 0d1f0a7,987ee99..9dbe963
--- a/debian/control
+++ b/debian/control
@@@ -20,13 -20,11 +20,13 @@@ Vcs-Git: https://anonscm.debian.org/git
  Package: libkf5emoticons-dev
  Section: libdevel
  Architecture: any
- Depends: libkf5archive-dev (>= 5.16.0~),
+ Depends: libkf5archive-dev (>= 5.19.0~),
           libkf5emoticons5 (= ${binary:Version}),
-          libkf5service-dev (>= 5.16.0~),
+          libkf5service-dev (>= 5.19.0~),
           qtbase5-dev (>= 5.4),
           ${misc:Depends}
 +Breaks: libkf5emoticons-bin (<< 5.12.0~)
 +Replaces: libkf5emoticons-bin (<< 5.12.0~)
  Description: Support for emoticons and emoticons themes.
   This class can be used to retrieve, install,
   create emoticons theme. It can also be used to

-- 
kemoticons packaging