summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyril Brulebois <ckb@riseup.net>2018-12-19 01:56:10 +0100
committerCyril Brulebois <ckb@riseup.net>2018-12-19 01:56:10 +0100
commit2ca69178858e5ecbdbd29482bbb49a48176b4d05 (patch)
tree7a0d23e175289d136b3a3cb279039da85d6c1e26
parent86aed73c4343f6030dcf6ce6aa877303d25907ca (diff)
parent535a2d38d9e00f12b0597563ecaa61b7fc9c50ce (diff)
Merge branch 'stable' into devel
Conflicts: debian/changelog
-rw-r--r--config/chroot_apt/preferences3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index 95b9f6d..be804be 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -44,8 +44,9 @@ Package: libfunction-parameters-perl
Pin: release o=Debian,n=stretch-backports
Pin-Priority: 999
+Explanation: freeze exception for #15936. Remove with: git revert $(git blame -L "/#15936/",+1 -l config/chroot_apt/preferences | cut -d' ' -f1)
Package: linux-compiler-* linux-headers-* linux-image-* linux-kbuild-* linux-source-*
-Pin: release o=Debian,n=sid
+Pin: origin deb.tails.boum.org
Pin-Priority: 999
Explanation: We ship our custom-built Thunderbird for now, see #6156