[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=b1b7f99

The following commit has been merged in the master branch:
commit b1b7f99c9ed842ac63d13f9b6b6a1dccdf998074
Merge: c087322cd85298d3de1aead6ee1a495c7c753ec6 b86dc0599ac6d3a2b6f09f6cae509108e3efbebd
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Jul 2 07:52:26 2015 +0200

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

 debian/changelog |  8 ++++++++
 debian/control   | 12 ++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --cc debian/changelog
index 3b30563,2bcc8e6..0735a83
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,11 +1,22 @@@
+ kpeople (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Remove upstream applied patch: upstream_rename-tranlations.diff
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Sun, 28 Jun 2015 16:04:17 +0200
+ 
 +kpeople (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Remove upstream applied patch: upstream_rename-tranlations.diff
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:32:16 +0200
 +
  kpeople (5.9.0-1) experimental; urgency=medium
  
    * Add breaks/replaces with libkpeople3.

-- 
kpeople packaging