Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2012-09-09 01:15:38 +02:00
commit 931ad5d3e9

View file

@ -130,6 +130,7 @@ EOF
$C apt-get update $C apt-get update
[ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata [ $UPSTREAM != hardy ] && $C apt-get --force-yes -y install eatmydata
$C apt-get --force-yes -y dist-upgrade $C apt-get --force-yes -y dist-upgrade
disablescripts
$C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache $C apt-get --force-yes -y install devscripts build-essential liburi-perl python-setuptools pkgbinarymangler wget rpl aptitude quilt fakeroot ccache
$C apt-get clean $C apt-get clean