summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2015-07-17 16:44:51 +0000
committerintrigeri <intrigeri@boum.org>2015-07-17 16:44:51 +0000
commit2ec8b1f7cb8cb3f64684a6726fef199e62df608c (patch)
treeea355b618b57c109e688a03433fbe80e2fad0ae3
parent3a23d73ba592079c79ccb5077b3247d3af0b4cc1 (diff)
parentfa5bae2929502ac3395c16a3bd1e334b32d84ce9 (diff)
Merge remote-tracking branch 'origin/devel' into bugfix/8007-AppArmor-hardening
Conflicts: config/chroot_apt/preferences
-rw-r--r--config/chroot_apt/preferences8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 24ec719..5b04851 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -142,6 +142,10 @@ Package: libestr0
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999
+Package: libotr5
+Pin: release o=Debian Backports,n=wheezy-backports
+Pin-Priority: 999
+
Package: linux-base
Pin: release o=Debian,n=jessie
Pin-Priority: 999
@@ -218,6 +222,10 @@ Package: obfs4proxy
Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
+Package: pidgin-otr
+Pin: release o=Debian Backports,n=wheezy-backports
+Pin-Priority: 999
+
Package: python-six
Pin: release o=Debian Backports,n=wheezy-backports
Pin-Priority: 999