summaryrefslogtreecommitdiffstats
path: root/config/chroot_local-packageslists/tails-common.list
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-10 16:57:54 +0100
committerTails developers <amnesia@boum.org>2015-02-10 16:57:54 +0100
commitc177a22d76c6643b2a8011eec32dd94b668e9200 (patch)
treed651a2bcba74cd2805b0b9eb7edce066ae8a44ba /config/chroot_local-packageslists/tails-common.list
parentf4d1fdd5555229e016a40adca41cbecc9843a2bf (diff)
parentc37b9f1da499e6d8c10a1b4f393d6311b0fca3b4 (diff)
Merge remote-tracking branch 'origin/feature/6241-gnupg2' into devel
Fix-committed: #6241 Conflicts: config/chroot_apt/preferences
Diffstat (limited to 'config/chroot_local-packageslists/tails-common.list')
-rw-r--r--config/chroot_local-packageslists/tails-common.list2
1 files changed, 2 insertions, 0 deletions
diff --git a/config/chroot_local-packageslists/tails-common.list b/config/chroot_local-packageslists/tails-common.list
index c2a593a..ce0df79 100644
--- a/config/chroot_local-packageslists/tails-common.list
+++ b/config/chroot_local-packageslists/tails-common.list
@@ -122,6 +122,7 @@ gnome-themes-standard
gnome-user-guide
gnupg-agent
gnupg-curl
+gnupg2
gobi-loader
gobby-0.5
## breaks lb because of desktop-base.postinst (see Debian bug #467620)
@@ -207,6 +208,7 @@ p7zip-full
resolvconf
rfkill
sane-utils
+scdaemon
scribus
seahorse
seahorse-daemon