[SCM] Akonadi packaging branch, kubuntu_unstable, updated. debian/15.08.0-1-47-ge2732da

[Scarlett Clark]

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

The following commit has been merged in the kubuntu_unstable branch:
commit e2732dac286373b8b74557c9e412c5e989fb39dc
Merge: 6b17ff8b0c54db47a816c83304ecd546780e9974 5d918ba7a665b289f64071a33023c4867c78eca5
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Mar 4 16:12:16 2016 -0800

    Fix merger.

 debian/changelog | 5 +++++
 debian/control   | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index ff47eda,eb3b7d6..d1a409b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -15,35 -15,11 +15,40 @@@ akonadi (4:15.12.1-0ubuntu1) UNRELEASED
  
    [ Scarlett Clark ]
    * No changes, trigger rebuild with new kolab. 
 +  * Fix unstable merge. 
 +  
 +  [ Clive Johnston ]
 +  * Adding new build deps
 +  * Fixing install files 
 +
 +  [ Scarlett Clark ]
 +  * Add missing build dependencies (required and optional) 
 +  * Fix install location for -dev. 
 +  * Add the new libraries agentbase, core, widgets, xml and
 +    the relevant install files.  
 +
 +  [ Clive Johnston ]
 +  * Adding install and symbol files which seem to be missing
 +    from previous commit
 +  * Fixing control file for libkf5akonadiserver-dev
 +
 +  [ Scarlett Clark ]
 +  * Add breaks/replace to akonadi-server. Contains file migrated from
 +    kdepimlibs-bin. 
 +
 +  [ Clive Johnston ]
 +  * Refreshing symbols
 +  * Adding qttools5-dev as a build dep
 +  * Adding akonadi5widgets.so to install file
 +
 +  [ Scarlett Clark ]
 +  * Lower the breaks/replace to the version of failure for kdepimlibs-bin 
  
+   [ Scarlett Clark ]
+   * Lower the breaks/replace to the version of failure for kdepimlibs-bin 
+   * Add breaks/replace in archive release. 
++  * Fix merger. 
+ 
   -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:29:44 +0000
  
  akonadi (4:15.08.2-0ubuntu3) xenial; urgency=medium

-- 
Akonadi packaging