[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=962f57d

The following commit has been merged in the master branch:
commit 962f57d19ddbb234d1c7f05517e1d1449178220d
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Dec 9 15:20:07 2016 +0000

    kmail replaces ktnef now
---
 debian/control       |  2 ++
 debian/kmail.install | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/debian/control b/debian/control
index ad2cbde..9e0b539 100644
--- a/debian/control
+++ b/debian/control
@@ -158,10 +158,12 @@ Breaks: kdepim-doc (<< ${source:Version}~ciBuild),
         libmessageviewer4 (<< 4:4.13.90)
 Replaces: kdepim-doc (<< ${source:Version}~ciBuild),
           kontact (<< 4:16.11),
+          ktnef,
           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
diff --git a/debian/kmail.install b/debian/kmail.install
index 970520b..5c2ad03 100644
--- a/debian/kmail.install
+++ b/debian/kmail.install
@@ -1,10 +1,12 @@
 etc/xdg/kmail.categories
 etc/xdg/kmail.renamecategories
+etc/xdg/ktnef.categories
 usr/bin/akonadi_archivemail_agent
 usr/bin/akonadi_followupreminder_agent
 usr/bin/akonadi_mailfilter_agent
 usr/bin/akonadi_sendlater_agent
 usr/bin/kmail
+usr/bin/ktnef
 usr/lib/*/libkmailprivate.so.5*
 usr/lib/*/qt5/plugins/kcm_kmail.so
 usr/lib/*/qt5/plugins/kcm_kmailsummary.so
@@ -16,13 +18,25 @@ usr/lib/*/qt5/plugins/kontact_summaryplugin.so
 usr/share/akonadi/agents/
 usr/share/applications/kmail_view.desktop
 usr/share/applications/org.kde.kmail.desktop
+usr/share/applications/org.kde.ktnef.desktop
 usr/share/config.kcfg/
 usr/share/dbus-1/interfaces/org.kde.kmail.kmail*.xml
 usr/share/doc/HTML/*/akonadi_archivemail_agent/
 usr/share/doc/HTML/*/akonadi_followupreminder_agent/
 usr/share/doc/HTML/*/akonadi_sendlater_agent/
 usr/share/doc/HTML/*/kmail/
+usr/share/doc/HTML/en/ktnef/index.cache.bz2
+usr/share/doc/HTML/en/ktnef/index.docbook
+usr/share/doc/HTML/en/ktnef/mainwindow.png
+usr/share/doc/HTML/en/ktnef/winmail_dat.png
 usr/share/icons/hicolor/*/apps/kmail.png
+usr/share/icons/hicolor/22x22/actions/ktnef_extract_all_to.png
+usr/share/icons/hicolor/22x22/actions/ktnef_extract_to.png
+usr/share/icons/hicolor/48x48/apps/ktnef.png
+usr/share/icons/locolor/16x16/actions/ktnef_extract_all_to.png
+usr/share/icons/locolor/16x16/actions/ktnef_extract_to.png
+usr/share/icons/locolor/16x16/apps/ktnef.png
+usr/share/icons/locolor/32x32/apps/ktnef.png
 usr/share/kconf_update/kmail-15.08-kickoff.sh
 usr/share/kconf_update/kmail.upd
 usr/share/kmail2/pics/pgp-keys.png

-- 
kmail packaging