summaryrefslogtreecommitdiffstats
path: root/config/chroot_apt
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2012-09-29 20:49:58 +0200
committerTails developers <amnesia@boum.org>2012-09-29 20:49:58 +0200
commitc284e7f17756ecb46f80a6ef2bc86a635b7485d7 (patch)
treeffa335ef2c9ffffcb5e59e826a2e2dcd8168039c /config/chroot_apt
parent87a2c0272678a8f36315b0dfef4569ff2744fd8f (diff)
parent705c381cd6c5813c837921dcfc8e7ca17183325a (diff)
Merge branch 'devel' into feature/early_skip_unwanted_packages
Conflicts: config/chroot_apt/preferences
Diffstat (limited to 'config/chroot_apt')
-rw-r--r--config/chroot_apt/preferences8
1 files changed, 0 insertions, 8 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index b953850..df743d3 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -330,14 +330,6 @@ Package: usb-modeswitch-data
Pin: origin backports.debian.org
Pin-Priority: 999
-Package: tor
-Pin: release o=Debian,n=squeeze,l=Debian-Security
-Pin-Priority: 999
-
-Package: tor-geoipdb
-Pin: release o=Debian,n=squeeze,l=Debian-Security
-Pin-Priority: 999
-
Explanation: Unwanted package that tasksel would pull since they have Priority: standard.
Package: apt-listchanges
Pin: release o=Debian