[SCM] kactivities-stats packaging branch, master, updated. debian/5.37.0-2-47-g934e6db

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities-stats.git;a=commitdiff;h=3427c6b

The following commit has been merged in the master branch:
commit 3427c6b14f9cad1bb704757ab71ad0231ef9131a
Merge: 64ece0f273503881ab90066781916663f2f94e3c ecc4b7ac515da31539d4cf3686d88db7674f0d81
Author: Harald Sitter <sitter at kde.org>
Date:   Tue May 3 11:42:44 2016 +0200

    Merging master into Neon/unstable
    
    # Conflicts:
    #	debian/control
    #	debian/rules

 debian/changelog                        |  18 +++--
 debian/control                          |  30 ++-----
 debian/copyright                        | 133 +++++++++++++++++++++++++++-----
 debian/libkf5activitiesstats-dev.acc.in |   8 +-
 debian/libkf5activitiesstats1.symbols   |   9 +--
 debian/rules                            |   3 -
 debian/tests/acc                        |   7 ++
 debian/upstream/metadata                |   7 ++
 debian/watch                            |   1 -
 9 files changed, 155 insertions(+), 61 deletions(-)

diff --cc debian/changelog
index 57e4044,3fb8ab1..b9d77ce
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,13 +1,19 @@@
+ kactivities-stats (5.21.0-2~~1.gbpc5f84c) UNRELEASED; urgency=medium
+ 
+   ** SNAPSHOT build @c5f84c20fe6b9e4d9974313d8bcd9ce5e9977ed4 **
+ 
+   [ Jonathan Riddell ]
+   * Initial package
+ 
+   [ Maximiliano Curia ]
+   * Change library soversion
+   * debian/copyright fixing some of the wrongly tweaked parts
+   * Update the symbols file
+ 
+  -- Maximiliano Curia <maxy at gnuservers.com.ar>  Mon, 11 Apr 2016 23:11:19 +0200
 +kactivities-stats (5.21.0-0neon) xenial; urgency=medium
 +
 +  * New release
 +
 + -- Neon CI <neon at kde.org>  Mon, 11 Apr 2016 09:21:39 +0000
 +
- kactivities-stats (5.20.0-0) UNRELEASED; urgency=medium
- 
-   * Initial package
- 
-  -- Jonathan Riddell <jr at jriddell.org>  Wed, 09 Mar 2016 12:09:01 +0000

-- 
kactivities-stats packaging