summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2016-05-24 23:36:21 +0000
committerintrigeri <intrigeri@boum.org>2016-05-24 23:36:21 +0000
commit215b1536aedd9949fc7cd71cf766bc3708c7f194 (patch)
tree1be10a49d1ee9803f384c15d39f373a8bdcc4e8e
parent898564baca5d06f02dedab6207f5687170148ed9 (diff)
parent3085abf6d60548e2b66a45b8b5064338619e30a7 (diff)
Merge remote-tracking branch 'origin/devel' into devel
-rw-r--r--config/chroot_apt/preferences2
-rwxr-xr-xconfig/chroot_local-hooks/59-libdvd-pkg7
2 files changed, 8 insertions, 1 deletions
diff --git a/config/chroot_apt/preferences b/config/chroot_apt/preferences
index a6c0777..b48fb5f 100644
--- a/config/chroot_apt/preferences
+++ b/config/chroot_apt/preferences
@@ -111,7 +111,7 @@ Pin: release o=TorProject,n=obfs4proxy
Pin-Priority: 990
Package: onioncircuits
-Pin: origin deb.tails.boum.org
+Pin: release o=Debian,n=jessie-backports
Pin-Priority: 999
Package: pinentry-gtk2
diff --git a/config/chroot_local-hooks/59-libdvd-pkg b/config/chroot_local-hooks/59-libdvd-pkg
index 9babf19..2c032b1 100755
--- a/config/chroot_local-hooks/59-libdvd-pkg
+++ b/config/chroot_local-hooks/59-libdvd-pkg
@@ -38,6 +38,13 @@ EOF
)
rm -r "${tmp}" /usr/src/libdvd-pkg
+# Verify installed packages:
+for x in libdvd-pkg
+do
+ dpkg -s $x
+ dpkg-query -W -f='${Version}\n' $x
+done
+
# Remove dangling symlink -- note that we absolutely do not want the
# functionality (automatic checks and upgrades for new css sources)
# that the removed script provides.