[Debconf-video-commits] r606 - in package/trunk: conf/dc10 debian

[Holger Levsen]

Author: holger
Date: 2010-07-31 22:42:36 +0000 (Sat, 31 Jul 2010)
New Revision: 606

Added:
   package/trunk/conf/dc10/dvswitchrc-blinky
Modified:
   package/trunk/conf/dc10/default-scratchy
   package/trunk/conf/dc10/default-selma
   package/trunk/debian/changelog
Log:
* Adopt configs for Davis to reality.
* Update the dia.
* Adopt configs for Interschool to reality.

Modified: package/trunk/conf/dc10/default-scratchy
===================================================================
--- package/trunk/conf/dc10/default-scratchy	2010-07-31 22:17:46 UTC (rev 605)
+++ package/trunk/conf/dc10/default-scratchy	2010-07-31 22:42:36 UTC (rev 606)
@@ -1,10 +1,10 @@
 # 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"
+ROOM_NAME="interschool_lab"
 # Sources and sinks
-SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
-SINKS="icecast:daffy file:barney"
+SOURCES="firewire:scratchy firewire:blinky firewire:itchy"
+SINKS="icecast:todd file:scratchy"
 # Icecast streaming server parameters
 ICECAST_ADDR=lisa.dc10.debconf.org
 ICECAST_PORT=8000

Modified: package/trunk/conf/dc10/default-selma
===================================================================
--- package/trunk/conf/dc10/default-selma	2010-07-31 22:17:46 UTC (rev 605)
+++ package/trunk/conf/dc10/default-selma	2010-07-31 22:42:36 UTC (rev 606)
@@ -1,10 +1,10 @@
 # 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"
+ROOM_NAME="davis_auditorium"
 # Sources and sinks
-SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
-SINKS="icecast:daffy file:barney"
+SOURCES="firewire:sideshow firewire:patty firewire:jackie"
+SINKS="icecast:ned file:selma"
 # Icecast streaming server parameters
 ICECAST_ADDR=lisa.dc10.debconf.org
 ICECAST_PORT=8000

Copied: package/trunk/conf/dc10/dvswitchrc-blinky (from rev 595, package/trunk/conf/dc10/dvswitchrc-itchy)
===================================================================
--- package/trunk/conf/dc10/dvswitchrc-blinky	                        (rev 0)
+++ package/trunk/conf/dc10/dvswitchrc-blinky	2010-07-31 22:42:36 UTC (rev 606)
@@ -0,0 +1,2 @@
+MIXER_HOST=scratchy
+MIXER_PORT=4321

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2010-07-31 22:17:46 UTC (rev 605)
+++ package/trunk/debian/changelog	2010-07-31 22:42:36 UTC (rev 606)
@@ -1,3 +1,19 @@
+debconf-video (20100731.2) squeeze; urgency=low
+
+  * Adopt configs for Davis to reality.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 31 Jul 2010 18:42:25 -0400
+
+debconf-video (20100731.1) squeeze; urgency=low
+
+  [ Eric Dantan Rzewnicki ]
+  * Update the dia.
+
+  [ Holger Levsen ]
+  * Adopt configs for Interschool to reality.
+
+ -- Holger Levsen <holger at debian.org>  Sat, 31 Jul 2010 16:30:54 -0400
+
 debconf-video (20100630.1) squeeze; urgency=low
 
   [ Eric Dantan Rzewnicki ]