From 3d0d148169ad4943d1bd28ef4a229b9461c511e6 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 24 Nov 2014 10:44:36 -0500 Subject: [PATCH 1/8] Fix race condition in selenium tests --- tests/selenium/Calendar Add Show Skeleton.html | 6 +++++- tests/selenium/Calendar Skeleton Present.html | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/tests/selenium/Calendar Add Show Skeleton.html b/tests/selenium/Calendar Add Show Skeleton.html index 6ab57a89e..c369c304b 100644 --- a/tests/selenium/Calendar Add Show Skeleton.html +++ b/tests/selenium/Calendar Add Show Skeleton.html @@ -21,6 +21,11 @@ link=Calendar + + waitForTable + css=table.fc-header.0.0 + todayShow + click link=Show @@ -136,7 +141,6 @@ id=add_show_color - diff --git a/tests/selenium/Calendar Skeleton Present.html b/tests/selenium/Calendar Skeleton Present.html index 6aeb2f102..994200394 100644 --- a/tests/selenium/Calendar Skeleton Present.html +++ b/tests/selenium/Calendar Skeleton Present.html @@ -16,16 +16,31 @@ /Library + + selectWindow + null + + clickAndWait link=Calendar + + waitForTable + id=schedule_block_table.0.1 + todayShowNovember 2014dayweekmonthSunMonTueWedThuFriSat26



27



28



29



30



31



1



2



3



4



5



6



7



8



9



10



11



12



13



14



15



16



17



18



19



20



21



22



23



24



25



26



27



28



29



30



1



2



3



4



5



6



11:00 - 15:00Weekend Morning Blues

11:00 - 12:00naregggg

11:00 - 18:00TestNareg

11:00 - 18:00TestNareg

11:50 - 12:55nareg51

11:00 - 18:00TestNareg

11:00 - 16:00Weekend Morning Blues

13:45 - 16:55nareg55

13:45 - 14:57nareg55

15:00 - 15:07nareg88

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues

12:10 - 14:30nareg4

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues

12:10 - 14:30nareg4

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4

22:01 - 23:00Untitled Show

23:00 - 0:00Untitled Show
   

15:00 - 19:00nareg5

11:00 - 16:00Weekend Morning Blues
   

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4
   

15:00 - 19:00nareg5
   

11:00 - 16:00Weekend Morning Blues
   

11:00 - 16:00Weekend Morning Blues
   

12:10 - 14:30nareg4
   

