From e68a0e463e9eb37a6fa36a99d5b04b3339617369 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 6 Aug 2012 11:34:17 +0100 Subject: [PATCH 1/5] Use --disable-deb-check option of install script --- debian/postinst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/postinst b/debian/postinst index 637d9bf52..99291f1b1 100755 --- a/debian/postinst +++ b/debian/postinst @@ -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 From f927b9da679587f32711b26a02ef7f8dc5a99fb2 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 6 Aug 2012 11:35:25 +0100 Subject: [PATCH 2/5] Remove python:Depends as it is unused --- debian/control | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/debian/control b/debian/control index a0a14ce19..97cfca584 100644 --- a/debian/control +++ b/debian/control @@ -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 From b2ef909a9d0e1f7e60f357990d55798afe8adab9 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 6 Aug 2012 14:19:50 +0100 Subject: [PATCH 3/5] Prerm does not support purge option --- debian/prerm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/debian/prerm b/debian/prerm index b8796400d..3cf5a91b6 100755 --- a/debian/prerm +++ b/debian/prerm @@ -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) ;; From c4ac73a750bfb8b33bbd199bdfeaba6b8b693685 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 6 Aug 2012 14:38:10 +0100 Subject: [PATCH 4/5] Remove trailing whitespace --- debian/postrm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/postrm b/debian/postrm index c455121ed..889efc9a1 100755 --- a/debian/postrm +++ b/debian/postrm @@ -103,7 +103,7 @@ case "$1" in dpkg-statoverride --list $datadir &>/dev/null && \ dpkg-statoverride --remove $datadir || true - # Only remove settings if purge is called as an argument + # Only remove settings if purge is called as an argument if [ "$1" = "purge" ]; then echo "Removing configuration files from /etc/airtime/" >&2 rm -rf /etc/airtime || true From 135e40703d1bad3fc39baccca7a956be40e7fe17 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 6 Aug 2012 14:39:26 +0100 Subject: [PATCH 5/5] Disable installation of Liquidsoap symlink --- gen-snapshot.sh | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/gen-snapshot.sh b/gen-snapshot.sh index f7daf9536..d0435e901 100755 --- a/gen-snapshot.sh +++ b/gen-snapshot.sh @@ -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