Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x

This commit is contained in:
Naomi 2013-10-11 11:08:18 -04:00
commit 2e1cd8c41d
1 changed files with 3 additions and 2 deletions

View File

@ -87,9 +87,10 @@ if [ "$code" != "squeeze" -a "$code" != "lucid" ]; then
apt-get -y --force-yes install libvo-aacenc0
fi
#Install php5-json on Ubuntu Saucy.
#Install some plugin packages on Ubuntu Saucy.
if [ "$dist" = "Ubuntu" -a "$code" = "saucy" ]; then
apt-get -y --force-yes install php5-json
apt-get -y --force-yes install php5-json
apt-get -y --force-yes install liquidsoap-plugin-alsa liquidsoap-plugin-portaudio liquidsoap-plugin-opus
fi
#Install packages back-ported by Sourcefabric