summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-08-07 15:25:41 +0200
committeranonym <anonym@riseup.net>2015-08-07 15:25:41 +0200
commita7419ab4bebc4f844e460f460d7d3ab487f81f6a (patch)
treec5004e7ab32ba7a477524aad6bcd0e50374bb3e3 /config/chroot_local-packageslists
parenta2fd0ea3fddd79195673db01dd23f49a45ee7eb0 (diff)
parent502edfcbcf680f3dfb5cceb31fa00779e378e238 (diff)
Merge remote-tracking branch 'origin/testing' into feature/jessie
Conflicts: config/base_branch config/chroot_apt/preferences features/totem.feature
Diffstat (limited to 'config/chroot_local-packageslists')
-rw-r--r--config/chroot_local-packageslists/tails-common.list2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index 461df63..26b8fc0 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -59,6 +59,7 @@ gksu
aircrack-ng
apparmor
+apparmor-profiles
apparmor-profiles-extra
apt-transport-tor
audacity
@@ -213,7 +214,6 @@ syslinux-efi
# ships isohybrid in syslinux 6.x packaging
syslinux-utils
system-config-printer
-systemd
synaptic
torsocks
totem-plugins