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

Proposed by ԜаӀtеr Ⅼарсһуnѕkі
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
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
7 * Fixing packaging7 * Fixing packaging
8 * Adding lintian-overrides8 * Adding lintian-overrides
99
10 [ Walter Lapchynski ]
11 * Added missing ktnef
12
10 -- Simon Quigley <tsimonq2@ubuntu.com> Sat, 29 Oct 2016 20:54:09 -050013 -- Simon Quigley <tsimonq2@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,
142 gnupg2,142 gnupg2,
143 kdepim-addons,143 kdepim-addons,
144 kdepim-themeeditors,144 kdepim-themeeditors,
145 ktnef,
145 mbox-importer,146 mbox-importer,
146 pim-data-exporter,147 pim-data-exporter,
147 pim-sieve-editor,148 pim-sieve-editor,
@@ -167,4 +168,17 @@ Description: full featured graphical email client
167 KMail supports multiple accounts, mail filtering and email encryption.168 KMail supports multiple accounts, mail filtering and email encryption.
168 The program let you configure your workflow and it has good integration into169 The program let you configure your workflow and it has good integration into
169 KDE (Plasma Desktop) but is also useable with other Desktop Envionments.170 KDE (Plasma Desktop) but is also useable with other Desktop Envionments.
171
172Package: ktnef
173Section: kde
174Architecture: any
175Depends: ${misc:Depends}, ${shlibs:Depends}
176Breaks: kmail (<= 4:16.04)
177Replaces: kmail (<= 4:16.04)
178Description: Viewer for mail attachments using TNEF format
179 The TNEF File Viewer allows one to handle easily mail attachments using
180 the TNEF format. Those attachments are usually found in mails coming from
181 Microsoft mail servers and embed the mail properties as well as the actual
182 attachments.
170 .183 .
184 An attachment in TNEF format is most often named winmail.dat or win.dat.
diff --git a/debian/ktnef.install b/debian/ktnef.install
171new file mode 100644185new file mode 100644
index 0000000..8c49ebc
--- /dev/null
+++ b/debian/ktnef.install
@@ -0,0 +1,7 @@
1etc/xdg/ktnef.categories
2usr/bin/ktnef
3usr/share/applications/org.kde.ktnef.desktop
4usr/share/doc/HTML/en/ktnef/*
5usr/share/icons/*/*/actions/ktnef_extract_all_to.png
6usr/share/icons/*/*/actions/ktnef_extract_to.png
7usr/share/icons/*/*/apps/ktnef.png

Subscribers

People subscribed via source and target branches