Bring snapshots up to date with current packaging

This commit is contained in:
Daniel James 2014-12-17 16:01:30 +00:00
parent 8766519c71
commit 7927a035be
12 changed files with 449 additions and 38 deletions

55
debian/changelog vendored
View File

@ -1,8 +1,59 @@
airtime (2.5.1-1) unstable; urgency=low
airtime (2.5.2-1) unstable; urgency=low
* Nightly development snapshot of Airtime 2.5.x series
-- Daniel James <daniel@64studio.com> Thu, 24 Oct 2013 11:04:56 +0100
-- Daniel James <daniel@64studio.com> Wed, 17 Dec 2014 12:06:33 +0000
airtime (2.5.1-6) unstable; urgency=low
* Newer Ubuntu distros use a real directory instead of a symlink for
/etc/php5/apache2/conf.d/ - thanks Mathieu
-- Daniel James <daniel@64studio.com> Wed, 17 Dec 2014 12:06:32 +0000
airtime (2.5.1-5) unstable; urgency=low
* Don't set SSL compression to off, it is now the default, for backwards
compatibility with versions of Apache before 2.2.24 or 2.4.3
-- Daniel James <daniel@64studio.com> Tue, 16 Dec 2014 16:42:26 +0000
airtime (2.5.1-4) unstable; urgency=low
* Fix installation of Apache 2.4 file
* Disable SSLv3 and compression by default
-- Daniel James <daniel@64studio.com> Thu, 06 Nov 2014 15:15:21 +0000
airtime (2.5.1-3) unstable; urgency=low
* Don't force https access in case of SSL issues
-- Daniel James <daniel@64studio.com> Fri, 18 Jul 2014 10:04:30 +0100
airtime (2.5.1-2) unstable; urgency=low
* Upstream 2.5.1a security release
-- Daniel James <daniel@64studio.com> Tue, 15 Jul 2014 11:14:01 +0100
airtime (2.5.1-1) unstable; urgency=low
* Upstream 2.5.1-ga release
-- Daniel James <daniel@64studio.com> Tue, 17 Dec 2013 11:02:35 +0000
airtime (2.5.0-3) unstable; urgency=low
* Added dependency on php5-json for newer distros
-- Daniel James <daniel@64studio.com> Tue, 05 Nov 2013 13:33:10 +0000
airtime (2.5.0-2) unstable; urgency=low
* Fixed error in upgrade handling
-- Daniel James <daniel@64studio.com> Thu, 24 Oct 2013 11:17:42 +0100
airtime (2.5.0-1) unstable; urgency=low

2
debian/compat vendored
View File

@ -1 +1 @@
7
9

33
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: airtime
Section: web
Priority: optional
Maintainer: Daniel James <daniel@64studio.com>
Build-Depends: debhelper (>= 7.0.50~), po-debconf
Build-Depends: debhelper (>= 9.20120909), po-debconf
Standards-Version: 3.9.3
Homepage: http://www.sourcefabric.org/en/airtime/
@ -16,25 +16,38 @@ Depends: apache2,
flac,
gzip (>= 1.3.12),
libapache2-mod-php5,
libcamomile-ocaml-data,
liquidsoap (>= 1.1.1~),
liquidsoap-plugin-alsa,
liquidsoap-plugin-ao,
liquidsoap-plugin-faad,
liquidsoap-plugin-flac,
liquidsoap-plugin-icecast,
liquidsoap-plugin-lame,
liquidsoap-plugin-mad,
liquidsoap-plugin-ogg,
liquidsoap-plugin-opus,
liquidsoap-plugin-portaudio,
liquidsoap-plugin-pulseaudio,
liquidsoap-plugin-taglib,
liquidsoap-plugin-voaacenc,
liquidsoap-plugin-vorbis,
locales,
lsof,
monit,
mp3gain,
multitail,
odbc-postgresql,
patch,
php5-cli,
php5-curl,
php-db,
php5-gd,
php-pear,
php5-json,
php5-pgsql,
php-apc,
php-pear,
pwgen,
python,
rabbitmq-server,
silan (>= 0.3.1~),
ssl-cert,
sudo,
sysv-rc,
tar (>= 1.22),
@ -42,10 +55,10 @@ Depends: apache2,
vorbisgain,
vorbis-tools,
zendframework | libzend-framework-php,
${misc:Depends}
Recommends: icecast2, php-apc
Suggests: airtime-audio-samples,
alsa-utils
${misc:Depends},
${perl:Depends}
Recommends: icecast2
Suggests: airtime-audio-samples, alsa-utils
Description: open broadcast software for scheduling and station management.
Airtime is an open source application that provides remote automation
of a broadcast station.

