Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
This commit is contained in:
Martin Konecny
commit
fb2ccc6c46
|
|
@ -141,6 +141,12 @@ Non-linked code:
|
|||
- Web site: http://www.python.org/
|
||||
- License: PSF License. See http://docs.python.org/license.html
|
||||
|
||||
* Silan
|
||||
- What is it: Silence detector
|
||||
- Web site: https://github.com/x42/silan
|
||||
- License: GPL-2+
|
||||
- Compatible with GPLv3? Yes.
|
||||
|
||||
-------------
|
||||
Show Recorder
|
||||
-------------
|
||||
|
|
@ -175,8 +181,6 @@ Non-linked code:
|
|||
- Web site: http://www.python.org/
|
||||
- License: PSF License. See http://docs.python.org/license.html
|
||||
|
||||
* Liquidsoap 1.0.0
|
||||
* Liquidsoap 1.0.1
|
||||
- Web site: http://savonet.sourceforge.net/
|
||||
- License: GPLv2
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -378,10 +378,8 @@ SQL;
|
|||
$row->setDbCliplength($info["cliplength"]);
|
||||
$row->setDbCuein($info["cuein"]);
|
||||
$row->setDbCueout($info["cueout"]);
|
||||
$info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
|
||||
$info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
|
||||
$row->setDbFadein($info["fadein"]);
|
||||
$row->setDbFadeout($info["fadeout"]);
|
||||
$row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]));
|
||||
$row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]));
|
||||
$row->save($this->con);
|
||||
// above save result update on cc_block table on length column.
|
||||
// but $this->block doesn't get updated automatically
|
||||
|
|
|
|||
|
|
@ -348,10 +348,8 @@ SQL;
|
|||
$row->setDbCliplength($info["cliplength"]);
|
||||
$row->setDbCuein($info["cuein"]);
|
||||
$row->setDbCueout($info["cueout"]);
|
||||
$info["fadein"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]);
|
||||
$info["fadeout"] = Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]);
|
||||
$row->setDbFadein($info["fadein"]);
|
||||
$row->setDbFadeout($info["fadeout"]);
|
||||
$row->setDbFadein(Application_Common_DateHelper::secondsToPlaylistTime($info["fadein"]));
|
||||
$row->setDbFadeout(Application_Common_DateHelper::secondsToPlaylistTime($info["fadeout"]));
|
||||
if ($info["ftype"] == "audioclip") {
|
||||
$row->setDbFileId($info["id"]);
|
||||
$type = 0;
|
||||
|
|
|
|||
|
|
@ -1,8 +1,26 @@
|
|||
airtime (2.3.0-1) unstable; urgency=low
|
||||
|
||||
* Nightly development snapshot of Airtime 2.3.x
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Tue, 22 Jan 2013 11:44:57 +0000
|
||||
|
||||
airtime (2.2.1-1) unstable; urgency=low
|
||||
|
||||
* Upstream 2.2.1 release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Tue, 04 Dec 2012 11:10:37 +0000
|
||||
|
||||
airtime (2.2.0-2) unstable; urgency=low
|
||||
|
||||
* Added dependency on flac package for metaflac support
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Mon, 05 Nov 2012 10:54:49 +0000
|
||||
|
||||
airtime (2.2.0-1) unstable; urgency=low
|
||||
|
||||
* Nightly development snapshot of Airtime 2.2.x
|
||||
* Upstream 2.2.0 release
|
||||
|
||||
-- Daniel James <daniel@64studio.com> Thu, 02 Aug 2012 11:19:03 +0100
|
||||
-- Daniel James <daniel@64studio.com> Fri, 26 Oct 2012 10:44:06 +0100
|
||||
|
||||
airtime (2.1.3-2) unstable; urgency=low
|
||||
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ Depends: apache2,
|
|||
pwgen,
|
||||
python,
|
||||
rabbitmq-server,
|
||||
silan,
|
||||
sudo,
|
||||
sysv-rc,
|
||||
tar (>= 1.22),
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ includefile="${configdir}/apache.conf"
|
|||
a2tplfile="${configdir}/apache.vhost.tpl"
|
||||
phpinifile="${configdir}/airtime.ini"
|
||||
OLDVERSION="$2"
|
||||
NEWVERSION="2.2.0"
|
||||
NEWVERSION="2.3.0"
|
||||
|
||||
case "$1" in
|
||||
configure|reconfigure)
|
||||
|
|
@ -126,6 +126,11 @@ case "$1" in
|
|||
ICESOURCE=$RET
|
||||
sed -i "s:'s1_pass', 'hackme', 'string':'s1_pass', '$ICESOURCE', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
|
||||
|
||||
db_get airtime/icecast-adminpw
|
||||
ICEADMIN=$RET
|
||||
sed -i "s:'s1_admin_user', '', 'string':'s1_admin_user', 'admin', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
|
||||
sed -i "s:'s1_admin_pass', '', 'string':'s1_admin_pass', '$ICEADMIN', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql
|
||||
|
||||
else
|
||||
echo "The icecast2 package does not appear to be installed on this server."
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
# Run from the directory containg the files checked out from git
|
||||
|
||||
VERSION=2.3.0~$(date "+%Y%m%d")
|
||||
#VERSION=2.2.0-rc1
|
||||
BUILDDEST=/tmp/airtime-${VERSION}/
|
||||
DEBDIR=`pwd`/debian
|
||||
|
||||
|
|
@ -24,9 +23,9 @@ cd ${BUILDDEST} || exit
|
|||
|
||||
# Set the version of the snapshot package
|
||||
|
||||
sed -i "1s:(2.2.0-1):(${VERSION}):g" debian/changelog
|
||||
sed -i "1s:(2.3.0-1):(${VERSION}):g" debian/changelog
|
||||
|
||||
# FIXES for 2.2.0 #############
|
||||
# FIXES for 2.3.0 #############
|
||||
|
||||
# these are all moved to debian/copyright
|
||||
rm airtime/python_apps/pypo/LICENSE
|
||||
|
|
@ -35,7 +34,7 @@ rm airtime/airtime_mvc/library/phing/LICENSE
|
|||
rm airtime/airtime_mvc/library/propel/LICENSE
|
||||
rm airtime/airtime_mvc/library/soundcloud-api/README.md
|
||||
|
||||
# Remove Liquidsoap binaries
|
||||
# Remove Liquidsoap binary
|
||||
rm -r airtime/python_apps/pypo/liquidsoap_bin/
|
||||
|
||||
#Remove phing library
|
||||
|
|
|
|||
Loading…
Reference in New Issue