[SCM] kpeople packaging branch, master, updated. debian/5.37.0-2-69-g7686ba4

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 18de53ce99016b5705a7fc930833e3212e3399c3
Merge: b53da5c64e6c39e4fb36dc800931f4e4d1d3451f 2a481e7f5a7bef0cd7c892d5be04ffba20197217
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 12:52:31 2016 +0200

    Merging master into Neon/unstable

 debian/changelog         | 13 +++++++++++++
 debian/control           | 31 ++++++++-----------------------
 debian/rules             |  2 +-
 debian/tests/acc         |  7 +++++++
 debian/tests/control     |  2 +-
 debian/tests/testsuite   |  2 +-
 debian/upstream/metadata |  7 +++++++
 7 files changed, 38 insertions(+), 26 deletions(-)

diff --cc debian/changelog
index 812798f,6a4d412..402bf3f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,16 +1,38 @@@
 +kpeople (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:23:23 +0000
 +
 +kpeople (5.20.0-0neon) wily; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Fri, 01 Apr 2016 11:07:34 +0000
 +
+ kpeople (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
+ 
+ kpeople (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:06 +0100
+ 
 +kpeople (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:06:39 +0100
 +
  kpeople (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).

-- 
kpeople packaging