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

Conflicts:
	debian/changelog
This commit is contained in:
Martin Konecny 2013-03-22 14:06:16 -04:00
commit e0583a8b6e
2 changed files with 7 additions and 1 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
airtime (2.4.0-1) unstable; urgency=low
* Nightly development snapshot of Airtime 2.4.x series
-- Daniel James <daniel@64studio.com> Tue, 19 Mar 2013 16:39:23 +0000
airtime (2.3.0-2) unstable; urgency=low
* Don't run the airtime-install script if the user has chosen not to

2
debian/postinst vendored
View file

@ -16,7 +16,7 @@ includefile="${configdir}/apache.conf"
a2tplfile="${configdir}/apache.vhost.tpl"
phpinifile="${configdir}/airtime.ini"
OLDVERSION="$2"
NEWVERSION="2.3.0"
NEWVERSION="2.4.0"
case "$1" in
configure|reconfigure)