5
debian/copyright vendored
View File

@ -5,11 +5,11 @@ Source: http://sourceforge.net/projects/airtime/files/
Files: *
Copyright:
2010-2012 Sourcefabric o.p.s
2010-2014 Sourcefabric z.ú.
2004-2009 Media Development Loan Fund
License: GPL-3
Files: airtime/python_apps/pypo/*
Files: python_apps/pypo/*
Copyright:
Jonas Ohrstrom
Paul Baranowski
@ -51,6 +51,7 @@ License: Expat
Files: debian/*
Copyright:
2013-2014 Daniel James <daniel@64studio.com>
2012 Alessio Treglia <alessio@debian.org>
2011 Robin Gareus <robin@gareus.org>
License: GPL-2+

View File

@ -3,3 +3,5 @@ memory_limit = 512M
magic_quotes_gpc = Off
file_uploads = On
upload_tmp_dir = /tmp
apc.write_lock = 1
apc.slam_defense = 0

View File

@ -1,4 +1,10 @@
<VirtualHost *:80>
<VirtualHost *:443>
SSLEngine on
SSLProtocol All -SSLv2 -SSLv3
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
Header always set Strict-Transport-Security "max-age=31536000"
ServerName __SERVER_NAME__
#ServerAlias www.example.com
@ -7,6 +13,22 @@
DocumentRoot /usr/share/airtime/public
DirectoryIndex index.php
<Directory /usr/share/airtime/public>
Options -Indexes FollowSymLinks MultiViews
AllowOverride all
Order allow,deny
Allow from all
</Directory>
</VirtualHost>
<VirtualHost *:80>
ServerName __SERVER_NAME__
ServerAdmin __SERVER_ADMIN__
DocumentRoot /usr/share/airtime/public
Redirect permanent /login https://__SERVER_NAME__/login
SetEnv APPLICATION_ENV "production"
<Directory /usr/share/airtime/public>

37
debian/etc/apache24.vhost.tpl vendored Normal file
View File

@ -0,0 +1,37 @@
<VirtualHost *:443>
SSLEngine on
SSLProtocol all -SSLv2
SSLCertificateFile /etc/ssl/certs/ssl-cert-snakeoil.pem
SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
Header always set Strict-Transport-Security "max-age=31536000"
ServerName __SERVER_NAME__
#ServerAlias www.example.com
ServerAdmin __SERVER_ADMIN__
DocumentRoot /usr/share/airtime/public
DirectoryIndex index.php
<Directory /usr/share/airtime/public>
AllowOverride all
Require all granted
</Directory>
</VirtualHost>
<VirtualHost *:80>
ServerName __SERVER_NAME__
ServerAdmin __SERVER_ADMIN__
DocumentRoot /usr/share/airtime/public
DirectoryIndex index.php
Redirect permanent /login https://__SERVER_NAME__/login
SetEnv APPLICATION_ENV "production"
<Directory /usr/share/airtime/public>
AllowOverride All
Require all granted
</Directory>
</VirtualHost>

2
debian/install vendored
View File

@ -5,9 +5,9 @@ airtime/utils var/lib/airtime/tmp/
airtime/widgets usr/share/doc/airtime/examples/
debian/etc/apache.conf /etc/airtime/
debian/etc/airtime.ini /etc/airtime/
debian/etc/apache.vhost.tpl /etc/airtime/
debian/etc/apache24.vhost.tpl /etc/airtime/
debian/usr/bin/airtime-launch-browser /usr/bin/
debian/usr/share/applications/airtime.desktop /usr/share/applications/

252
debian/po/fr.po vendored Normal file
View File

@ -0,0 +1,252 @@
# Debconf translation strings for Airtime.
# Copyright (C) 2012 Airtime contributors
# This file is distributed under the same license as the Airtime package.
#
# Translators:
# AlbertFR <albert.bruc.ab@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Airtime\n"
"Report-Msgid-Bugs-To: contact@sourcefabric.org\n"
"POT-Creation-Date: 2012-07-05 16:49+0100\n"
"PO-Revision-Date: 2014-11-11 17:40+0000\n"
"Last-Translator: AlbertFR <albert.bruc.ab@gmail.com>\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/airtime/language/fr_FR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: fr_FR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#. Type: select
#. Choices
#: ../templates:1001
msgid "dedicated v-host"
msgstr "v-host dédié"
#. Type: select
#. Choices
#: ../templates:1001
msgid "no thanks"
msgstr "non merci"
#. Type: select
#. Description
#: ../templates:1002
msgid "Create apache2 config:"
msgstr "Création de la configuration d'Apache2 :"
#. Type: select
#. Description
#: ../templates:1002
msgid ""
"This setup script can perform Apache web server configuration so that you "
"can connect to Airtime directly after this installation."
msgstr "Ce script d'installation peut effectuer la configuration du serveur Web Apache de sorte que vous pouvez vous connecter à Airtime directement après cette installation."
#. Type: select
#. Description
#: ../templates:1002
msgid ""
"Production systems should choose \"dedicated v-host\". This option will ask "
"for a server hostname (FQDN) and will create a minimal Apache virtual host "
"configuration that you can adapt."
msgstr "Les systèmes en production doivent choisir \"dedicated v-host\". Cette option vous demandera un nom d'hôte pour le du serveur (FQDN) et créera une configuration d'hôte virtuel Apache minimal que vous pourrez adapter."
#. Type: select
#. Description
#: ../templates:1002
msgid ""
"\"no, thanks\": no problem. You're welcome to set it up however you like. "
"Note that the files in /etc/airtime/ may come in handy doing so."
msgstr "\"Non, merci\": pas de problème. Vous êtes invités à configurer comme bon vous semble. Notez que les fichiers dans /etc/airtime/ peuvent être utiles à modifier..."
#. Type: select
#. Choices
#: ../templates:2001
msgid "remove default"
msgstr "Retirer défaut"
#. Type: select
#. Choices
#: ../templates:2001
msgid "no change"
msgstr "aucun changement"
#. Type: select
#. Description
#: ../templates:2002
msgid "Remove 000-default apache config:"
msgstr "Supprimer 000-default de la configuration d'Apache :"
#. Type: select
#. Description
#: ../templates:2002
msgid ""
"By default the Apache webserver is configured to send all virtual hosts to "
"the /var/www/ directory."
msgstr "Par défaut, le serveur Web Apache est configuré pour envoyer tous les hôtes virtuels vers le répertoire / var / www /."
#. Type: select
#. Description
#: ../templates:2002
msgid ""
"This option will invoke `sudo a2dissite default` and is recommended when "
"using a virtual host for Airtime."
msgstr "Cette option invoque `sudo a2dissite default` et est recommandé lorsque vous utilisez un hôte virtuel pour Airtime."
#. Type: string
#. Description
#: ../templates:3001
msgid "FQDN - Apache virtual host ServerName:"
msgstr "Nom de domaine complet - Nom de l'hôte virtuel du serveur Apache :"
#. Type: string
#. Description
#: ../templates:3001
msgid ""
"Enter the main hostname of the web server. The DNS of this name must resolve"
" to the Apache server running on this machine."
msgstr "Entrez le nom d'hôte principal du serveur web. Le DNS de ce nom doit être résolu par le serveur web Apache en cours d'exécution sur cette machine."
#. Type: string
#. Description
#: ../templates:3001
msgid "e.g. \"example.com\" or \"www.example.com\" (without the quotes)"
msgstr "ex. \"exemple.fr\" ou \"www.exemple.fr\" (sans les guillemets) "
#. Type: string
#. Description
#: ../templates:3001
msgid ""
"You can customize /etc/apache2/sites-enabled/airtime.vhost afterward and add"
" ServerAliases and further custom configuration."
msgstr "Vous pouvez personnaliser /etc/apache2/sites-enabled/airtime.vhost et ajouter des ServerAliases et autres configurations personnalisées."
#. Type: string
#. Description
#: ../templates:4001
msgid "Email of the ServerAdmin:"
msgstr "Courriel de l'administrateur du serveur :"
#. Type: string
#. Description
#: ../templates:4001
msgid "An email address is required for the virtual host configuration."
msgstr "Une adresse de courriel est requise pour la configuration de l'hôte virtuel."
#. Type: boolean
#. Description
#: ../templates:5001
msgid "Enable Icecast2 and set passwords automatically?"
msgstr "Activer Icecast2 et mettre les mots de passe automatiquement ?"
#. Type: boolean
#. Description
#: ../templates:5001
msgid ""
"This option enables a local Icecast streaming media server to start on boot,"
" and configures passwords for both the Icecast server and Airtime."
msgstr "Cette option permet à un serveur Icecast local de s'activer au démarrage, et configure les mots de passe pour le serveur Icecast et Airtime."
#. Type: boolean
#. Description
#: ../templates:5001
msgid ""
"Note: these settings are here for convenience only. Strictly speaking they "
"should be done during Icecast installation - not Airtime installation."
msgstr "Remarque : ces paramètres sont ici pour plus de commodité seulement. Strictement parlant, ils doivent être effectués lors de l'installation d'Icecast - pas pendant l'installation d'Airtime."
#. Type: boolean
#. Description
#: ../templates:5001
msgid ""
"If you wish to set Icecast server passwords manually, you should answer No "
"here."
msgstr "Si vous souhaitez saisir manuellement les mots de passe du serveur Icecast, vous devez répondre Non ici."
#. Type: string
#. Description
#: ../templates:6001
msgid "Icecast2 hostname:"
msgstr "Nom de l'hote d'Icecast2 :"
#. Type: string
#. Description
#: ../templates:6001
msgid ""
"Specify the hostname of the Icecast server. Depending on your setup, this "
"might be the same as the Airtime ServerName. For testing purposes, you can "
"use the default of 'localhost'."
msgstr "Spécifier le nom d'hôte du serveur Icecast. Dépend de vos réglages, celui-ci peut être le même que le nom du serveur Airtime. A des fins de tests, vous pouvez utiliser par défaut 'localhost'."
#. Type: string
#. Description
#: ../templates:7001
msgid "Icecast2 Source Password:"
msgstr "Mot de passe Source Icecast 2 : "
#. Type: string
#. Description
#: ../templates:7001
msgid "Specify a password to send A/V sources to Icecast"
msgstr "Spécifier un mot de passe pour envoyer les sources A/V à Icecast"
#. Type: string
#. Description
#: ../templates:8001
msgid "Icecast2 Relay Password:"
msgstr "Mot de passe Relai d'Icecast2 :"
#. Type: string
#. Description
#: ../templates:8001
msgid ""
"Specify a password for stream relay access. This is not needed by Airtime, "
"however you should change it from the default to lock down your system."
msgstr "Indiquez un mot de passe pour l'accès flux relais. Ce n'est pas nécessaire par Airtime, mais vous pouvez changer la valeur par défaut pour verrouiller votre système."
#. Type: string
#. Description
#: ../templates:9001
msgid "Icecast2 Admin Password:"
msgstr "Mot de passe administrateur Icecast2 :"
#. Type: string
#. Description
#: ../templates:9001
msgid ""
"Specify the admin password for Icecast. You can access icecast2's admin "
"interface via http://localhost:8000/ - and both monitor connection as well "
"as block users."
msgstr "Spécifiez le mot de passe admin pour Icecast. Vous pouvez accéder à l'interface d'administration de icecast2 via http://localhost:8000/ - et surveiller les utilisateurs et flux."
#. Type: string
#. Description
#: ../templates:10001
msgid "Airtime Admin Password:"
msgstr "Mot de passe administrateur Airtime :"
#. Type: string
#. Description
#: ../templates:10001
msgid ""
"Specify a secure admin password for Airtime. You can access the Airtime "
"administration interface at http://localhost/ to set up other user accounts,"
" upload media, create playlists and schedule shows."
msgstr "Indiquez un mot de passe admin sécurisé pour Airtime. Vous pouvez accéder à l'interface d'administration d'Airtime à l'adresse http://localhost/ pour configurer d'autres comptes d'utilisateurs, télécharger des médias, créer des playlists et gérer vos horaires d'émissions."
#. Type: string
#. Description
#: ../templates:11001
msgid "Airtime Storage Directory:"
msgstr "Dossier de stockage Airtime :"
#. Type: string
#. Description
#: ../templates:11001
msgid ""
"Specify the main storage path which Airtime will use, ending with a slash. "
"You can also specify watched folders in the Airtime administration "
"interface."
msgstr "Indiquez le chemin de stockage principal que va utiliser d'Airtime, se terminant par une barre oblique. Vous pouvez également spécifier des dossiers surveillés dans l'interface d'administration d'Airtime."

View File

@ -1,17 +1,17 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# Debconf translation strings for Airtime.
# Copyright (C) 2012 Airtime contributors
# This file is distributed under the same license as the Airtime package.
# Daniel James <daniel@64studio.com>, 2012.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: airtime@packages.debian.org\n"
"Project-Id-Version: Airtime 2.5.1\n"
"Report-Msgid-Bugs-To: contact@sourcefabric.org\n"
"POT-Creation-Date: 2012-07-05 16:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language-Team: Airtime Localization <contact@sourcefabric.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"

55
debian/postinst vendored
View File

@ -12,11 +12,12 @@ fi
wwwdir="/usr/share/airtime"
tmpdir="/var/lib/airtime/tmp"
configdir="/etc/airtime"
includefile="${configdir}/apache.conf"
a2tplfile="${configdir}/apache.vhost.tpl"
a24tplfile="${configdir}/apache24.vhost.tpl"
phpinifile="${configdir}/airtime.ini"
OLDVERSION="$2"
NEWVERSION="2.5.1"
POSTGRESRUNNING=$(invoke-rc.d postgresql status | grep main || true)
case "$1" in
configure|reconfigure)
@ -55,11 +56,23 @@ case "$1" in
db_get airtime/apache-serveradmin
SA=$RET
# create the config directory if it doesn't exist
if [ ! -d /etc/$webserver/sites-available/ ]; then
install -d -m755 /etc/$webserver/sites-available/
fi
sed -e "s/__SERVER_ADMIN__/${SA}/;s/__SERVER_NAME__/${SN}/" \
# check for apache version 2.4, virtualhost syntax is different
APACHEVERSION=$(dpkg-query -f '${Version}' -W 'apache2' | cut -c 1-3)
if [ "$APACHEVERSION" = "2.4" ] ; then
echo "Apache 2.4 detected, using newer access configuration..."
sed -e "s/__SERVER_ADMIN__/${SA}/g;s/__SERVER_NAME__/${SN}/g" \
${a24tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf
else
sed -e "s/__SERVER_ADMIN__/${SA}/g;s/__SERVER_NAME__/${SN}/g" \
${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf
fi
command -v a2ensite > /dev/null
RETVAL=$?
@ -83,11 +96,11 @@ case "$1" in
fi
fi
# enable the rewrite module
# enable the alias, headers, rewrite and ssl modules
command -v a2enmod > /dev/null
RETVAL=$?
if [ $RETVAL -eq 0 ]; then
a2enmod rewrite
a2enmod alias headers rewrite ssl
fi
# remove the default site, if requested to
@ -105,10 +118,21 @@ case "$1" in
if [ ! -d /etc/$php/conf.d/ ]; then
install -d -m755 /etc/$php/conf.d/
fi
# Newer Ubuntu distros use a real directory instead of a symlink for /etc/php5/apache2/conf.d/ - thanks Mathieu!
if [ ! -d /etc/$php/$webserver/conf.d/ ]; then
install -d -m755 /etc/$php/$webserver/conf.d/
fi
if [ ! -e /etc/$php/conf.d/airtime.ini ]; then
ln -s ${phpinifile} /etc/$php/conf.d/airtime.ini
fi
# Newer style configuration
if [ ! -e /etc/$php/$webserver/conf.d/airtime.ini ]; then
ln -s ${phpinifile} /etc/$php/$webserver/conf.d/airtime.ini
fi
# restart apache
invoke-rc.d apache2 restart
fi
@ -228,15 +252,20 @@ case "$1" in
# don't run airtime-install if the user is doing a dpkg-reconfigure
if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then
echo "Reconfiguration complete."
else
# exit here if the current install is too old to be upgraded
elif [ -n "$OLDVERSION" ] && [[ "${OLDVERSION:0:3}" < "2.3" ]]; then
echo "Upgrades from Airtime versions before 2.3.0 are not supported. Please back up your files and perform a clean install."
if [ -n "$OLDVERSION" ] && [[ "${OLDVERSION:0:3}" < "2.1" ]]; then
echo "Upgrades from Airtime versions before 2.1.0 are not supported. Please back up your files and perform a clean install."
elif [ "${APACHESETUP}" == "no thanks" ]; then
# has the user chosen not to configure the web server? If so, don't run airtime-install
elif [ "${APACHESETUP}" == "no thanks" ]; then
echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server."
else
# should postgres not be running yet, don't run airtime-install
elif [ -z "${POSTGRESRUNNING}" ]; then
echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have started the database server."
else
mkdir -p /var/log/airtime
cd $tmpdir/install_minimal/
@ -244,6 +273,11 @@ case "$1" in
if [ "${OLDVERSION:0:5}" == "${NEWVERSION}" ] ; then
echo "Reinstallation detected..."
echo | ./airtime-install --disable-deb-check -rp 2> /var/log/airtime/reinstallation-errors.log
if [ -f /etc/init.d/icecast2 ] ; then
invoke-rc.d icecast2 restart || true
fi
else
./airtime-install --disable-deb-check 2> /var/log/airtime/installation-errors.log
@ -254,7 +288,6 @@ case "$1" in
if test -x /usr/bin/update-menus; then
update-menus;
fi
fi
fi
;;

View File

@ -2,7 +2,7 @@
# Script for generating nightly Airtime snapshot packages
# Run from the directory containg the files checked out from git
VERSION=2.5.1~$(date "+%Y%m%d")
VERSION=2.5.2~$(date "+%Y%m%d")
BUILDDEST=/tmp/airtime-${VERSION}/
DEBDIR=`pwd`/debian
@ -23,9 +23,9 @@ cd ${BUILDDEST} || exit
# Set the version of the snapshot package
sed -i "1s:(2.5.1-1):(${VERSION}):g" debian/changelog
sed -i "1s:(2.5.2-1):(${VERSION}):g" debian/changelog
# FIXES for 2.5.1 #############
# FIXES for 2.5.2 #############
# these are all moved to debian/copyright
rm airtime/python_apps/pypo/LICENSE