Merge ~wxl/kubuntu-packaging/+git/kmail:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/kmail:kubuntu_unstable

Proposed by Walter Lapchynski
Status: Merged
Merged at revision: d12d035be7f373f045ec479edfa96ca356b57c3a
Proposed branch: ~wxl/kubuntu-packaging/+git/kmail:kubuntu_unstable
Merge into: ~kubuntu-packagers/kubuntu-packaging/+git/kmail:kubuntu_unstable
Diff against target: 55 lines (+24/-0)
3 files modified
debian/changelog (+3/-0)
debian/control (+14/-0)
debian/ktnef.install (+7/-0)
Reviewer Review Type Date Requested Status
Kubuntu Packagers Pending
Review via email: mp+312864@code.launchpad.net

Description of the change

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)

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 1461c06..97d7a21 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -7,4 +7,7 @@ kmail (4:16.08.2-0ubuntu1) UNRELEASED; urgency=medium
6 * Fixing packaging
7 * Adding lintian-overrides
8
9+ [ Walter Lapchynski ]
10+ * Added missing ktnef
11+
12 -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 29 Oct 2016 20:54:09 -0500
13diff --git a/debian/control b/debian/control
14index be98d4f..4ef586d 100644
15--- a/debian/control
16+++ b/debian/control
17@@ -142,6 +142,7 @@ Recommends: accountwizard,
18 gnupg2,
19 kdepim-addons,
20 kdepim-themeeditors,
21+ ktnef,
22 mbox-importer,
23 pim-data-exporter,
24 pim-sieve-editor,
25@@ -167,4 +168,17 @@ Description: full featured graphical email client
26 KMail supports multiple accounts, mail filtering and email encryption.
27 The program let you configure your workflow and it has good integration into
28 KDE (Plasma Desktop) but is also useable with other Desktop Envionments.
29+
30+Package: ktnef
31+Section: kde
32+Architecture: any
33+Depends: ${misc:Depends}, ${shlibs:Depends}
34+Breaks: kmail (<= 4:16.04)
35+Replaces: kmail (<= 4:16.04)
36+Description: Viewer for mail attachments using TNEF format
37+ The TNEF File Viewer allows one to handle easily mail attachments using
38+ the TNEF format. Those attachments are usually found in mails coming from
39+ Microsoft mail servers and embed the mail properties as well as the actual
40+ attachments.
41 .
42+ An attachment in TNEF format is most often named winmail.dat or win.dat.
43diff --git a/debian/ktnef.install b/debian/ktnef.install
44new file mode 100644
45index 0000000..8c49ebc
46--- /dev/null
47+++ b/debian/ktnef.install
48@@ -0,0 +1,7 @@
49+etc/xdg/ktnef.categories
50+usr/bin/ktnef
51+usr/share/applications/org.kde.ktnef.desktop
52+usr/share/doc/HTML/en/ktnef/*
53+usr/share/icons/*/*/actions/ktnef_extract_all_to.png
54+usr/share/icons/*/*/actions/ktnef_extract_to.png
55+usr/share/icons/*/*/apps/ktnef.png

Subscribers

People subscribed via source and target branches