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

[Holger Levsen]

Author: holger
Date: 2011-07-20 10:00:43 +0000 (Wed, 20 Jul 2011)
New Revision: 664

Modified:
   package/trunk/conf/dc11/default-scratchy
   package/trunk/conf/dc11/default-selma
   package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
   package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
   package/trunk/debian/changelog
Log:
Rename ROOM_NAMEs and URLs to "Talk_room_1" +2.

Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc11/default-scratchy	2011-07-19 21:13:14 UTC (rev 663)
+++ package/trunk/conf/dc11/default-scratchy	2011-07-20 10:00:43 UTC (rev 664)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf11'
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
-ROOM_NAME="talkroom2"
+ROOM_NAME="Talk_room_2"
 # Sources and sinks
 SOURCES="firewire:scratchy firewire:blinky firewire:itchy"
 SINKS="icecast:todd file:scratchy"

Modified: package/trunk/conf/dc11/default-selma
===================================================================
--- package/trunk/conf/dc11/default-selma	2011-07-19 21:13:14 UTC (rev 663)
+++ package/trunk/conf/dc11/default-selma	2011-07-20 10:00:43 UTC (rev 664)
@@ -1,7 +1,7 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf11'
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
-ROOM_NAME="talkroom1"
+ROOM_NAME="Talk_room_1"
 # Sources and sinks
 SOURCES="firewire:sideshow firewire:patty firewire:jackie"
 SINKS="icecast:ned file:selma"

Modified: package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-19 21:13:14 UTC (rev 663)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml	2011-07-20 10:00:43 UTC (rev 664)
@@ -41,7 +41,7 @@
     <relay>
         <server>int-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/talkroom1.ogv</mount>
+        <mount>/Talk_room_1.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>/talkroom2.ogv</mount>
+        <mount>/Talk_room_2.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
     </relay>
 
     <mount>
-        <mount-name>/talkroom1.ogv</mount-name>
+        <mount-name>/Talk_room_1.ogv</mount-name>
     </mount>
 
     <mount>
-        <mount-name>/talkroom2.ogv</mount-name>
+        <mount-name>/Talk_room_2.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-19 21:13:14 UTC (rev 663)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml	2011-07-20 10:00:43 UTC (rev 664)
@@ -46,7 +46,7 @@
     <relay>
         <server>ext-master.video.debconf.org</server>
         <port>8000</port>
-        <mount>/talkroom1.ogv</mount>
+        <mount>/Talk_room_1.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>/talkroom2.ogv</mount>
+        <mount>/Talk_room_2.ogv</mount>
         <username>relay</username>
         <password>#PASSWORD#</password>
         <on-demand>1</on-demand>
@@ -72,13 +72,13 @@
 
 
     <mount>
-        <mount-name>/talkroom1.ogv</mount-name>
+        <mount-name>/Talk_room_1.ogv</mount-name>
         <fallback-mount>/replay-ext.ogv</fallback-mount>
         <fallback-override>1</fallback-override>
     </mount>
 
     <mount>
-        <mount-name>/talkroom2.ogv</mount-name>
+        <mount-name>/Talk_room_2.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-19 21:13:14 UTC (rev 663)
+++ package/trunk/debian/changelog	2011-07-20 10:00:43 UTC (rev 664)
@@ -1,3 +1,9 @@
+debconf-video (20110719.2) UNRELEASED; urgency=low
+
+  * Rename ROOM_NAMEs and URLs to "Talk_room_1" +2.
+
+ -- Holger Levsen <holger at debian.org>  Wed, 20 Jul 2011 11:59:21 +0200
+
 debconf-video (20110719.1) squeeze; urgency=low
 
   * Update configs for DebConf11 in Banja Luka, Bosnia and Herzegovina.