[SCM] kpeople packaging branch, master, updated. debian/5.8.0-1-17-ged81402

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 5db8e1dfd4eb67574fbc0184b6a2962b47c43efa
Merge: f53d37b39c78a286a3f9776233c65b1aa8cf2b03 085edbedd278c064dd9f5a00ba2b815a07556f96
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 17 13:14:28 2015 +0200

    Merge commit '085edbedd278c064dd9f5a00ba2b815a07556f96'
    
    Conflicts:
    	debian/changelog
    	debian/libkf5people-data.install

 debian/changelog                                |   20 +
 debian/control                                  |    5 +-
 debian/patches/series                           |    1 +
 debian/patches/upstream_rename-tranlations.diff | 4814 +++++++++++++++++++++++
 4 files changed, 4839 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index fe4a2e8,f4ef6fb..2c334d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,19 +1,36 @@@
 +kpeople (5.9.0-1~) UNRELEASED; urgency=medium
 +
 +  * Add breaks/replaces with libkpeople3.
 +  * New upstream release (5.9.0).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 16 Apr 2015 10:21:17 +0200
 +
+ kpeople (5.9.0-0ubuntu1) vivid; urgency=medium
+ 
+   [ Harald Sitter ]
+   * Refine dev package to depend on all create libraries as the cmake
+     package will expect them all.
+ 
+   [ Scarlett Clark ]
+   * New upstream release
+ 
+   [ Jonathan Riddell ]
+   * Add upstream_rename-tranlations.diff to fix translations
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 13 Apr 2015 22:30:51 +0200
+ 
 +kpeople (5.8.0-1) experimental; urgency=medium
 +
 +  [ Harald Sitter ]
 +  * Initial release.
 +
 +  [ Maximiliano Curia ]
 +  * Prepare initial Debian release.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Sun, 22 Mar 2015 11:38:46 +0100
++
+ kpeople (5.8.0-0ubuntu1) vivid; urgency=medium
+ 
+   * Initial release.
+ 
+  -- Harald Sitter <sitter at kde.org>  Tue, 17 Mar 2015 15:41:05 +0100

-- 
kpeople packaging