Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-08-06 17:10:55 -04:00
commit 689de126fd
5 changed files with 15 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
debian/control vendored
View file

@ -43,8 +43,7 @@ Depends: apache2,
unzip,
vorbis-tools,
zendframework | libzend-framework-php,
${misc:Depends},
${python:Depends}
${misc:Depends}
Recommends: icecast2
Suggests: airtime-audio-samples,
alsa-utils

6
debian/postinst vendored
View file

@ -12,7 +12,7 @@ includefile="${configdir}/apache.conf"
a2tplfile="${configdir}/apache.vhost.tpl"
phpinifile="${configdir}/airtime.ini"
OLDVERSION="$2"
NEWVERSION="2.1.4"
NEWVERSION="2.2.0"
case "$1" in
configure|reconfigure)
@ -218,10 +218,10 @@ case "$1" in
if [ "${OLDVERSION:0:5}" == "${NEWVERSION}" ] ; then
echo "Reinstallation detected..."
echo | ./airtime-install -rp 2> /var/log/airtime/reinstallation-errors.log
echo | ./airtime-install --disable-deb-check -rp 2> /var/log/airtime/reinstallation-errors.log
else
./airtime-install 2> /var/log/airtime/installation-errors.log
./airtime-install --disable-deb-check 2> /var/log/airtime/installation-errors.log
fi

6
debian/prerm vendored
View file

@ -7,14 +7,10 @@ package_name="airtime"
datadir="/var/lib/${package_name}/tmp"
case "$1" in
remove)
remove|purge)
cd $datadir/install_minimal/ && ./airtime-uninstall || true
;;
purge)
cd $datadir/install_minimal/ && ./airtime-uninstall --purge || true
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;

31
gen-snapshot.sh
View file

@ -34,31 +34,18 @@ rm airtime/airtime_mvc/library/phing/LICENSE
rm airtime/airtime_mvc/library/propel/LICENSE
rm airtime/airtime_mvc/library/soundcloud-api/README.md
# Disable install script check for Debian package, it breaks the .deb install
sed -i '11s:DEB=$(dpkg:# DEB=$(dpkg:g' airtime/install_minimal/airtime-install
sed -i '13s\"$DEB" = "Status: install ok installed"\-f /var/lib/dpkg/info/airtime.config\g' airtime/install_minimal/airtime-install
sed -i '14s: Please use the debian package to upgrade.:..:g' airtime/install_minimal/airtime-install
sed -i '15s:exit 1:# We do not exit here:g' airtime/install_minimal/airtime-install
# Remove Liquidsoap binaries
rm -r airtime/python_apps/pypo/liquidsoap_bin/
# Disable installation of Liquidsoap binaries
# Disable installation of Liquidsoap symlink
sed -i '84s:print:#print:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '86s:binary_path:#binary_path:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '88s:try:#try:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '89s:open:#open:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '91s:try:#try:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '92s:os.remove:#os.remove:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '93s:except:#except:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '95s:pass:#pass:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '97s:os.symlink:#os.symlink:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '98s:except:#except:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '99s: """:""":g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '107s: """:""":g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '108s:print:#print:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '109s:print:#print:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '110s:sys.exit(1):#sys.exit(1):g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '86s:p = Popen:#p = Popen:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '87s:liq_path:#liq_path:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '89s:if p.returncode:#if p.returncode:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '90s:os.symlink:#os.symlink:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '91s:else:#else:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '92s:print:#print:g' airtime/python_apps/pypo/install/pypo-initialize.py
sed -i '93s:sys.exit:#sys.exit:g' airtime/python_apps/pypo/install/pypo-initialize.py
#Remove phing library
rm -r airtime/airtime_mvc/library/phing/
@ -73,7 +60,7 @@ rm -r airtime/install_full/
echo "running the build..."
debuild --no-lintian -b -uc -us $@ || exit
debuild -b -uc -us $@ || exit
exit