[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=535db5e

The following commit has been merged in the master branch:
commit 535db5e2626403149c7ef59747b05f971424aed0
Author: Raymond Wooninck <tittiatcoke at gmail.com>
Date:   Sat Sep 24 17:53:19 2016 +0200

    Sort files
---
 debian/control       | 33 +++++++++------------------------
 debian/docs          |  1 +
 debian/kmail.install |  4 ++--
 3 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index fd592cd..d6751c6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Uploaders: Sune Vuorela <sune at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.19.0~),
-               kdoctools-dev,
                kross-dev (>= 5.19.0~),
                libassuan-dev,
                libboost-dev (>= 1.40.0-2),
@@ -38,8 +37,10 @@ Build-Depends: cmake (>= 2.8.12~),
                libkf5config-dev (>= 5.19.0~),
                libkf5contacts-dev (>= 15.12~),
                libkf5coreaddons-dev (>= 5.16.0~),
+               libkf5crash-dev (>= 5.19.0~),
                libkf5dbusaddons-dev (>= 5.19.0~),
                libkf5dnssd-dev (>= 5.19.0~),
+               libkf5doctools-dev (>= 5.19.0~),
                libkf5eventviews-dev (>= 5.2.0~),
                libkf5followupreminder-dev (>= 5.2.0~),
                libkf5gapi-dev (>= 5.1~),
@@ -121,7 +122,7 @@ Section: oldlibs
 Architecture: all
 Priority: extra
 Depends: kmail, ${misc:Depends}
-Description:  transitional package
+Description: transitional package
  This is a transitional package. It can safely be removed.
  .
 
@@ -150,16 +151,16 @@ Suggests: clamav,
           kleopatra,
           procmail,
           spamassassin | bogofilter | spambayes (>= 1.0.4-6) | bsfilter | crm114
-Breaks: libkdepim4 (<< 4:4.13.90),
+Breaks: kdepim-doc (<< ${source:Version}~ciBuild),
+        libkdepim4 (<< 4:4.13.90),
         libkf5libkdepim5 (<= 4:16.04),
         libkf5messageviewer5 (<= 4:16.04),
-        libmessageviewer4 (<< 4:4.13.90),
-        kdepim-doc (<< ${source:Version}~ciBuild)
-Replaces: libkdepim4 (<< 4:4.13.90),
+        libmessageviewer4 (<< 4:4.13.90)
+Replaces: kdepim-doc (<< ${source:Version}~ciBuild),
+          libkdepim4 (<< 4:4.13.90),
           libkf5libkdepim5 (<= 4:16.04),
           libkf5messageviewer5 (<= 4:16.04),
-          libmessageviewer4 (<< 4:4.13.90),
-          kdepim-doc (<< ${source:Version}~ciBuild)
+          libmessageviewer4 (<< 4:4.13.90)
 Provides: imap-client, mail-reader
 Homepage: http://kontact.kde.org/kmail/
 Description: full featured graphical email client
@@ -167,19 +168,3 @@ Description: full featured graphical email client
  The program let you configure your workflow and it has good integration into
  KDE (Plasma Desktop) but is also useable with other Desktop Envionments.
  .
-
-# Comment out the below package as that it is not build yet
-#Package: ktnef
-#Section: kde
-#Architecture: any
-#Depends: ${misc:Depends}, ${shlibs:Depends}
-#Breaks: kmail (<< 4:4.14.3)
-#Replaces: kmail (<< 4:4.14.3)
-#Description: Viewer for mail attachments using TNEF format
-# The TNEF File Viewer allows one to handle easily mail attachments using
-# the TNEF format. Those attachments are usually found in mails coming from
-# Microsoft mail servers and embed the mail properties as well as the actual
-# attachments.
-# .
-# An attachment in TNEF format is most often named winmail.dat or win.dat.
-# .
diff --git a/debian/docs b/debian/docs
index e69de29..8b13789 100644
--- a/debian/docs
+++ b/debian/docs
@@ -0,0 +1 @@
+
diff --git a/debian/kmail.install b/debian/kmail.install
index 06e5254..207bb5f 100644
--- a/debian/kmail.install
+++ b/debian/kmail.install
@@ -30,12 +30,12 @@ usr/share/kmail2/pics/pgp-keys.png
 usr/share/knotifications5/akonadi_*.notifyrc
 usr/share/knotifications5/kmail2.notifyrc
 usr/share/kontact/ksettingsdialog/
+usr/share/kservices5/ServiceMenus/kmail_addattachmentservicemenu.desktop
+usr/share/kservices5/kcm_kpimidentities.desktop
 usr/share/kservices5/kcmkmailsummary.desktop
 usr/share/kservices5/kcmkontactsummary.desktop
-usr/share/kservices5/kcm_kpimidentities.desktop
 usr/share/kservices5/kmail_*.desktop
 usr/share/kservices5/kontact/
-usr/share/kservices5/ServiceMenus/kmail_addattachmentservicemenu.desktop
 usr/share/kservicetypes5/dbusmail.desktop
 usr/share/kxmlgui5/kmail2/
 usr/share/kxmlgui5/kontactsummary/kontactsummary_part.rc

-- 
kmail packaging