[SCM] akonadi-calendar packaging branch, kubuntu_unstable, updated. debian/15.08.1-1-39-g5a17880

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi-calendar.git;a=commitdiff;h=5a17880

The following commit has been merged in the kubuntu_unstable branch:
commit 5a178803e779ba8c2941c1d2974eea2c5a2fc7dd
Merge: fc3886277f3344b7691ba12101273c7441c21a8e 833473862fdd26c8b7e7376d397f33e868e9ea93
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 4 07:47:01 2016 -0800

    Fix merge.

 debian/changelog                        | 28 ++++++++++++++++-
 debian/control                          | 37 +++++++++++-----------
 debian/copyright                        | 55 +++++++++++++++++++++++----------
 debian/libkf5akonadicalendar-dev.acc.in | 23 ++++++++++++++
 debian/tests/acc                        |  7 +++++
 debian/tests/control                    | 13 ++++----
 6 files changed, 121 insertions(+), 42 deletions(-)

diff --cc debian/changelog
index 635a106,5f9d50c..f70f42f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,15 +1,15 @@@
- akonadi-calendar (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
+ akonadi-calendar (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
  
+   [ Clive Johnston ]
    * New upstream release
  
+   [ Philip Muškovac ]
+   * Merge with debian git master
+ 
+   [ Scarlett Clark ]
+   * Bump build dependency versions. 
 -  * 
++  * Fix merge.
+ 
   -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:21:08 +0000
  
  akonadi-calendar (4:15.08.2-0ubuntu1) wily; urgency=medium

-- 
akonadi-calendar packaging