Walter Lapchynski has proposed merging 
~wxl/kubuntu-packaging/+git/kmail:kubuntu_unstable into 
~kubuntu-packagers/kubuntu-packaging/+git/kmail:kubuntu_unstable.

Requested reviews:
  Kubuntu Packagers (kubuntu-packagers)

For more details, see:
https://code.launchpad.net/~wxl/kubuntu-packaging/+git/kmail/+merge/312864

Added ktnef to resolve kmail failing everywhere, e.g.:
http://kci.pangea.pub/job/zesty_unstable_kmail/41/parsed_console/

The list-missing are actually all from ktnef, which used to be part of the 
whole kde-pim module that kmail was split off from. So it needed to be added 
back. This is consistent with a recent commit upstream:
https://cgit.kde.org/kmail.git/commit/?id=789edc81ca2e7852199cf06a7932468dc567aa80

The ktnef.install file was added with the results of list-missing, wildcarded 
out, and ktnef was added to control. Regarding this latter piece, I used the 
Breaks/Replaces version based on what Neon is doing with other packages having 
a similar relationship with kmail:
https://packaging.neon.kde.org/applications/kdepim-addons.git/tree/debian/control
(as an aside, their ktnef is a separate source package)
-- 
Your team Kubuntu Packagers is requested to review the proposed merge of 
~wxl/kubuntu-packaging/+git/kmail:kubuntu_unstable into 
~kubuntu-packagers/kubuntu-packaging/+git/kmail:kubuntu_unstable.
diff --git a/debian/changelog b/debian/changelog
index 1461c06..97d7a21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,4 +7,7 @@ kmail (4:16.08.2-0ubuntu1) UNRELEASED; urgency=medium
   * Fixing packaging
   * Adding lintian-overrides
 
+  [ Walter Lapchynski ]
+  * Added missing ktnef 
+
  -- Simon Quigley <tsimo...@ubuntu.com>  Sat, 29 Oct 2016 20:54:09 -0500
diff --git a/debian/control b/debian/control
index be98d4f..4ef586d 100644
--- a/debian/control
+++ b/debian/control
@@ -142,6 +142,7 @@ Recommends: accountwizard,
             gnupg2,
             kdepim-addons,
             kdepim-themeeditors,
+            ktnef,
             mbox-importer,
             pim-data-exporter,
             pim-sieve-editor,
@@ -167,4 +168,17 @@ 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.
+
+Package: ktnef
+Section: kde
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kmail (<= 4:16.04)
+Replaces: kmail (<= 4:16.04)
+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/ktnef.install b/debian/ktnef.install
new file mode 100644
index 0000000..8c49ebc
--- /dev/null
+++ b/debian/ktnef.install
@@ -0,0 +1,7 @@
+etc/xdg/ktnef.categories
+usr/bin/ktnef
+usr/share/applications/org.kde.ktnef.desktop
+usr/share/doc/HTML/en/ktnef/*
+usr/share/icons/*/*/actions/ktnef_extract_all_to.png
+usr/share/icons/*/*/actions/ktnef_extract_to.png
+usr/share/icons/*/*/apps/ktnef.png
-- 
kubuntu-devel mailing list
kubuntu-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel

Reply via email to