[Debconf-video-commits] r691 - in package/trunk: conf/dc11 conf/streaming/debconf debian

[Holger Levsen]

Author: holger
Date: 2011-07-22 15:47:52 +0000 (Fri, 22 Jul 2011)
New Revision: 691

Added:
   package/trunk/conf/dc11/default-todd
Modified:
   package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
   package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
   package/trunk/debian/changelog
Log:
* Do s#Talk_room_1#Auditorium#g and s#Talk_room_2#Roundroom#g again.
* Add config file for todd. 

Copied: package/trunk/conf/dc11/default-todd (from rev 643, package/trunk/conf/dc11/default-lisa)
===================================================================
--- package/trunk/conf/dc11/default-todd	                        (rev 0)
+++ package/trunk/conf/dc11/default-todd	2011-07-22 15:47:52 UTC (rev 691)
@@ -0,0 +1,23 @@
+# Name of the location from which we are recording
+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.dc11.debconf.org
+ICECAST_PORT=8000
+ICECAST_PASS=#ICECAST_PASS#
+# Stream encoding parameters
+VIDEO_STREAM_WIDTH=320
+VIDEO_STREAM_HEIGHT=240
+VIDEO_STREAM_KBPS=230
+AUDIO_STREAM_HZ=48000
+AUDIO_STREAM_KBPS=64
+# File store base directory
+FILE_BASE="/video"
+# Database access (pygresql)
+DATABASE_DSN="localhost:pentabarf"
+DATABASE_USER="pentabarf"
+#DATABASE_PASSWORD=

Modified: package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-22 15:12:04 UTC (rev 690)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-22 15:47:52 UTC (rev 691)
@@ -41,7 +41,7 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Talk_room_1.ogv</mount>
+        <mount>/Auditorium.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>/Talk_room_2.ogv</mount>
+        <mount>/Roundroom.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
     </relay>
 
     <mount>
-        <mount-name>/Talk_room_1.ogv</mount-name>
+        <mount-name>/Auditorium.ogv</mount-name>
     </mount>
 
     <mount>
-        <mount-name>/Talk_room_2.ogv</mount-name>
+        <mount-name>/Roundroom.ogv</mount-name>
     </mount>
 
     <mount>

Modified: package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2011-07-22 15:12:04 UTC (rev 690)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2011-07-22 15:47:52 UTC (rev 691)
@@ -46,7 +46,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/Talk_room_1.ogv</mount>
+        <mount>/Auditorium.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>/Talk_room_2.ogv</mount>
+        <mount>/Roundroom.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -72,13 +72,13 @@
 
 
     <mount>
-        <mount-name>/Talk_room_1.ogv</mount-name>
+        <mount-name>/Auditorium.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>
 
     <mount>
-        <mount-name>/Talk_room_2.ogv</mount-name>
+        <mount-name>/Roundroom.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-22 15:12:04 UTC (rev 690)
+++ package/trunk/debian/changelog	2011-07-22 15:47:52 UTC (rev 691)
@@ -1,3 +1,15 @@
+debconf-video (20110722.2) UNRELEASED; urgency=low
+
+  * Do s#Talk_room_1#Auditorium#g and s#Talk_room_2#Roundroom#g again.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 22 Jul 2011 17:45:08 +0200
+
+debconf-video (20110722.1) squeeze; urgency=low
+
+  * Add config file for todd. 
+
+ -- Holger Levsen <holger at debian.org>  Fri, 22 Jul 2011 16:01:13 +0200
+
 debconf-video (20110720.1) squeeze; urgency=low
 
   * Rename ROOM_NAMEs and URLs to "Talk_room_1" +2.