[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=7a33e35

The following commit has been merged in the master branch:
commit 7a33e35e6daad74b54a6a8ae80e339d88c02378c
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Sun Dec 18 23:20:17 2016 +0000

    transitional for ktnef
---
 debian/control | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index d359569..b37f662 100644
--- a/debian/control
+++ b/debian/control
@@ -125,6 +125,14 @@ Depends: kmail, ${misc:Depends}
 Description: transitional package
  This is a transitional package. It can safely be removed.
 
+Package: ktnef
+Section: oldlibs
+Architecture: all
+Priority: extra
+Depends: kmail, ${misc:Depends}
+Description: transitional package
+ This is a transitional package. It can safely be removed.
+
 Package: kmail
 Section: mail
 Architecture: any
@@ -152,18 +160,18 @@ Suggests: clamav,
           spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114
 Breaks: kdepim-doc (<< 4:16.12.0),
         kontact (<< 4:16.11),
+        ktnef (<< 4:16.12.0),
         libkdepim4 (<< 4:4.13.90),
         libkf5libkdepim5 (<= 4:16.04),
         libkf5messageviewer5 (<= 4:16.04),
         libmessageviewer4 (<< 4:4.13.90)
 Replaces: kdepim-doc (<< 4:16.12.0),
           kontact (<< 4:16.11),
-          ktnef,
+          ktnef (<< 4:16.12.0),
           libkdepim4 (<< 4:4.13.90),
           libkf5libkdepim5 (<= 4:16.04),
           libkf5messageviewer5 (<= 4:16.04),
           libmessageviewer4 (<< 4:4.13.90)
-Conflicts: ktnef
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client

-- 
kmail packaging