diff options
| author | anonym <anonym@riseup.net> | 2015-04-15 11:33:55 +0200 |
|---|---|---|
| committer | anonym <anonym@riseup.net> | 2015-04-15 11:33:55 +0200 |
| commit | c7a520507fa357ad1158d124a10ce86e95a0199d (patch) | |
| tree | 59a49269e5c711b1efd20a11b1d72744822482df | |
| parent | 6cf35bb001ad6cdac918f6cef0d31c00afba18f6 (diff) | |
| parent | ace47c9f0cdf376f6c8f3bb30cd2eb348e023328 (diff) | |
Merge remote-tracking branch 'origin/feature/remove-msmtp-mutt' into devel
Fix-committed: #8727
| -rwxr-xr-x | config/chroot_local-hooks/98-remove_unwanted_packages | 2 | ||||
| -rw-r--r-- | config/chroot_local-packageslists/tails-common.list | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/config/chroot_local-hooks/98-remove_unwanted_packages b/config/chroot_local-hooks/98-remove_unwanted_packages index 76ba664..a417d41 100755 --- a/config/chroot_local-hooks/98-remove_unwanted_packages +++ b/config/chroot_local-hooks/98-remove_unwanted_packages @@ -27,7 +27,7 @@ apt-get --yes purge \ ### since they have Priority: standard. apt-get --yes purge \ apt-listchanges at bsd-mailx dc debian-faq doc-debian dselect \ - '^exim4*' ftp m4 mlocate ncurses-term nfs-common portmap procmail python-apt \ + '^exim4*' ftp m4 mlocate mutt ncurses-term nfs-common portmap procmail python-apt \ python-reportbug reportbug telnet texinfo time w3m wamerican ### Deinstall some other unwanted packages. diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list index 629df09..e3520b1 100644 --- a/config/chroot_local-packageslists/tails-common.list +++ b/config/chroot_local-packageslists/tails-common.list @@ -169,9 +169,7 @@ monkeysign monkeysphere # our vidialia-wrapper needs lckdo moreutils -msmtp msva-perl -mutt nautilus nautilus-wipe nautilus-gtkhash |