[Debconf-video-commits] r231 - in package/trunk: conf/dc8 debian

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-09 00:26:19 +0000 (Sat, 09 Aug 2008)
New Revision: 231

Added:
   package/trunk/conf/dc8/dvswitchrc-marge
Modified:
   package/trunk/conf/dc8/default-selma
   package/trunk/debian/changelog
Log:
 * Added marge, so that selma doesn't need firewire as it doesnt work on that
   hardware.



Modified: package/trunk/conf/dc8/default-selma
===================================================================
--- package/trunk/conf/dc8/default-selma	2008-08-08 23:54:17 UTC (rev 230)
+++ package/trunk/conf/dc8/default-selma	2008-08-09 00:26:19 UTC (rev 231)
@@ -2,7 +2,7 @@
 VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
 ROOM_NAME="Salon del mar"
 # Sources and sinks
-SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
+SOURCES="firewire:marge firewire:patty/0 firewire:patty/1"
 SINKS="icecast:daffy file:barney"
 # Icecast streaming server parameters
 ICECAST_ADDR=lisa.dc8.debconf.org

Added: package/trunk/conf/dc8/dvswitchrc-marge
===================================================================
--- package/trunk/conf/dc8/dvswitchrc-marge	                        (rev 0)
+++ package/trunk/conf/dc8/dvswitchrc-marge	2008-08-09 00:26:19 UTC (rev 231)
@@ -0,0 +1,2 @@
+MIXER_HOST=selma
+MIXER_PORT=4321

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2008-08-08 23:54:17 UTC (rev 230)
+++ package/trunk/debian/changelog	2008-08-09 00:26:19 UTC (rev 231)
@@ -1,3 +1,14 @@
+debconf-video (8.0~dc8+10) etch; urgency=low
+
+  [ Eric Dantan Rzewnicki ]
+  * Change room names to start with upper case to match penta.
+
+  [ Holger Levsen]
+  * Added marge, so that selma doesn't need firewire as it doesnt work on that
+    hardware.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 08 Aug 2008 21:23:26 -0300
+
 debconf-video (8.0~dc8+9) etch; urgency=low
 
   * Fix syntax error in dc-import-recordings.