Merge branch '1.9.1' into devel
Conflicts: install_full/ubuntu/airtime-full-install utils/airtime-update-db-settings.py
This commit is contained in:
commit
b5684bb5b1
20 changed files with 1921 additions and 46 deletions
|
@ -26,9 +26,14 @@ echo "----------------------------------------------------"
|
|||
apt-get -y install tar gzip curl apache2 php5-pgsql libapache2-mod-php5 \
|
||||
php-pear php5-gd postgresql odbc-postgresql python2.6 lame libsoundtouch-ocaml \
|
||||
libmp3lame-dev libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
|
||||
libesd0 icecast2 sudo libportaudio2 libsamplerate0 rabbitmq-server \
|
||||
libesd0 icecast2 libportaudio2 libsamplerate0 rabbitmq-server patch \
|
||||
php5-curl mpg123 monit python-virtualenv
|
||||
|
||||
#possibly remove?
|
||||
#libvorbis-ocaml-dev
|
||||
#libcamomile-ocaml-dev
|
||||
|
||||
|
||||
if [ "$?" -ne "0" ]; then
|
||||
echo ""
|
||||
echo "There was a problem with apt-get. Please check the above error and try again."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue