[Debconf-video-commits] r643 - in package/trunk: conf conf/dc11 conf/streaming/debconf debian
Holger Levsen
holger at alioth.debian.org
Sat Jul 16 08:03:31 UTC 2011
Author: holger
Date: 2011-07-16 08:03:30 +0000 (Sat, 16 Jul 2011)
New Revision: 643
Added:
package/trunk/conf/dc11/
Removed:
package/trunk/conf/dc10/
Modified:
package/trunk/conf/dc11/default-barney
package/trunk/conf/dc11/default-daffy
package/trunk/conf/dc11/default-lisa
package/trunk/conf/dc11/default-scratchy
package/trunk/conf/dc11/default-selma
package/trunk/conf/dc11/dvswitchrc-blinky
package/trunk/conf/dc11/dvswitchrc-daffy
package/trunk/conf/dc11/dvswitchrc-itchy
package/trunk/conf/dc11/dvswitchrc-marge
package/trunk/conf/dc11/dvswitchrc-patty
package/trunk/conf/dc11/dvswitchrc-scratchy
package/trunk/conf/dc11/dvswitchrc-selma
package/trunk/conf/default
package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml
package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
package/trunk/debian/changelog
Log:
Update configs for DebConf11 in Banja Luka, Bosnia and Herzegovina.
Modified: package/trunk/conf/dc11/default-barney
===================================================================
--- package/trunk/conf/dc10/default-barney 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/default-barney 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,6 +1,6 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
# Database access (pygresql)
DATABASE_DSN="skinner.debconf.org:pentabarf"
DATABASE_USER=dc7video
@@ -8,5 +8,5 @@
# File store base directory
FILE_BASE="/video"
ENCODING_HOSTS="daffy"
-PUBLICATION_PATH="apu.debconf.org:/dvd/2010/debconf10"
+PUBLICATION_PATH="apu.debconf.org:/dvd/2011/debconf11"
Modified: package/trunk/conf/dc11/default-daffy
===================================================================
--- package/trunk/conf/dc10/default-daffy 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/default-daffy 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,12 +1,12 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
ROOM_NAME="unknown room"
# Sources and sinks
SOURCES="firewire:localhost"
SINKS="file:localhost"
# Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc10.video.debconf.org
+ICECAST_ADDR=lisa.dc11.video.debconf.org
ICECAST_PORT=8000
ICECAST_PASS=#ICECAST_PASS#
# Stream encoding parameters
Modified: package/trunk/conf/dc11/default-lisa
===================================================================
--- package/trunk/conf/dc10/default-lisa 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/default-lisa 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,6 +1,6 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
ROOM_NAME="unknown room"
# Sources and sinks
SOURCES="firewire:localhost"
Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc10/default-scratchy 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/default-scratchy 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,12 +1,12 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
-ROOM_NAME="interschool_lab"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
+ROOM_NAME="Round room"
# Sources and sinks
SOURCES="firewire:scratchy firewire:blinky firewire:itchy"
SINKS="icecast:todd file:scratchy"
# Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc10.debconf.org
+ICECAST_ADDR=lisa.dc11.debconf.org
ICECAST_PORT=8000
ICECAST_PASS=#ICECAST_PASS#
# Stream encoding parameters
Modified: package/trunk/conf/dc11/default-selma
===================================================================
--- package/trunk/conf/dc10/default-selma 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/default-selma 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,12 +1,12 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
-ROOM_NAME="davis_auditorium"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
+ROOM_NAME="The big room"
# Sources and sinks
SOURCES="firewire:sideshow firewire:patty firewire:jackie"
SINKS="icecast:ned file:selma"
# Icecast streaming server parameters
-ICECAST_ADDR=lisa.dc10.debconf.org
+ICECAST_ADDR=lisa.dc11.debconf.org
ICECAST_PORT=8000
ICECAST_PASS=#ICECAST_PASS#
# Stream encoding parameters
Modified: package/trunk/conf/dc11/dvswitchrc-blinky
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-blinky 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-blinky 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=scratchy
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-daffy
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-daffy 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-daffy 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=scratchy
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-itchy
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-itchy 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-itchy 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=scratchy
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-marge
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-marge 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-marge 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=selma
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-patty
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-patty 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-patty 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=selma
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-scratchy
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-scratchy 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-scratchy 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=scratchy
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/dc11/dvswitchrc-selma
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-selma 2010-08-19 13:41:57 UTC (rev 630)
+++ package/trunk/conf/dc11/dvswitchrc-selma 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,3 @@
MIXER_HOST=selma
MIXER_PORT=4321
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
Modified: package/trunk/conf/default
===================================================================
--- package/trunk/conf/default 2011-07-15 16:58:44 UTC (rev 642)
+++ package/trunk/conf/default 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,6 +1,6 @@
# Name of the location from which we are recording
-CONFERENCE_NAME='DebConf10'
-VENUE_NAME="Columbia University, New York City, United States"
+CONFERENCE_NAME='DebConf11'
+VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
ROOM_NAME="unknown room"
# Publication details
PUBLISH_AUTHOR='DebConf video team'
@@ -9,7 +9,7 @@
# Sources and sinks
SOURCES="firewire:localhost"
SINKS="file:localhost"
-VIDEO_STANDARD=ntsc
+VIDEO_STANDARD=pal
# Icecast streaming server parameters
ICECAST_ADDR=int-master.video.debconf.org
ICECAST_PORT=8000
Modified: package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml 2011-07-15 16:58:44 UTC (rev 642)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml 2011-07-16 08:03:30 UTC (rev 643)
@@ -41,7 +41,7 @@
<relay>
<server>int-master.video.debconf.org</server>
<port>8000</port>
- <mount>/davis_auditorium.ogv</mount>
+ <mount>/big_room.ogv</mount>
<username>relay</username>
<password>#PASSWORD#</password>
<on-demand>1</on-demand>
@@ -50,18 +50,18 @@
<relay>
<server>int-master.video.debconf.org</server>
<port>8000</port>
- <mount>/interschool_lab.ogv</mount>
+ <mount>/round_room.ogv</mount>
<username>relay</username>
<password>#PASSWORD#</password>
<on-demand>1</on-demand>
</relay>
<mount>
- <mount-name>/davis_auditorium.ogv</mount-name>
+ <mount-name>/big_room.ogv</mount-name>
</mount>
<mount>
- <mount-name>/interschool_lab.ogv</mount-name>
+ <mount-name>/round_room.ogv</mount-name>
</mount>
<mount>
Modified: package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml 2011-07-15 16:58:44 UTC (rev 642)
+++ package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml 2011-07-16 08:03:30 UTC (rev 643)
@@ -41,13 +41,13 @@
<fileserve>0</fileserve>
<mount>
- <mount-name>/davis_auditorium.ogv</mount-name>
+ <mount-name>/big_room.ogv</mount-name>
<fallback-mount>/replay-int.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
<mount>
- <mount-name>/interschool_lab.ogv</mount-name>
+ <mount-name>/round_room.ogv</mount-name>
<fallback-mount>/replay-int.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
Modified: package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-relay.xml 2011-07-15 16:58:44 UTC (rev 642)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml 2011-07-16 08:03:30 UTC (rev 643)
@@ -46,7 +46,7 @@
<relay>
<server>ext-master.video.debconf.org</server>
<port>8000</port>
- <mount>/davis_auditorium.ogv</mount>
+ <mount>/big_room.ogv</mount>
<username>relay</username>
<password>#PASSWORD#</password>
<on-demand>1</on-demand>
@@ -55,7 +55,7 @@
<relay>
<server>ext-master.video.debconf.org</server>
<port>8000</port>
- <mount>/interschool_lab.ogv</mount>
+ <mount>/round_room.ogv</mount>
<username>relay</username>
<password>#PASSWORD#</password>
<on-demand>1</on-demand>
@@ -72,13 +72,13 @@
<mount>
- <mount-name>/davis_auditorium.ogv</mount-name>
+ <mount-name>/big_room.ogv</mount-name>
<fallback-mount>/replay-ext.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
<mount>
- <mount-name>/interschool_lab.ogv</mount-name>
+ <mount-name>/round_room.ogv</mount-name>
<fallback-mount>/replay-ext.ogv</fallback-mount>
<fallback-override>1</fallback-override>
</mount>
Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog 2011-07-15 16:58:44 UTC (rev 642)
+++ package/trunk/debian/changelog 2011-07-16 08:03:30 UTC (rev 643)
@@ -1,3 +1,9 @@
+debconf-video (20110716.1) UNRELEASED; urgency=low
+
+ * Update configs for DebConf11 in Banja Luka, Bosnia and Herzegovina.
+
+ -- Holger Levsen <holger at debian.org> Sat, 31 Jul 2010 23:15:02 -0400
+
debconf-video (20100731.5) UNRELEASED; urgency=low
* icecast configs: use non capitalisation.
More information about the Debconf-video-commits
mailing list