[SCM] kmail packaging branch, master, updated. debian/16.04.3-1-115-g2204e19

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 8c8df19de5dfb6497849a84b3b23fbaade1609fa
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Dec 5 12:50:32 2016 +0000

    breaks for file move from kontact
---
 debian/control | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 67dbcb5..ad2cbde 100644
--- a/debian/control
+++ b/debian/control
@@ -124,7 +124,6 @@ Priority: extra
 Depends: kmail, ${misc:Depends}
 Description: transitional package
  This is a transitional package. It can safely be removed.
- .
 
 Package: kmail
 Section: mail
@@ -152,11 +151,13 @@ Suggests: clamav,
           procmail,
           spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114
 Breaks: kdepim-doc (<< ${source:Version}~ciBuild),
+        kontact (<< 4:16.11),
         libkdepim4 (<< 4:4.13.90),
         libkf5libkdepim5 (<= 4:16.04),
         libkf5messageviewer5 (<= 4:16.04),
         libmessageviewer4 (<< 4:4.13.90)
 Replaces: kdepim-doc (<< ${source:Version}~ciBuild),
+          kontact (<< 4:16.11),
           libkdepim4 (<< 4:4.13.90),
           libkf5libkdepim5 (<= 4:16.04),
           libkf5messageviewer5 (<= 4:16.04),
@@ -167,4 +168,3 @@ Description: full featured graphical email client
  KMail supports multiple accounts, mail filtering and email encryption.
  The program let you configure your workflow and it has good integration into
  KDE (Plasma Desktop) but is also useable with other Desktop Envionments.
- .

-- 
kmail packaging