15:00 - 19:00nareg5 + verifyElementPresent id=schedule_calendar + + waitForTable + css=table.fc-header.0.2 + dayweekmonth + verifyElementPresent //div[@id='schedule_calendar']/table/tbody/tr/td[3]/span[3]/span/span @@ -46,7 +61,6 @@ //div[@id='schedule_calendar']/table/tbody/tr/td[3]/span/span/span - From 37e358630d1999dcce423f797c7ed1452fcf068c Mon Sep 17 00:00:00 2001 From: localizer Date: Thu, 27 Nov 2014 14:57:16 +0000 Subject: [PATCH 2/8] updated translation resources --- airtime_mvc/locale/az/LC_MESSAGES/airtime.mo | Bin 474 -> 474 bytes airtime_mvc/locale/az/LC_MESSAGES/airtime.po | 2 +- .../locale/en_GB/LC_MESSAGES/airtime.mo | Bin 61416 -> 61416 bytes .../locale/en_GB/LC_MESSAGES/airtime.po | 2 +- airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo | Bin 69391 -> 69372 bytes airtime_mvc/locale/ja/LC_MESSAGES/airtime.po | 6 +++--- .../locale/pt_BR/LC_MESSAGES/airtime.mo | Bin 57883 -> 57870 bytes .../locale/pt_BR/LC_MESSAGES/airtime.po | 5 +++-- 8 files changed, 8 insertions(+), 7 deletions(-) diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index 053a99b1a5fc3bd50f39cd2cc5545461dc72ea3c..23a98f3a06facf94ddfd429e3c0f84da24e6dc25 100644 GIT binary patch delta 16 Xcmcb`e2aO)CRRgpD+9xg+m#ssG}Hx= delta 16 Xcmcb`e2aO)CRPJWD^rV&+m#ssH5>(= diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po index 20bb72ce5..c131a5523 100644 --- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-11-14 17:01+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 508a78ec1b08b9d57f80d079edbc1eb3f83a5575..12e367d13a3f60dd499c7cb9caac05118b1279ba 100644 GIT binary patch delta 23 fcmaEHpZUdo<_(3jIE>5{3{9*|%{Eug$`1tqewYb$ delta 23 fcmaEHpZUdo<_(3jI1Eh`3=OPIjW$=#$`1tqek%!S diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index 72cfe863e..4bda8e822 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 10:52+0000\n" +"PO-Revision-Date: 2014-11-27 14:56+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.mo index 3ea37cd3b262ae2f56f0b9e865946844313c38a1..696b207b72d1007025b11f395ba8bfbec7c89c29 100644 GIT binary patch delta 16882 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 diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po index b847a5265..d9398df2c 100644 --- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-11-14 16:45+0000\n" +"Last-Translator: asantoni_sourcefabric \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/airtime/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2737,7 +2737,7 @@ msgstr "Liquidsoapに問題があります。" #: airtime_mvc/application/configs/navigation.php:12 msgid "Now Playing" -msgstr "Now Playing" +msgstr "" #: airtime_mvc/application/configs/navigation.php:19 msgid "Add Media" diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 032deff0e1767dda900d6d5f629a0496103ca77d..62d29d3100e676ad4459b52900d821d6d976a77a 100644 GIT binary patch delta 6140 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 l8#sF6_*~yZI`#&%rBa;9C diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index 1ebeb7078..9eb096560 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the Airtime package. # # Translators: +# Felipe Thomaz Pedroni, 2014 # Pedro Garbellini da Silva , 2014 # Sourcefabric , 2012 msgid "" @@ -10,8 +11,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-11-18 01:50+0000\n" +"Last-Translator: Felipe Thomaz Pedroni\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" From cceddd57d8477f25d8620c007ad2be9c64070d4a Mon Sep 17 00:00:00 2001 From: localizer Date: Fri, 5 Dec 2014 10:33:17 +0000 Subject: [PATCH 3/8] updated translation resources --- airtime_mvc/locale/az/LC_MESSAGES/airtime.mo | Bin 474 -> 474 bytes airtime_mvc/locale/az/LC_MESSAGES/airtime.po | 2 +- .../locale/de_AT/LC_MESSAGES/airtime.mo | Bin 63465 -> 63465 bytes .../locale/de_AT/LC_MESSAGES/airtime.po | 2 +- .../locale/en_GB/LC_MESSAGES/airtime.mo | Bin 61416 -> 61416 bytes .../locale/en_GB/LC_MESSAGES/airtime.po | 2 +- .../locale/hy_AM/LC_MESSAGES/airtime.mo | Bin 487 -> 487 bytes .../locale/hy_AM/LC_MESSAGES/airtime.po | 2 +- airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo | Bin 464 -> 464 bytes airtime_mvc/locale/ka/LC_MESSAGES/airtime.po | 2 +- .../locale/pt_BR/LC_MESSAGES/airtime.mo | Bin 57870 -> 57870 bytes .../locale/pt_BR/LC_MESSAGES/airtime.po | 2 +- 12 files changed, 6 insertions(+), 6 deletions(-) diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/az/LC_MESSAGES/airtime.mo index 23a98f3a06facf94ddfd429e3c0f84da24e6dc25..6785de6785149cddaf880a948303f9c10017b49c 100644 GIT binary patch delta 21 ccmcb`e2aO)S}r4915*V<11n>rjoXzO0ZxPlasU7T delta 21 ccmcb`e2aO)S}sFfLlXr\n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/airtime/language/az/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.mo index 63f34c90b06ae024f66f0ee2fa3b0277915c3f93..76942ed77169f8cb72764aaff613ab588c18a207 100644 GIT binary patch delta 25 hcmaF)p84f_<_#Ywa~bIxm?{_=SQ#5_{yq6!G60;{3u^!X delta 25 hcmaF)p84f_<_#Ywa~bLynkX1pTA5mG{yq6!G60=I3wi(m diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po index 332e5e7ca..d9ad52eea 100644 --- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: German (Austria) (http://www.transifex.com/projects/p/airtime/language/de_AT/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.mo index 12e367d13a3f60dd499c7cb9caac05118b1279ba..4ca8d6170c591ca8352b180d8743e6454998c90c 100644 GIT binary patch delta 25 hcmaEHpZUdo<_-C?xQuiSOce|btc;B|SI){01ptmL3B~{b delta 25 hcmaEHpZUdo<_-C?xD0iT%oPkxtW3=|SI){01ptnj3DW=o diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po index 4bda8e822..c17dfe604 100644 --- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-27 14:56+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/airtime/language/en_GB/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.mo index 8071b842605e57e82e35bc6a841a38df50ad8afd..114eb85d3a4f4bb0562bd40b8d65cead176f84ef 100644 GIT binary patch delta 21 ccmaFP{G55hS}r4915*V<11n>rjoS?v0Z^s}nE(I) delta 21 ccmaFP{G55hS}sFfLlXr9ODj{0joS?v0Z{@5r~m)} diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po index 53eec4c52..4b1c353b4 100644 --- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/airtime/language/hy_AM/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.mo index e6fb352ce67bbf31d430a99d83d12ff86f5ee15c..1cd4bb1acc82b4cd0c1fbbd2905c7f1a2fb944b6 100644 GIT binary patch delta 21 ccmcb>e1UnwS}r4915*V<11n>rjoT#|0ZiZqQ~&?~ delta 21 ccmcb>e1UnwS}sFfLlXr9ODj{0joT#|0ZlvxV*mgE diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po index d2735f640..6cfc03736 100644 --- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Daniel James \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/airtime/language/ka/)\n" "MIME-Version: 1.0\n" diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.mo index 62d29d3100e676ad4459b52900d821d6d976a77a..abd94d09de69dd70d843750bc615c04bec577c82 100644 GIT binary patch delta 25 gcmeA>!rXU+d4op>myxc4se++_m9f$0ppHF}0Cd9$y8r+H delta 25 gcmeA>!rXU+d4op>m!Ynqg@S>hm8rqzppHF}0CeUEz5oCK diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po index 9eb096560..84a24f16f 100644 --- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-18 01:50+0000\n" +"PO-Revision-Date: 2014-12-05 10:32+0000\n" "Last-Translator: Felipe Thomaz Pedroni\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/airtime/language/pt_BR/)\n" "MIME-Version: 1.0\n" From 3b88b0ce22c2025b448f682283211468b84d7fe8 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 15 Dec 2014 10:42:45 -0500 Subject: [PATCH 4/8] Boost the Opus sound quality --- python_apps/pypo/liquidsoap_scripts/opus.liq | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq index 36082c6fd..9cd81c627 100644 --- a/python_apps/pypo/liquidsoap_scripts/opus.liq +++ b/python_apps/pypo/liquidsoap_scripts/opus.liq @@ -1,68 +1,68 @@ if bitrate == 24 then if stereo then - ignore(output_stereo(%opus(bitrate = 24, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 24, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 24, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 24, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 32 then if stereo then - ignore(output_stereo(%opus(bitrate = 32, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 32, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 32, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 32, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 48 then if stereo then - ignore(output_stereo(%opus(bitrate = 48, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 48, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 48, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 48, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 64 then if stereo then - ignore(output_stereo(%opus(bitrate = 64, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 64, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 64, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 64, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 96 then if stereo then - ignore(output_stereo(%opus(bitrate = 96, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 96, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 96, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 96, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 128 then if stereo then - ignore(output_stereo(%opus(bitrate = 128, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 128, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 128, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 128, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 160 then if stereo then - ignore(output_stereo(%opus(bitrate = 160, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 160, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 160, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 160, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 192 then if stereo then - ignore(output_stereo(%opus(bitrate = 192, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 192, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 192, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 192, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 224 then if stereo then - ignore(output_stereo(%opus(bitrate = 224, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 224, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 224, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 224, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 256 then if stereo then - ignore(output_stereo(%opus(bitrate = 256, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 256, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 256, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 256, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end elsif bitrate == 320 then if stereo then - ignore(output_stereo(%opus(bitrate = 320, channels = 2), !source)) + ignore(output_stereo(%opus(bitrate = 320, channels = 2, signal="music", application="audio", complexity=10), !source)) else - ignore(output_mono(%opus(bitrate = 320, channels = 1), mean(!source))) + ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) end end From 8766519c71d4836241825ef43141cc76dad0f339 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 15 Dec 2014 10:49:21 -0500 Subject: [PATCH 5/8] Another tweak to Opus sound quality. Liquidsoap picks undocumented poor defaults for almost every encoder. --- python_apps/pypo/liquidsoap_scripts/opus.liq | 44 ++++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/opus.liq b/python_apps/pypo/liquidsoap_scripts/opus.liq index 9cd81c627..3ad6f6c55 100644 --- a/python_apps/pypo/liquidsoap_scripts/opus.liq +++ b/python_apps/pypo/liquidsoap_scripts/opus.liq @@ -1,68 +1,68 @@ if bitrate == 24 then if stereo then - ignore(output_stereo(%opus(bitrate = 24, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 24, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 24, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 24, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 32 then if stereo then - ignore(output_stereo(%opus(bitrate = 32, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 32, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 32, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 32, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 48 then if stereo then - ignore(output_stereo(%opus(bitrate = 48, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 48, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 48, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 48, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 64 then if stereo then - ignore(output_stereo(%opus(bitrate = 64, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 64, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 64, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 64, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 96 then if stereo then - ignore(output_stereo(%opus(bitrate = 96, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 96, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 96, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 96, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 128 then if stereo then - ignore(output_stereo(%opus(bitrate = 128, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 128, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 128, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 128, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 160 then if stereo then - ignore(output_stereo(%opus(bitrate = 160, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 160, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 160, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 160, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 192 then if stereo then - ignore(output_stereo(%opus(bitrate = 192, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 192, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 192, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 192, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 224 then if stereo then - ignore(output_stereo(%opus(bitrate = 224, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 224, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 224, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 224, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 256 then if stereo then - ignore(output_stereo(%opus(bitrate = 256, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 256, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 256, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 256, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end elsif bitrate == 320 then if stereo then - ignore(output_stereo(%opus(bitrate = 320, channels = 2, signal="music", application="audio", complexity=10), !source)) + ignore(output_stereo(%opus(bitrate = 320, channels = 2, signal="music", application="audio", complexity=10, vbr="constrained"), !source)) else - ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10), mean(!source))) + ignore(output_mono(%opus(bitrate = 320, channels = 1, signal="music", application="audio", complexity=10, vbr="constrained"), mean(!source))) end end From 70a2190494cb58fb5fa9ffba4f40dde6a4b64c77 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Mon, 15 Dec 2014 17:18:02 -0500 Subject: [PATCH 6/8] Close file descriptors in airtime_analyzer before forking subprocesses --- .../airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py | 4 ++-- .../airtime_analyzer/airtime_analyzer/playability_analyzer.py | 2 +- .../airtime_analyzer/airtime_analyzer/replaygain_analyzer.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py index b5492ebe9..6b461f050 100644 --- a/python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py +++ b/python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py @@ -26,7 +26,7 @@ class CuePointAnalyzer(Analyzer): ''' command = [CuePointAnalyzer.SILAN_EXECUTABLE, '-b', '-F', '0.99', '-f', 'JSON', filename] try: - results_json = subprocess.check_output(command, stderr=subprocess.STDOUT) + results_json = subprocess.check_output(command, stderr=subprocess.STDOUT, close_fds=True) silan_results = json.loads(results_json) metadata['length_seconds'] = float(silan_results['file duration']) # Conver the length into a formatted time string @@ -42,4 +42,4 @@ class CuePointAnalyzer(Analyzer): except Exception as e: logging.warn(e) - return metadata \ No newline at end of file + return metadata diff --git a/python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py index 0a3656296..ec102eeb2 100644 --- a/python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py +++ b/python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py @@ -21,7 +21,7 @@ class PlayabilityAnalyzer(Analyzer): ''' command = [PlayabilityAnalyzer.LIQUIDSOAP_EXECUTABLE, '-v', '-c', "output.dummy(audio_to_stereo(single('%s')))" % filename] try: - subprocess.check_output(command, stderr=subprocess.STDOUT) + subprocess.check_output(command, stderr=subprocess.STDOUT, close_fds=True) except OSError as e: # liquidsoap was not found logging.warn("Failed to run: %s - %s. %s" % (command[0], e.strerror, "Do you have liquidsoap installed?")) diff --git a/python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py b/python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py index 396d0d5ad..39ea2e439 100644 --- a/python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py +++ b/python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py @@ -19,7 +19,7 @@ class ReplayGainAnalyzer(Analyzer): ''' command = [ReplayGainAnalyzer.REPLAYGAIN_EXECUTABLE, '-d', filename] try: - results = subprocess.check_output(command, stderr=subprocess.STDOUT) + results = subprocess.check_output(command, stderr=subprocess.STDOUT, close_fds=True) filename_token = "%s: " % filename rg_pos = results.find(filename_token, results.find("Calculating Replay Gain information")) + len(filename_token) db_pos = results.find(" dB", rg_pos) @@ -33,4 +33,4 @@ class ReplayGainAnalyzer(Analyzer): except Exception as e: logging.warn(e) - return metadata \ No newline at end of file + return metadata From e29675a6b4367fcf687056c15ded4ce20c1e2022 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 17 Dec 2014 11:31:10 -0500 Subject: [PATCH 7/8] Remove debian/ directory and gen-snapshot. They're moving to the packaging repo. --- debian/changelog | 343 ------------------ debian/compat | 1 - debian/config | 46 --- debian/control | 67 ---- debian/copyright | 156 -------- debian/docs | 4 - debian/etc/airtime.ini | 5 - debian/etc/apache.conf | 11 - debian/etc/apache.vhost.tpl | 18 - debian/gbp.conf | 3 - debian/install | 17 - debian/po/POTFILES.in | 1 - debian/po/templates.pot | 249 ------------- debian/postinst | 273 -------------- debian/postrm | 130 ------- debian/preinst | 33 -- debian/prerm | 25 -- debian/rules | 9 - debian/source/format | 1 - debian/source/include-binaries | 5 - debian/templates | 109 ------ debian/usr/bin/airtime-launch-browser | 26 -- debian/usr/share/applications/airtime.desktop | 8 - debian/usr/share/man/man1/airtime-import.1.gz | Bin 994 -> 0 bytes .../man/man1/airtime-launch-browser.1.gz | Bin 547 -> 0 bytes debian/usr/share/man/man1/airtime-log.1.gz | Bin 736 -> 0 bytes .../man/man1/airtime-test-soundcard.1.gz | Bin 626 -> 0 bytes .../share/man/man1/airtime-test-stream.1.gz | Bin 723 -> 0 bytes debian/usr/share/menu/airtime | 6 - debian/usr/share/pixmaps/airtime.xpm | 50 --- debian/watch | 2 - gen-snapshot.sh | 61 ---- 32 files changed, 1659 deletions(-) delete mode 100644 debian/changelog delete mode 100644 debian/compat delete mode 100644 debian/config delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100644 debian/etc/airtime.ini delete mode 100644 debian/etc/apache.conf delete mode 100644 debian/etc/apache.vhost.tpl delete mode 100644 debian/gbp.conf delete mode 100644 debian/install delete mode 100644 debian/po/POTFILES.in delete mode 100644 debian/po/templates.pot delete mode 100755 debian/postinst delete mode 100755 debian/postrm delete mode 100755 debian/preinst delete mode 100755 debian/prerm delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/source/include-binaries delete mode 100644 debian/templates delete mode 100755 debian/usr/bin/airtime-launch-browser delete mode 100644 debian/usr/share/applications/airtime.desktop delete mode 100644 debian/usr/share/man/man1/airtime-import.1.gz delete mode 100644 debian/usr/share/man/man1/airtime-launch-browser.1.gz delete mode 100644 debian/usr/share/man/man1/airtime-log.1.gz delete mode 100644 debian/usr/share/man/man1/airtime-test-soundcard.1.gz delete mode 100644 debian/usr/share/man/man1/airtime-test-stream.1.gz delete mode 100644 debian/usr/share/menu/airtime delete mode 100644 debian/usr/share/pixmaps/airtime.xpm delete mode 100644 debian/watch delete mode 100755 gen-snapshot.sh diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 31d2f92ca..000000000 --- a/debian/changelog +++ /dev/null @@ -1,343 +0,0 @@ -airtime (2.5.1-1) unstable; urgency=low - - * Nightly development snapshot of Airtime 2.5.x series - - -- Daniel James Thu, 24 Oct 2013 11:04:56 +0100 - -airtime (2.5.0-1) unstable; urgency=low - - * Upstream 2.5.0-ga release - - -- Daniel James Wed, 23 Oct 2013 14:56:21 +0100 - -airtime (2.4.1-1) unstable; urgency=low - - * Upstream 2.4.1-ga release - - -- Daniel James Wed, 28 Aug 2013 11:53:10 +0100 - -airtime (2.4.0-1) unstable; urgency=low - - * Upstream 2.4.0-ga release - - -- Daniel James Tue, 25 Jun 2013 14:26:55 +0100 - -airtime (2.3.1-1) unstable; urgency=low - - * Upstream 2.3.1 release - - -- Daniel James Wed, 20 Mar 2013 09:43:15 +0000 - -airtime (2.3.0-2) unstable; urgency=low - - * Don't run the airtime-install script if the user has chosen not to - set up Apache - - -- Daniel James Tue, 19 Mar 2013 16:39:23 +0000 - -airtime (2.3.0-1) unstable; urgency=low - - * Upstream 2.3.0 release - - -- Daniel James Tue, 12 Feb 2013 11:44:57 +0000 - -airtime (2.2.1-1) unstable; urgency=low - - * Upstream 2.2.1 release - - -- Daniel James 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 Mon, 05 Nov 2012 10:54:49 +0000 - -airtime (2.2.0-1) unstable; urgency=low - - * Upstream 2.2.0 release - - -- Daniel James Fri, 26 Oct 2012 10:44:06 +0100 - -airtime (2.1.3-2) unstable; urgency=low - - * Use a debconf question to set storage directory (CC-3576) - - -- Daniel James Tue, 24 Jul 2012 14:55:13 +0100 - -airtime (2.1.3-1) unstable; urgency=low - - * Upstream 2.1.3 release - * Prompt user to answer No to set Icecast passwords manually (CC-4013) - - -- Daniel James Thu, 05 Jul 2012 17:01:20 +0100 - -airtime (2.1.2-1) unstable; urgency=low - - * Upstream 2.1.2 release - - -- Daniel James Mon, 18 Jun 2012 10:01:43 +0100 - -airtime (2.1.1-1) unstable; urgency=low - - * Upstream 2.1.1 release - - -- Daniel James Thu, 14 Jun 2012 09:56:38 +0100 - -airtime (2.1.0-1) unstable; urgency=low - - * Upstream 2.1.0 release - * Test the symlink to the Liquidsoap binary - - -- Daniel James Mon, 04 June 2012 18:25:11 +0100 - -airtime (2.0.3-1) unstable; urgency=low - - * Upstream 2.0.3 release - * Added Apache license to copyright file - - -- Daniel James Wed, 04 Apr 2012 11:11:15 +0100 - -airtime (2.0.2-1) unstable; urgency=low - - * Upstream 2.0.2 release - * Strip install_full scripts from tarball - - -- Daniel James Wed, 29 Feb 2012 10:34:35 +0000 - -airtime (2.0.1-1) unstable; urgency=low - - * Upstream 2.0.1 release - * Strip ZFDebug library from tarball - * Depend on distro's package of Zend - - -- Daniel James Wed, 15 Feb 2012 12:57:23 +0000 - -airtime (2.0.0-5) unstable; urgency=low - - * Strip phing library from tarball - - -- Daniel James Wed, 01 Feb 2012 15:50:18 +0000 - -airtime (2.0.0-4) unstable; urgency=low - - * Fix for overbooked shows longer than 24 hours - - -- Daniel James Wed, 25 Jan 2012 10:11:33 +0000 - -airtime (2.0.0-3) unstable; urgency=low - - * Upstream 2.0.0 final release - - -- Daniel James Fri, 20 Jan 2012 12:03:55 +0000 - -airtime (2.0.0-2) unstable; urgency=low - - * Upstream 2.0.0-RC1 release - - -- Daniel James Mon, 16 Jan 2012 15:41:15 +0000 - -airtime (2.0.0-1) unstable; urgency=low - - * Upstream 2.0.0-beta2 release - - -- Daniel James Thu, 05 Jan 2012 17:15:07 +0000 - -airtime (1.9.5-3) unstable; urgency=low - - * Upstream 1.9.5-RC5 release - - -- Daniel James Mon, 14 Nov 2011 10:34:51 +0000 - -airtime (1.9.5-2) unstable; urgency=low - - * Upstream 1.9.5-RC2 release - - -- Daniel James Wed, 09 Nov 2011 17:09:07 +0000 - -airtime (1.9.5-1) unstable; urgency=low - - * Upstream 1.9.5-RC1 release - - -- Daniel James Mon, 07 Nov 2011 16:16:57 +0000 - -airtime (1.9.4-13) unstable; urgency=low - - * Increase PHP memory limit to more than post_max_size - - -- Daniel James Mon, 03 Oct 2011 17:29:05 +0100 - -airtime (1.9.4-12) unstable; urgency=low - - * Use invoke-rc.d rather than wwwconfig-common - - -- Daniel James Fri, 30 Sep 2011 16:52:28 +0100 - -airtime (1.9.4-11) unstable; urgency=low - - * Insist on python-virtualenv 1.4.9 or later - - -- Daniel James Wed, 28 Sep 2011 14:45:19 +0100 - -airtime (1.9.4-10) unstable; urgency=low - - * Install python-virtualenv as a Pre-Depends - - -- Daniel James Tue, 27 Sep 2011 11:04:29 +0100 - -airtime (1.9.4-9) unstable; urgency=low - - * Add dependency on ed, configure monit without asking - - -- Daniel James Mon, 26 Sep 2011 10:55:09 +0100 - -airtime (1.9.4-8) unstable; urgency=low - - * Upstream 1.9.4-RC9 release - - -- Daniel James Fri, 23 Sep 2011 14:37:15 +0100 - -airtime (1.9.4-7) unstable; urgency=low - - * Don't depend on Ruby packages - - -- Daniel James Thu, 22 Sep 2011 15:51:42 +0100 - -airtime (1.9.4-6) unstable; urgency=low - - * Upstream 1.9.4-RC8 release - - -- Daniel James Wed, 21 Sep 2011 16:22:57 +0100 - -airtime (1.9.4-5) unstable; urgency=low - - * Upstream 1.9.4-RC7 release - - -- Daniel James Tue, 20 Sep 2011 20:12:24 +0100 - -airtime (1.9.4-4) unstable; urgency=low - - * Upstream 1.9.4-RC6 release - - -- Daniel James Tue, 20 Sep 2011 11:48:38 +0100 - -airtime (1.9.4-3) unstable; urgency=low - - * Upstream 1.9.4-RC3 release - - -- Daniel James Thu, 15 Sep 2011 10:28:22 +0100 - -airtime (1.9.4-2) unstable; urgency=low - - * Upstream 1.9.4-RC2 release - - -- Daniel James Wed, 14 Sep 2011 15:18:20 +0100 - -airtime (1.9.4-1) unstable; urgency=low - - * Upstream 1.9.4-RC1 release - - -- Daniel James Tue, 13 Sep 2011 14:50:02 +0100 - -airtime (1.9.3-4) unstable; urgency=low - - * Improvements to package error logging - - -- Daniel James Mon, 05 Sep 2011 16:02:21 +0100 - -airtime (1.9.3-3) unstable; urgency=low - - * Updated dependency list - - -- Daniel James Sat, 03 Sep 2011 11:29:26 +0100 - -airtime (1.9.3-2) unstable; urgency=low - - * Fixed reconfigure action so that airtime-install does not run again - - -- Daniel James Tue, 30 Aug 2011 17:48:49 +0100 - -airtime (1.9.3-1) unstable; urgency=low - - * upstream 1.9.3 - - -- Daniel James Sat, 27 Aug 2011 12:58:46 +0100 - -airtime (1.9.2-2) unstable; urgency=low - - * upstream 1.9.2 - - -- Daniel James Wed, 24 Aug 2011 12:26:57 +0100 - -airtime (1.9.2-1) unstable; urgency=low - - * upstream 1.9.2-RC1 - - -- Daniel James Tue, 23 Aug 2011 15:49:31 +0100 - -airtime (1.9.1-1) unstable; urgency=low - - * upstream 1.9.1 - - -- Daniel James Mon, 22 Aug 2011 11:04:33 +0100 - -airtime (1.9.0-1) unstable; urgency=low - - * upstream 1.9.0 - - -- Daniel James Fri, 12 Aug 2011 14:11:21 +0100 - -airtime (1.8.2-4) unstable; urgency=low - - * upstream 1.8.2-RC4 - - -- Robin Gareus Tue, 07 Jun 2011 21:45:55 +0200 - -airtime (1.8.2-3) unstable; urgency=low - - * upstream 1.8.2-RC3 - - -- Robin Gareus Tue, 07 Jun 2011 02:56:12 +0200 - -airtime (1.8.2-2) unstable; urgency=low - - * fixed postinst - - -- Robin Gareus Wed, 01 Jun 2011 20:48:29 +0200 - -airtime (1.8.2-1) unstable; urgency=low - - * upstream 1.8.2-RC2 release - - -- Robin Gareus Wed, 01 Jun 2011 16:21:40 +0200 - -airtime (1.8.1-1) unstable; urgency=low - - * upstream 1.8.1 release - - -- Robin Gareus Wed, 11 May 2011 22:50:03 +0200 - -airtime (1.8.0-1) unstable; urgency=low - - * upstream 1.8.0 release - - -- Robin Gareus Tue, 19 Apr 2011 15:44:40 +0200 - -airtime (1.7.0-2) unstable; urgency=low - - * fixed few lintian warnings - * allow to de-install apache 000default - - -- Robin Gareus Tue, 05 Apr 2011 20:45:52 +0200 - -airtime (1.7.0-1) unstable; urgency=low - - * upstream 1.7.0-GA release - - -- Robin Gareus Mon, 04 Apr 2011 21:19:56 +0200 - -airtime (1.6.1-1) unstable; urgency=low - - * initial package - - -- Robin Gareus Sat, 02 Apr 2011 22:48:35 +0200 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011eb..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/config b/debian/config deleted file mode 100644 index 553a85fd1..000000000 --- a/debian/config +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash -# Debconf config script for airtime - -set -e - -. /usr/share/debconf/confmodule - -db_input high airtime/apache-setup || true -db_go ||true - -db_get airtime/apache-setup -if [ "$RET" = "dedicated v-host" ]; then - db_input high airtime/apache-servername || true - db_go ||true - db_input high airtime/apache-serveradmin || true - db_go ||true - db_input high airtime/apache-deldefault || true - db_go ||true -fi - -db_input high airtime/icecast-setup || true -db_go ||true - -db_get airtime/icecast-setup -if [ "$RET" = "true" ]; then - db_input high airtime/icecast-hostname || true - db_go ||true - db_input high airtime/icecast-sourcepw || true - db_go ||true - db_input high airtime/icecast-relaypw || true - db_go ||true - db_input high airtime/icecast-adminpw || true - db_go ||true -fi - -# Only ask for storage directory and admin password on clean installs -if [ ! -e /var/log/airtime/pypo/pypo.log ]; then - db_input high airtime/storage-directory || true - db_go ||true - db_input high airtime/admin-password || true - db_go ||true -fi - -#DEBHELPER# - -exit 0 diff --git a/debian/control b/debian/control deleted file mode 100644 index 92479d53b..000000000 --- a/debian/control +++ /dev/null @@ -1,67 +0,0 @@ -Source: airtime -Section: web -Priority: optional -Maintainer: Daniel James -Build-Depends: debhelper (>= 7.0.50~), po-debconf -Standards-Version: 3.9.3 -Homepage: http://www.sourcefabric.org/en/airtime/ - -Package: airtime -Architecture: all -Pre-Depends: postgresql, python-virtualenv (>= 1.4.9) -Depends: apache2, - coreutils (>= 7.5) | timeout, - curl, - ecasound, - flac, - gzip (>= 1.3.12), - libapache2-mod-php5, - libcamomile-ocaml-data, - liquidsoap (>= 1.1.1~), - locales, - lsof, - monit, - mp3gain, - multitail, - odbc-postgresql, - patch, - php5-cli, - php5-curl, - php-db, - php5-gd, - php-pear, - php5-pgsql, - pwgen, - python, - rabbitmq-server, - silan (>= 0.3.1~), - sudo, - sysv-rc, - tar (>= 1.22), - unzip, - vorbisgain, - vorbis-tools, - zendframework | libzend-framework-php, - ${misc:Depends} -Recommends: icecast2, php-apc -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. - . - Major features: - . - Web-based remote station management. Authorized personnel can add - program material, create playlists, and schedule programming all via - a web interface. - . - Automation. Airtime has a scheduler function that enables users to - set shows with playlists for playback at a date and time of their choosing. - Playlists can be played back multiple times. - . - Solid, fast playback. Airtime uses the open source Liquidsoap - multimedia framework for clean, reliable, fast playback. - . - Open, extensible architecture. Stations are free to extend and alter - all parts of the program code. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 80d81c352..000000000 --- a/debian/copyright +++ /dev/null @@ -1,156 +0,0 @@ -Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=200 -Upstream-Name: airtime -Upstream-Contact: Sourcefabric -Source: http://sourceforge.net/projects/airtime/files/ - -Files: * -Copyright: - 2010-2012 Sourcefabric o.p.s - 2004-2009 Media Development Loan Fund -License: GPL-3 - -Files: airtime/python_apps/pypo/* -Copyright: - Jonas Ohrstrom - Paul Baranowski - Martin Konecny -License: GPL-3+ - -Files: airtime_mvc/library/doctrine/migrations/* -Copyright: No copyright holders -License: LGPL-2.1 -Comment: - This software consists of voluntary contributions made by many individuals - and is licensed under the LGPL. For more information, see - - -Files: airtime_mvc/library/soundcloud-api/* -Copyright: 2010-2011 Anton Lindqvist -License: Expat - -Files: airtime_mvc/library/php-amqplib/* -Copyright: - Barry Pederson - Vadim Zaliva - taavi013@gmail.com - Sean Murphy - spiderbill -License: LGPL-2.1 - -Files: airtime_mvc/library/propel/* -Copyright: 2005-2011 Hans Lellelid, David Zuelke, Francois Zaninotto, William Durand -License: Expat - -Files: airtime_mvc/library/propel/test/etc/xsl/* -Copyright: 2001-2004 The Apache Software Foundation -License: Apache-2.0 - -Files: airtime_mvc/public/js/flot/* -Copyright: 2007-2009 IOLA and Ole Laursen -License: Expat - -Files: debian/* -Copyright: - 2012 Alessio Treglia - 2011 Robin Gareus -License: GPL-2+ - -License: Expat - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the “Software”), - to deal in the Software without restriction, including without limitation the - rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - . - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - . - THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. - -License: GPL-3 - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License version 3 as - published by the Free Software Foundation. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public - License can be found in `/usr/share/common-licenses/GPL-3'. - -License: GPL-3+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public - License can be found in `/usr/share/common-licenses/GPL-3'. - -License: LGPL-2.1 - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation. - . - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public - License can be found in `/usr/share/common-licenses/LGPL-2.1'. - -License: GPL-2+ - This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. -Comment: - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General Public - License can be found in `/usr/share/common-licenses/GPL-2'. - -License: Apache-2.0 - Copyright 2001-2004 The Apache Software Foundation - . - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index ccedcc212..000000000 --- a/debian/docs +++ /dev/null @@ -1,4 +0,0 @@ -airtime/README -airtime/CREDITS -airtime/LICENSE_3RD_PARTY -airtime/changelog diff --git a/debian/etc/airtime.ini b/debian/etc/airtime.ini deleted file mode 100644 index e35f600b0..000000000 --- a/debian/etc/airtime.ini +++ /dev/null @@ -1,5 +0,0 @@ -[PHP] -memory_limit = 512M -magic_quotes_gpc = Off -file_uploads = On -upload_tmp_dir = /tmp diff --git a/debian/etc/apache.conf b/debian/etc/apache.conf deleted file mode 100644 index d3d84e92c..000000000 --- a/debian/etc/apache.conf +++ /dev/null @@ -1,11 +0,0 @@ -Alias /airtime /usr/share/airtime/public - -SetEnv APPLICATION_ENV "development" - - - DirectoryIndex index.php - Options -Indexes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - Allow from all - diff --git a/debian/etc/apache.vhost.tpl b/debian/etc/apache.vhost.tpl deleted file mode 100644 index 3d7334107..000000000 --- a/debian/etc/apache.vhost.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - ServerName __SERVER_NAME__ - #ServerAlias www.example.com - - ServerAdmin __SERVER_ADMIN__ - - DocumentRoot /usr/share/airtime/public - DirectoryIndex index.php - - SetEnv APPLICATION_ENV "production" - - - Options -Indexes FollowSymLinks MultiViews - AllowOverride All - Order allow,deny - Allow from all - - diff --git a/debian/gbp.conf b/debian/gbp.conf deleted file mode 100644 index 5474c6080..000000000 --- a/debian/gbp.conf +++ /dev/null @@ -1,3 +0,0 @@ -[DEFAULT] -pristine-tar = True -sign-tags = True diff --git a/debian/install b/debian/install deleted file mode 100644 index 763300c99..000000000 --- a/debian/install +++ /dev/null @@ -1,17 +0,0 @@ -airtime/airtime_mvc var/lib/airtime/tmp/ -airtime/install_minimal var/lib/airtime/tmp/ -airtime/python_apps var/lib/airtime/tmp/ -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/usr/bin/airtime-launch-browser /usr/bin/ -debian/usr/share/applications/airtime.desktop /usr/share/applications/ -debian/usr/share/man/man1 /usr/share/man/ -debian/usr/share/menu/airtime /usr/share/menu -debian/usr/share/pixmaps/airtime.xpm /usr/share/pixmaps/ - diff --git a/debian/po/POTFILES.in b/debian/po/POTFILES.in deleted file mode 100644 index cef83a340..000000000 --- a/debian/po/POTFILES.in +++ /dev/null @@ -1 +0,0 @@ -[type: gettext/rfc822deb] templates diff --git a/debian/po/templates.pot b/debian/po/templates.pot deleted file mode 100644 index 6458b85ac..000000000 --- a/debian/po/templates.pot +++ /dev/null @@ -1,249 +0,0 @@ -# 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 , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: airtime@packages.debian.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 \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Type: select -#. Choices -#: ../templates:1001 -msgid "dedicated v-host" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:1001 -msgid "no thanks" -msgstr "" - -#. Type: select -#. Description -#: ../templates:1002 -msgid "Create apache2 config:" -msgstr "" - -#. 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 "" - -#. 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 "" - -#. 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 "" - -#. Type: select -#. Choices -#: ../templates:2001 -msgid "remove default" -msgstr "" - -#. Type: select -#. Choices -#: ../templates:2001 -msgid "no change" -msgstr "" - -#. Type: select -#. Description -#: ../templates:2002 -msgid "Remove 000-default apache config:" -msgstr "" - -#. Type: select -#. Description -#: ../templates:2002 -msgid "" -"By default the Apache webserver is configured to send all virtual hosts to " -"the /var/www/ directory." -msgstr "" - -#. Type: select -#. Description -#: ../templates:2002 -msgid "" -"This option will invoke `sudo a2dissite default` and is recommended when " -"using a virtual host for Airtime." -msgstr "" - -#. Type: string -#. Description -#: ../templates:3001 -msgid "FQDN - Apache virtual host ServerName:" -msgstr "" - -#. 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 "" - -#. Type: string -#. Description -#: ../templates:3001 -msgid "e.g. \"example.com\" or \"www.example.com\" (without the quotes)" -msgstr "" - -#. Type: string -#. Description -#: ../templates:3001 -msgid "" -"You can customize /etc/apache2/sites-enabled/airtime.vhost afterward and add " -"ServerAliases and further custom configuration." -msgstr "" - -#. Type: string -#. Description -#: ../templates:4001 -msgid "Email of the ServerAdmin:" -msgstr "" - -#. Type: string -#. Description -#: ../templates:4001 -msgid "An email address is required for the virtual host configuration." -msgstr "" - -#. Type: boolean -#. Description -#: ../templates:5001 -msgid "Enable Icecast2 and set passwords automatically?" -msgstr "" - -#. 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 "" - -#. 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 "" - -#. Type: boolean -#. Description -#: ../templates:5001 -msgid "" -"If you wish to set Icecast server passwords manually, you should answer No " -"here." -msgstr "" - -#. Type: string -#. Description -#: ../templates:6001 -msgid "Icecast2 hostname:" -msgstr "" - -#. 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 "" - -#. Type: string -#. Description -#: ../templates:7001 -msgid "Icecast2 Source Password:" -msgstr "" - -#. Type: string -#. Description -#: ../templates:7001 -msgid "Specify a password to send A/V sources to Icecast" -msgstr "" - -#. Type: string -#. Description -#: ../templates:8001 -msgid "Icecast2 Relay Password:" -msgstr "" - -#. 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 "" - -#. Type: string -#. Description -#: ../templates:9001 -msgid "Icecast2 Admin Password:" -msgstr "" - -#. 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 "" - -#. Type: string -#. Description -#: ../templates:10001 -msgid "Airtime Admin Password:" -msgstr "" - -#. 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 "" - -#. Type: string -#. Description -#: ../templates:11001 -msgid "Airtime Storage Directory:" -msgstr "" - -#. 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 "" diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index f57c972de..000000000 --- a/debian/postinst +++ /dev/null @@ -1,273 +0,0 @@ -#!/bin/bash -#postinst script for airtime - -set -e - -. /usr/share/debconf/confmodule - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -wwwdir="/usr/share/airtime" -tmpdir="/var/lib/airtime/tmp" -configdir="/etc/airtime" -includefile="${configdir}/apache.conf" -a2tplfile="${configdir}/apache.vhost.tpl" -phpinifile="${configdir}/airtime.ini" -OLDVERSION="$2" -NEWVERSION="2.5.1" - -case "$1" in - configure|reconfigure) - - webserver="apache2" - php="php5" - - # this file in 1.8.2 is a directory path in 1.9.3 - if [ -f /var/www/airtime/utils/airtime-import ]; then - rm -f /var/www/airtime/utils/airtime-import - fi - - # do we set up a virtual host? - db_get airtime/apache-setup - APACHESETUP=$RET - if [ "${APACHESETUP}" == "no thanks" ]; then - echo "Not setting up ${webserver} and ${php}..." - - elif [ "${APACHESETUP}" == "dedicated v-host" ]; then - echo "Setting up ${webserver}..." - - # create the document root if it doesn't exist - if [ ! -d $wwwdir/public/ ]; then - install -d -m755 $wwwdir/public/ - fi - - # temporarily disable an existing virtual host - if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then - a2dissite airtime-vhost - elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then - a2dissite airtime-vhost.conf - fi - - db_get airtime/apache-servername - SN=$RET - db_get airtime/apache-serveradmin - SA=$RET - - 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}/" \ - ${a2tplfile} > /etc/$webserver/sites-available/airtime-vhost.conf - - command -v a2ensite > /dev/null - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - a2ensite airtime-vhost.conf - fi - - # insert a specific hostname, if provided, into API configuration - if [ "${SN}" != "localhost" ]; then - - # new installs - if [ -f /var/lib/airtime/tmp/airtime_mvc/build/airtime.conf -a -f /var/lib/airtime/tmp/python_apps/api_clients/api_client.cfg ]; then - sed -i "s/base_url = localhost/base_url = ${SN}/" /var/lib/airtime/tmp/airtime_mvc/build/airtime.conf - sed -i "s/host = 'localhost'/host = '${SN}'/" /var/lib/airtime/tmp/python_apps/api_clients/api_client.cfg - fi - - # upgrades - if [ -f /etc/airtime/airtime.conf -a -f /etc/airtime/api_client.cfg ]; then - sed -i "s/base_url = localhost/base_url = ${SN}/" /etc/airtime/airtime.conf - sed -i "s/host = 'localhost'/host = '${SN}'/" /etc/airtime/api_client.cfg - fi - fi - - # enable the rewrite module - command -v a2enmod > /dev/null - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - a2enmod rewrite - fi - - # remove the default site, if requested to - db_get airtime/apache-deldefault - if [ "$RET" == "remove default" ]; then - if [ -f /etc/apache2/sites-available/default ]; then - a2dissite default - elif [ -f /etc/apache2/sites-available/000-default.conf ]; then - a2dissite 000-default.conf - fi - fi - - # PHP config - echo "Configuring php5..." - if [ ! -d /etc/$php/conf.d/ ]; then - install -d -m755 /etc/$php/conf.d/ - fi - if [ ! -e /etc/$php/conf.d/airtime.ini ]; then - ln -s ${phpinifile} /etc/$php/conf.d/airtime.ini - fi - - # restart apache - invoke-rc.d apache2 restart - fi - - # XXX ICECAST XXX - db_get airtime/icecast-setup - if [ "$RET" == "true" ]; then - if [ -f /etc/default/icecast2 -a -f /etc/icecast2/icecast.xml ]; then - echo "Setting up icecast2..." - sed -i "s:ENABLE=.*:ENABLE=true:g" /etc/default/icecast2 - db_get airtime/icecast-sourcepw - ICESOURCE=$RET - sed -i "s:.*<\/source-password>:$ICESOURCE<\/source-password>:g" /etc/icecast2/icecast.xml - db_get airtime/icecast-relaypw - ICERELAY=$RET - sed -i "s:.*<\/relay-password>:$ICERELAY<\/relay-password>:g" /etc/icecast2/icecast.xml - db_get airtime/icecast-adminpw - ICEADMIN=$RET - sed -i "s:.*<\/admin-password>:$ICEADMIN<\/admin-password>:g" /etc/icecast2/icecast.xml - db_get airtime/icecast-hostname - ICEHOST=$RET - sed -i "s:.*<\/hostname>:$ICEHOST<\/hostname>:g" /etc/icecast2/icecast.xml - - # restart icecast server - invoke-rc.d icecast2 restart || true - - # save icecast hostname and source-password in airtime - db_get airtime/icecast-hostname - ICEHOST=$RET - sed -i "s:'s1_host', '127.0.0.1', 'string':'s1_host', '$ICEHOST', 'string':g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql - - db_get airtime/icecast-sourcepw - 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 - fi - - # Monit setup - if [ -f /etc/default/monit ]; then - echo "Setting up monit configuration..." - sed -i 's:startup=.*:startup=1:g' /etc/default/monit - sed -i 's:START=.*:START=yes:g' /etc/default/monit - - MONITCONFIGURED=$(grep "include /etc/monit/conf.d" /etc/monit/monitrc || true) - if [ -z "$MONITCONFIGURED" ]; then - echo "include /etc/monit/conf.d/*" >> /etc/monit/monitrc - fi - - invoke-rc.d monit restart - else - echo "The monit package does not appear to be installed on this server." - fi - - # get airtime admin password on new installs - if [ ! -e /var/log/airtime/pypo/pypo.log ]; then - db_get airtime/admin-password - AIRTIMEADMIN=$RET - sed -i "1s:md5('admin'):md5('$AIRTIMEADMIN'):g" ${tmpdir}/airtime_mvc/build/sql/defaultdata.sql - fi - - # get the main storage directory specified by the user - db_get airtime/storage-directory - AIRTIMESTORAGE=$RET - if [ "$AIRTIMESTORAGE" != "/srv/airtime/stor/" ]; then - sed -i "1s:/srv/airtime/stor/:$AIRTIMESTORAGE:g" ${tmpdir}/install_minimal/include/airtime-install.ini - fi - - # stop debconf so daemons started by the install script cannot hold open the pipe - db_stop - - # start rabbitmq if it isn't running - if [ -f /etc/init.d/rabbitmq-server ]; then - RABBITMQSTOPPED=$(invoke-rc.d rabbitmq-server status | grep no_nodes_running || true) - if [ -n "$RABBITMQSTOPPED" ]; then - invoke-rc.d rabbitmq-server start - fi - - # Warn if rabbitmq is installed but not set to start on boot - RABBITMQSTARTONBOOT=$(ls /etc/rc2.d/ | grep rabbitmq || true) - if [ -z "$RABBITMQSTARTONBOOT" ]; then - echo "Warning: rabbitmq-server is not configured to start after a reboot!" - echo "Fix Default-Start and Default-Stop lines in /etc/init.d/rabbitmq-server" - echo "then run this command as root: update-rc.d rabbitmq-server defaults" - fi - else - echo "The rabbitmq-server package does not appear to be installed on this server." - fi - - # fix the Liquidsoap symlink if it doesn't point to standard location - if [ -h /usr/bin/airtime-liquidsoap ]; then - SYMLINK_TARGET=`readlink /usr/bin/airtime-liquidsoap` - if [ "$SYMLINK_TARGET" != "/usr/bin/liquidsoap" ]; then - echo "Liquidsoap symlink points to the wrong place, fixing it!" - rm /usr/bin/airtime-liquidsoap - ln -s /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap - fi - - if [ "$SYMLINK_TARGET" == "/usr/bin/liquidsoap" ]; then - echo "Liquidsoap symlink points to the right place!" - fi - fi - - # symlink the Liquidsoap path to standard location, if symlink doesn't exist - if [ ! -h /usr/bin/airtime-liquidsoap ]; then - echo "Creating symlink for Liquidsoap..." - ln -s /usr/bin/liquidsoap /usr/bin/airtime-liquidsoap - fi - - # don't run airtime-install if the user is doing a dpkg-reconfigure - if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ] ; then - echo "Reconfiguration complete." - else - - 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 - echo "Please run the ${tmpdir}/install_minimal/airtime-install script with the -d option after you have set up the web server." - - else - - mkdir -p /var/log/airtime - cd $tmpdir/install_minimal/ - - if [ "${OLDVERSION:0:5}" == "${NEWVERSION}" ] ; then - echo "Reinstallation detected..." - echo | ./airtime-install --disable-deb-check -rp 2> /var/log/airtime/reinstallation-errors.log - else - - ./airtime-install --disable-deb-check 2> /var/log/airtime/installation-errors.log - - fi - - # Update the desktop menu to show Airtime - if test -x /usr/bin/update-menus; then - update-menus; - fi - fi - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/postrm b/debian/postrm deleted file mode 100755 index ed1680c58..000000000 --- a/debian/postrm +++ /dev/null @@ -1,130 +0,0 @@ -#!/bin/bash -#postrm script for airtime - -set -e - -if [ -f /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule -fi - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -package_name="airtime" -datadir="/srv/airtime" -wwwdir="/usr/share/airtime" -tmpdir="/var/lib/airtime/tmp" -configdir="/etc/airtime" - -webserver="apache2" -php="php5" - -case "$1" in - purge|remove) - - # airtime uninstaller does not remove these - - if [ -L /var/lib/airtime/airtime_mvc ]; then - rm -rf /var/lib/airtime/ || true - fi - - if [ -f /var/lib/airtime/.htaccess ]; then - rm -f /var/lib/airtime/.htaccess || true - fi - - if [ -f ${tmpdir}/install_minimal/distribute-0.6.10.tar.gz ]; then - rm -f ${tmpdir}/install_minimal/distribute-0.6.10.tar.gz || true - fi - - if [ -f /usr/share/python-virtualenv/distribute-0.6.10.tar.gz ]; then - rm -f /usr/share/python-virtualenv/distribute-0.6.10.tar.gz || true - fi - - if [ -d ${tmpdir}/python_apps/pypo/liquidsoap_bin ]; then - rm -f ${tmpdir}/python_apps/pypo/liquidsoap_bin/* || true - rm -rf ${tmpdir}/python_apps/pypo/liquidsoap_bin || true - fi - - if [ -d /var/lib/airtime/python_apps/pypo/liquidsoap ]; then - rm -rf /var/lib/airtime/python_apps/pypo/liquidsoap || true - fi - - if [ -d ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor ]; then - rm -rf ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/airtimefilemonitor || true - fi - - if [ -f ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/storDump.txt ]; then - rm -f ${tmpdir}/install_minimal/upgrades/airtime-1.9.0/storDump.txt || true - fi - - if [ -L /usr/bin/airtime-clean-storage ]; then - rm -f /usr/bin/airtime-clean-storage || true - fi - - if [ -L /usr/bin/airtime-user ]; then - rm -f /usr/bin/airtime-user || true - fi - - if [ -L /usr/bin/airtime-log ]; then - rm -f /usr/bin/airtime-log || true - fi - - # Un-configure webservers - if [ -L /etc/$webserver/conf.d/airtime.conf ]; then - rm -f /etc/$webserver/conf.d/airtime.conf || true - restart="$webserver $restart" - fi - - if [ -L /etc/$php/conf.d/airtime.ini ]; then - rm -f /etc/$php/conf.d/airtime.ini || true - restart="$webserver $restart" - fi - - if [ -f /etc/$webserver/sites-available/airtime-vhost ]; then - a2dissite airtime-vhost &>/dev/null || true - elif [ -f /etc/$webserver/sites-available/airtime-vhost.conf ]; then - a2dissite airtime-vhost.conf &>/dev/null || true - # TODO: if airtime-vhost is not modified -> delete it - restart="$webserver $restart" - fi - - servers="apache2" - # may not exist if package was manually installed - if [ -r /usr/share/wwwconfig-common/restart.sh ]; then - . /usr/share/wwwconfig-common/restart.sh || true - echo $error - fi - - # Remove Airtime menu entry and icon - if test -x /usr/bin/update-menus; then - update-menus; - fi - - # Remove legacy permission overrides - dpkg-statoverride --list $datadir &>/dev/null && \ - dpkg-statoverride --remove $datadir || true - - # 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 - echo "Purging Airtime settings from debconf database" >&2 - db_purge || true - fi - - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - - ;; - - *) - echo "postrm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/preinst b/debian/preinst deleted file mode 100755 index 02b762856..000000000 --- a/debian/preinst +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -#preinst script for airtime - -set -e - -if [ "$DPKG_DEBUG" = "developer" ]; then - set -x -fi - -case "$1" in - install|upgrade) - - # Remove liquidsoap binary from old installs - if [ -f /var/lib/airtime/python_apps/pypo/liquidsoap/liquidsoap ]; then - echo "Removing old Liquidsoap binary..." >&2 - rm -f /var/lib/airtime/python_apps/pypo/liquidsoap/liquidsoap - fi - - ;; - - abort-upgrade) - echo "Upgrade aborting..." >&2 - ;; - - *) - echo "preinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100755 index 3cf5a91b6..000000000 --- a/debian/prerm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -#prerm script for airtime - -set -e - -package_name="airtime" -datadir="/var/lib/${package_name}/tmp" - -case "$1" in - remove|purge) - cd $datadir/install_minimal/ && ./airtime-uninstall || true - ;; - - upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - ;; - - *) - echo "prerm called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -#DEBHELPER# - -exit 0 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index d91c2d9f2..000000000 --- a/debian/rules +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/make -f - -#override_dh_shlibdeps: -# dh_makeshlibs -# -dh_shlibdeps -- --ignore-missing-info - -%: - dh $@ - diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/source/include-binaries b/debian/source/include-binaries deleted file mode 100644 index cc43edcc4..000000000 --- a/debian/source/include-binaries +++ /dev/null @@ -1,5 +0,0 @@ -debian/usr/share/man/man1/airtime-import.1.gz -debian/usr/share/man/man1/airtime-launch-browser.1.gz -debian/usr/share/man/man1/airtime-log.1.gz -debian/usr/share/man/man1/airtime-test-soundcard.1.gz -debian/usr/share/man/man1/airtime-test-stream.1.gz diff --git a/debian/templates b/debian/templates deleted file mode 100644 index 4cd301493..000000000 --- a/debian/templates +++ /dev/null @@ -1,109 +0,0 @@ -Template: airtime/apache-setup -Type: select -__Choices: dedicated v-host, no thanks -Choices-de.UTF-8: v-host einrichten, nein danke -Default: dedicated v-host -_Description: Create apache2 config: - This setup script can perform Apache web server configuration - so that you can connect to Airtime directly after this installation. - . - 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. - . - "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. -Description-de.UTF-8: Erzeugen einer apache2 konfiuration: - . - -Template: airtime/apache-deldefault -Type: select -__Choices: remove default, no change -Default: no change -_Description: Remove 000-default apache config: - By default the Apache webserver is configured to send all virtual hosts - to the /var/www/ directory. - . - This option will invoke `sudo a2dissite default` and is recommended - when using a virtual host for Airtime. - -Template: airtime/apache-servername -Type: string -Default: localhost -_Description: FQDN - Apache virtual host ServerName: - Enter the main hostname of the web server. - The DNS of this name must resolve to the Apache server running on this - machine. - . - e.g. "example.com" or "www.example.com" (without the quotes) - . - You can customize /etc/apache2/sites-enabled/airtime.vhost afterward - and add ServerAliases and further custom configuration. - -Template: airtime/apache-serveradmin -Type: string -Default: root@localhost -_Description: Email of the ServerAdmin: - An email address is required for the virtual host configuration. - -Template: airtime/icecast-setup -Type: boolean -Default: false -_Description: Enable Icecast2 and set passwords automatically? - This option enables a local Icecast streaming media server to start - on boot, and configures passwords for both the Icecast server and Airtime. - . - Note: these settings are here for convenience only. Strictly speaking - they should be done during Icecast installation - not Airtime installation. - . - If you wish to set Icecast server passwords manually, - you should answer No here. - -Template: airtime/icecast-hostname -Type: string -Default: localhost -_Description: Icecast2 hostname: - 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'. - -Template: airtime/icecast-sourcepw -Type: string -Default: hackme -_Description: Icecast2 Source Password: - Specify a password to send A/V sources to Icecast - -Template: airtime/icecast-relaypw -Type: string -Default: hackme -_Description: Icecast2 Relay Password: - 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. - -Template: airtime/icecast-adminpw -Type: string -Default: hackme -_Description: Icecast2 Admin Password: - 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. - -Template: airtime/admin-password -Type: string -Default: admin -_Description: Airtime Admin Password: - 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. - -Template: airtime/storage-directory -Type: string -Default: /srv/airtime/stor/ -_Description: Airtime Storage Directory: - Specify the main storage path which Airtime will use, - ending with a slash. - You can also specify watched folders in the Airtime - administration interface. diff --git a/debian/usr/bin/airtime-launch-browser b/debian/usr/bin/airtime-launch-browser deleted file mode 100755 index c0bf585c0..000000000 --- a/debian/usr/bin/airtime-launch-browser +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------- -# Copyright (c) 2012 Sourcefabric O.P.S. -# -# This file is part of the Airtime project. -# http://airtime.sourcefabric.org/ -# -# Airtime is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Airtime is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Airtime; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# This script opens the default graphical web browser on the Airtime login page. - -/usr/bin/x-www-browser http://localhost/ || exit 1 diff --git a/debian/usr/share/applications/airtime.desktop b/debian/usr/share/applications/airtime.desktop deleted file mode 100644 index e712670ee..000000000 --- a/debian/usr/share/applications/airtime.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Name=Airtime -GenericName=Broadcast automation system -Icon=/usr/share/pixmaps/airtime.xpm -Exec=/usr/bin/airtime-launch-browser -Categories=AudioVideo;Audio; diff --git a/debian/usr/share/man/man1/airtime-import.1.gz b/debian/usr/share/man/man1/airtime-import.1.gz deleted file mode 100644 index 828d8cf664d6fd739ed7f29c078b915fd00a4e1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmV<810DPyiwFqcKjTjT17T@$bZKp6Eop6VZ*p`lF#xqyO>g5i5WVwP40LG%SW+Fd zJs68cmBfp9v55`adswW3f|kY>x1uPJRJ1Po<2$52VyDTXml`l2k~42OZ)P5&G+@#8 z4wA)sySSf+i~H4by@g;JK=84t5UzfnUXe)}z^X)U5P1HrF&1ng4CLG*v;|i9gc>wH z2_vclogqkG)%<{wb7j%y4jz*GIpacGAu$xPR@y=uLjNT(7aaDYL<6F-%3~y*HI!nf zxjuTB&6kJeYO~m|=o((2v9DqFcNk`>KEj8^r+Iw4Si{%hD~h7WM;0ws5Cky&m5e1B zOZ9|5G=A|Tx3J|lD?*;z_tZyDh2&*tDxma1H{>nxa>IuruJvt?zG~0#;Kybu}X3)R0ZZ}EXo;+ zRx38WgwL+*oqalxO|YJ5rNO6p5>9eajre^kk)wd!s9In?_~gA)E6Ngf2zALb+9YRp z!JrF-c>qKMW`uK`0BZ}86_DeeH>Gu1&wyHC&0?dU;{KAc3mOmpu@C*>EYy%|#>>*> zaNw2r%g65NGFCU4Z8Xk2dXNyXv2jxF8X0dj&;ER9Hazmvvj|nfd5SWEYsRgsOz3?urJKzX{CIFJvT|m&==J}#;KKS z%*6f(lG;VoI~$>yEv_6fn`1Vx&^7EG0w@20Dc$Nm(9O0^Eo7+HcL17 z;}cWzrXo!zwQLP_^u_dYa(=E3|K6mYx1mu@MFOkyx6Z9bF5MyBeW(2ulF!?_B^ACO z{g#t*X<Pk*LL9c((4PrsuffCAcT~CEP7( zAC~ZuB+S6O+^>HB?H6O4T&O5h^8JMEsbL-Cx40A3)wNdNsCnVSktg}lX+~qH2?$P+ Qoi>!rKdo*4i(3c)00HgpTL1t6 diff --git a/debian/usr/share/man/man1/airtime-launch-browser.1.gz b/debian/usr/share/man/man1/airtime-launch-browser.1.gz deleted file mode 100644 index e9e211c0d5227b18162cbcfa19e7a8996dfe5ae5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 547 zcmV+;0^I!{iwFqHFyl`E17T@$bZKp6Eo@rEWoM-SV@D!APx-?MlJGnm}<3gPC%>}J9^ zX{8Mciy*3}-a2r#v``6$Fx05O}*iGpKagx2T-;vR9myx+P3CWdgLKs-#G4X=FDhAROopm3^IW>aLyZ z=3&_AQZ%)u6s7W5d$JDOHxwxDMc+6Wuz-sNN-#~?H*KKR1_`m(ruE!Yu!zsJFXIU} zXS^`%A~y^Jx4JhakrzgmT$@9PD!hywo>4aRktIGY3N}x#ZL1a*l%~-~6PBMB62}nT zX9+E2_d843cG@_2J9{^McHij3%S(sW1!PlIr7+dCx-%%+vB>>|qjdC;uaX`6mBB#n z1|ywA1;q)nKL($}{}S;zzj!5o(Jh6N*ub4=(Zc7-|9$=R(Yn5pn$v6fGG(+Nzm+8x lQYh$*e!`Mspm#*nCnykli`7V{sn1v%<|nDnNtw+90059-2kHO- diff --git a/debian/usr/share/man/man1/airtime-log.1.gz b/debian/usr/share/man/man1/airtime-log.1.gz deleted file mode 100644 index c6e47d873d16d72af76d3d2ab09f6381eba85ef7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmV<60w4V!iwFo=K;usU17T@$bZKp6Eo^URE-?UgR9$b=Fcf|Fuej>dkQ$Foz{7+P zg;p%nSfi#OA;yCf-?ko!o%y3#rTuuWoptL5JXETEKYZ>v=Z0U87+;>lBwsA^ue0oO z{sl%SBN$x-jd1$<SgOKDsjjy!jU} zp?6?bX|^Yfoi#GlD1lYG6nel5l{G@vf`}5qn^t&bG`OAf*mB4{w2{LK0q?L5o*D=T z))*h3W4-bla6y_etmy10#VWref`v2MaacYBA-04s!UtjTj5sLZ`lt%BOeW#deP%ha5>c zk<%e(cGnr}A5$R8Kyq{zodcyw1wqW)N;J(-?x{RVF_eF&$3W8$wYMtL&~>OKQJE?q z+bSJ-YqG&cmjx@*15vD7_>Cm0j;h=EzcRw6dc0FUr3^zwRfe~rH4;eymamdmqybH; zxejZ!8Z4j%=}%5Mzz|g&y6r8+9@?2MI>U{DraTaGZ=)xXdqoLk7;;=q_)!vuv=p-$ zOfJhg8GG^MY!P(5$;gDgqs2Trc{P3(S8byHuX~TqXU+so)+HkT6Zgbt8-uiAl}#un z-3{!$;~}k)}sbmjFRZBaV09N>ND7Q-<=&F_kGXZL4X^(K4!cqXie$ULR%R` z1MwU3vfWf@g$-N~&ko+pbo%)2jq^b&!^uJ)#%#~{6e}fkWbFoPnmC%QC1Vnkfk=$) S4CPrz!~6kK#l_YM1pokne_K}o diff --git a/debian/usr/share/man/man1/airtime-test-soundcard.1.gz b/debian/usr/share/man/man1/airtime-test-soundcard.1.gz deleted file mode 100644 index 6d915473d9b2c9b11bcac78861c0cd2d19cc4924..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 626 zcmV-&0*(D2iwFqkH{(wL17T@$bZKp6Ep%mbbS-mlb#7#1VRB?HF#wHI!EVz)5WVkL zjB*0Wc4#xJA<iwFpvK;usU17T@$bZKp6Ep%mbbS-mqa%Ev{E-?U&R8ec&Fc5y%uQ>d) zLF}ewj8Vo|mIRWrG$wWjW9@@%Ut%?uWh6N!uphsZ+@x*VLEfy>-KV?n`_9pQz@l^p zqxmYGFQ#ESP0}z)SJTk~g3ADco3=){8eU#e-hBXZh1?+U;;}UrY$*&B+#+-(*0@6r z8h65odP8>zlGhF2VB|_!l+56Ew3sq3v=tIVi^hh=YUC2`Loiquz`;eqDtgr_I`;Pt z(4eLVJWTTYb{Qx0ghfB#9W?d_!W}%YXdXilQ1>pNK;)QnWB-~`wbp%|rp%yJ#@1XS zJOG_zXq0}F)j~_HJZCk~aAP{9i_=UAQnj@u6j6H^YJD0=E%AR7-cz|qe|tx0_Dh;io|&4j7cm6f1+*xMtPu|*N~T(Z%HI>T}Z#;*|rUk zur$(^0uhTf8Utgit8fge?hCfK&lIPjU0YT)UU1)2h91TPViEbVmww{J^AqmaFVvYL zA4yeUA5&~xDi1#Tysnhys!qKZ!KBAAZs@?%?i>?5LBuR}ej$d=sQxk>4iAMb zyE|CwykbKNsk=@dpklO9# zJtUr|HP5ujuc5TIxxTpQx-K#=E+VBj7c7cnT1fH)?OjXj c #FFD7C6", -", c #FF8653", -"' c #FFAE8D", -" .+@+. ", -" .+@#####$% ", -" .+@###########&* ", -" %$################=+ ", -" $######################$- ", -" %$#######################;.", -" .+=#####################>", -" *&##################, ", -" %@###############> ", -" .;=###########, ", -" -@#########> ", -" =########, ", -" -#########> ", -" ,########$ ", -" #########- ", -" %########@ ", -" @########- ", -" .########@ ", -" ;########- ", -" =#######@ ", -" -#######,. ", -" &#####@* ", -" ####=' ", -" %###; ", -" $#,. ", -" .@- ", -" ", -" ", -" ", -" ", -" ", -" "}; diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 0bc1b4aa8..000000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/airtime/airtime-([\d\.]+)-ga\.tar\.gz diff --git a/gen-snapshot.sh b/gen-snapshot.sh deleted file mode 100755 index bb96ddd53..000000000 --- a/gen-snapshot.sh +++ /dev/null @@ -1,61 +0,0 @@ -#/bin/sh -# 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") -BUILDDEST=/tmp/airtime-${VERSION}/ -DEBDIR=`pwd`/debian - -git checkout $(git branch | grep "^*" | cut -d' ' -f 2) -git pull - -echo "cleaning up previous build..." - -rm -rf /tmp/airtime* -mkdir -p ${BUILDDEST}airtime - -echo "copying files to temporary directory..." - -cp -a * ${BUILDDEST}airtime || exit -cp -a $DEBDIR ${BUILDDEST}debian || exit - -cd ${BUILDDEST} || exit - -# Set the version of the snapshot package - -sed -i "1s:(2.5.1-1):(${VERSION}):g" debian/changelog - -# FIXES for 2.5.1 ############# - -# these are all moved to debian/copyright -rm airtime/python_apps/pypo/LICENSE -rm airtime/airtime_mvc/library/php-amqplib/LICENSE -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 binary -rm -r airtime/python_apps/pypo/liquidsoap_bin/ - -#Remove phing library -rm -r airtime/airtime_mvc/library/phing/ - -#Remove ZFDebug -rm -r airtime/airtime_mvc/library/ZFDebug/ - -#Strip un-needed install scripts -rm -r airtime/install_full/ - -#Remove dev tools and files -rm -r airtime/dev_tools/ -rm -r airtime/docs/ -rm airtime/.gitignore -rm airtime/.zfproject.xml - -############################# - -echo "running the build..." - -debuild -b -uc -us $@ || exit - -cp /tmp/airtime_${VERSION}* /var/www/apt/snapshots/ From 59d7c2345090624aafb4b1ba029819ebc867b322 Mon Sep 17 00:00:00 2001 From: localizer Date: Tue, 23 Dec 2014 10:10:38 +0000 Subject: [PATCH 8/8] updated translation resources --- .../locale/fr_FR/LC_MESSAGES/airtime.mo | Bin 65289 -> 68579 bytes .../locale/fr_FR/LC_MESSAGES/airtime.po | 40 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo index 3672f9e54d5b449896c9a95f5b33660c440487d8..6a2e72329569abb395919fa2debea10678ec0108 100644 GIT binary patch delta 20892 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 VpQIX@eysT2e-$RLj=dE7KLA&UxB378 delta 17813 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 diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po index 9047cfb18..ba2c9278b 100644 --- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po +++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Airtime\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-11-13 13:55-0500\n" -"PO-Revision-Date: 2014-11-14 09:58+0000\n" -"Last-Translator: Daniel James \n" +"PO-Revision-Date: 2014-12-23 10:09+0000\n" +"Last-Translator: AlbertFR \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" @@ -79,7 +79,7 @@ msgstr "Fondu en Sorti" msgid "" "%1$s copyright © %2$s All rights reserved.%3$sMaintained and " "distributed under the %4$s by %5$s" -msgstr "" +msgstr "%1$s copyright © %2$s Tous droits réservés.%3$sMaintenue et distribuée sous %4$s by %5$s" #: airtime_mvc/application/layouts/scripts/livestream.phtml:9 #: airtime_mvc/application/views/scripts/dashboard/stream-player.phtml:2 @@ -1096,13 +1096,13 @@ msgstr "Envoyez vos remarques au support" #: airtime_mvc/application/forms/RegisterAirtime.php:126 #, php-format msgid "Promote my station on %s" -msgstr "" +msgstr "Promouvoir station sur %s" #: airtime_mvc/application/forms/SupportSettings.php:150 #: airtime_mvc/application/forms/RegisterAirtime.php:151 #, php-format msgid "By checking this box, I agree to %s's %sprivacy policy%s." -msgstr "" +msgstr "En cochant cette case , je accepte la %s's %s de politique de confidentialité %s ." #: airtime_mvc/application/forms/SupportSettings.php:174 #: airtime_mvc/application/forms/RegisterAirtime.php:169 @@ -1141,7 +1141,7 @@ msgstr "Rediffusion?" #: airtime_mvc/application/forms/AddShowLiveStream.php:10 #, php-format msgid "Use %s Authentication:" -msgstr "" +msgstr "Utilisez l'authentification %s :" #: airtime_mvc/application/forms/AddShowLiveStream.php:16 msgid "Use Custom Authentication:" @@ -2613,7 +2613,7 @@ msgstr "Vous n'êtes pas autorisé à acceder à cette ressource." #: airtime_mvc/application/controllers/ApiController.php:803 #, php-format msgid "File does not exist in %s" -msgstr "" +msgstr "Le fichier n'existe pas dans %s" #: airtime_mvc/application/controllers/ApiController.php:854 msgid "Bad request. no 'mode' parameter passed." @@ -2824,7 +2824,7 @@ msgstr "Mémoire" #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:14 #, php-format msgid "%s Version" -msgstr "" +msgstr "%s Version" #: airtime_mvc/application/views/scripts/systemstatus/index.phtml:30 msgid "Disk Space" @@ -2909,13 +2909,13 @@ msgid "" " collected regularly in order to enhance your user experience.%2$sClick " "'Yes, help %1$s' and we'll make sure the features you use are constantly " "improving." -msgstr "" +msgstr "Aidez %1$s nous à l'améliorer en nous faisant savoir comment vous l'utilisez. Cette information sera recueillie régulièrement afin d'améliorer votre expérience utilisateur.\n%2$s Cliquez Oui, aider %1$s et nous vous assurerons que les fonctions que vous utilisez seront en constante amélioration." #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:29 #: airtime_mvc/application/views/scripts/form/support-setting.phtml:29 #, php-format msgid "Click the box below to promote your station on %s." -msgstr "" +msgstr "Cliquez sur la case ci-dessous pour promouvoir votre station sur %s ." #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:67 #: airtime_mvc/application/views/scripts/form/register-dialog.phtml:81 @@ -2961,7 +2961,7 @@ msgstr "Répertoire d'Import en Cours:" msgid "" "Rescan watched directory (This is useful if it is network mount and may be " "out of sync with %s)" -msgstr "" +msgstr "Rescanner le répertoire surveillé (Ce qui peut être utile si il est sur le réseau et est peut être désynchronisé de %s)" #: airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml:44 msgid "Remove watched directory" @@ -3016,7 +3016,7 @@ msgid "" "will be collected regularly in order to enhance your user experience.%sClick" " the 'Send support feedback' box and we'll make sure the features you use " "are constantly improving." -msgstr "" +msgstr "Aidez %s à améliorer le logiciel en nous faisant savoir comment vous l'utilisez %s. Cette information sera recueillie régulièrement afin d'améliorer votre expérience utilisateur.\n%s Cliquez la case \"Envoyer des rapports d'utilisation» et nous nous assurerons que les fonctions que vous utilisez seront en constante amélioration." #: airtime_mvc/application/views/scripts/form/support-setting.phtml:46 msgid "" @@ -3279,12 +3279,12 @@ msgstr "Nombre d'auditeur au fil du temps" #: airtime_mvc/application/views/scripts/dashboard/help.phtml:3 #, php-format msgid "Welcome to %s!" -msgstr "" +msgstr "Bienvenue à %s !" #: airtime_mvc/application/views/scripts/dashboard/help.phtml:4 #, php-format msgid "Here's how you can get started using %s to automate your broadcasts: " -msgstr "" +msgstr "Voici comment vous pouvez commencer à utiliser %s pour automatiser vos émissions:" #: airtime_mvc/application/views/scripts/dashboard/help.phtml:7 msgid "" @@ -3333,12 +3333,12 @@ msgstr "Selection du Flux:" msgid "" "%1$s %2$s, the open radio software for scheduling and remote station " "management." -msgstr "" +msgstr "%1$s %2$s, le logiciel ouvert de gestion et de programmation pour vos stations distantes." #: airtime_mvc/application/views/scripts/dashboard/about.phtml:22 #, php-format msgid "%1$s %2$s is distributed under the %3$s" -msgstr "" +msgstr "%1$s %2$s est distribué sous %3$s" #: airtime_mvc/application/views/scripts/login/password-change.phtml:3 msgid "New password" @@ -3371,7 +3371,7 @@ msgstr "Retour à l'écran de connexion" msgid "" "Welcome to the %s demo! You can log in using the username 'admin' and the " "password 'admin'." -msgstr "" +msgstr "Bienvenue à la démo %s ! Vous pouvez vous connecter en utilisant le nom d'utilisateur «admin» et le mot de passe «admin» ." #: airtime_mvc/application/views/scripts/partialviews/header.phtml:3 msgid "Previous:" @@ -3416,7 +3416,7 @@ msgstr "Votre période d'éssai expire dans" #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9 #, php-format msgid "Purchase your copy of %s" -msgstr "" +msgstr "Achetez votre copie d' %s" #: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9 msgid "My Account" @@ -3732,7 +3732,7 @@ msgstr "Le contenu des émissions liés doit être programmé avant ou après sa #: airtime_mvc/application/models/Scheduler.php:195 msgid "Cannot schedule a playlist that contains missing files." -msgstr "" +msgstr "Vous ne pouvez pas programmer une liste de lecture qui contient des fichiers manquants " #: airtime_mvc/application/models/Scheduler.php:216 #: airtime_mvc/application/models/Scheduler.php:305 @@ -3807,7 +3807,7 @@ msgstr "Bonjour %s, \n\nCliquez sur ce lien pour réinitialiser votre mot de pa #: airtime_mvc/application/models/Auth.php:36 #, php-format msgid "%s Password Reset" -msgstr "" +msgstr "%s Réinitialisation du mot de passe" #: airtime_mvc/application/services/CalendarService.php:50 msgid "Record file doesn't exist"