[tor-commits] [tor-browser-bundle/master] Bug 18127: install debian-archive-keyring on Ubuntu

[gk at torproject.org]

commit 1bc9c54d1eb82b3da499d49fe9c54e0675b0001b
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Tue Mar 1 12:39:33 2016 +0100

    Bug 18127: install debian-archive-keyring on Ubuntu
    
    The Debian keyring is required by debootstrap when generating a Debian
    chroot.
---
 gitian/check-prerequisites.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitian/check-prerequisites.sh b/gitian/check-prerequisites.sh
index a5f8393..6b88a90 100755
--- a/gitian/check-prerequisites.sh
+++ b/gitian/check-prerequisites.sh
@@ -17,7 +17,7 @@ then
   VERSION=`cat /etc/issue | grep -Eo '[0-9]{2}' | head -1`
   if [ "$VERSION" -ge "14" ];
   then
-    dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion torsocks tor 2>/dev/null >/dev/null
+    dpkg -s ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring torsocks tor 2>/dev/null >/dev/null
 
     if [ $? -ne 0 ];
     then
@@ -25,7 +25,7 @@ then
       echo
       echo "Please run:"
       echo " sudo apt-get install torsocks tor"
-      echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion"
+      echo " sudo torsocks apt-get install ruby apache2 git apt-cacher-ng qemu-kvm virt-what lxc lxctl fakeroot faketime zip unzip subversion debian-archive-keyring"
       exit 1
     fi
   else