[Debconf-video-commits] r694 - in package/trunk: conf/dc11 conf/streaming/debconf debian
Holger Levsen
holger at alioth.debian.org
Fri Jul 22 16:03:18 UTC 2011
Author: holger
Date: 2011-07-22 16:03:18 +0000 (Fri, 22 Jul 2011)
New Revision: 694
Modified:
package/trunk/conf/dc11/default-scratchy
package/trunk/conf/dc11/default-selma
package/trunk/conf/streaming/debconf/ezstream-dc-ext-replay.xml
package/trunk/conf/streaming/debconf/ezstream-dc-int-replay.xml
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:
Make all room names match and update hostnames to lisa.dc11.dc.org
and scelsi.debian.org.
+ release
Modified: package/trunk/conf/dc11/default-scratchy
===================================================================
--- package/trunk/conf/dc11/default-scratchy 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/dc11/default-scratchy 2011-07-22 16:03:18 UTC (rev 694)
@@ -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="Talk_room_2"
+ROOM_NAME="Roundroom"
# 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-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/dc11/default-selma 2011-07-22 16:03:18 UTC (rev 694)
@@ -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="Talk_room_1"
+ROOM_NAME="Auditorium"
# Sources and sinks
SOURCES="firewire:selma firewire:patty firewire:jackie"
SINKS="icecast:todd file:selma"
Modified: package/trunk/conf/streaming/debconf/ezstream-dc-ext-replay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/ezstream-dc-ext-replay.xml 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/streaming/debconf/ezstream-dc-ext-replay.xml 2011-07-22 16:03:18 UTC (rev 694)
@@ -1,5 +1,5 @@
<ezstream>
- <url>http://ext-master.video.debconf.org:8000/replay-ext.ogv</url>
+ <url>http://scelsi.debian.org:8000/replay-ext.ogv</url>
<sourcepassword>#PASSWORD#</sourcepassword>
<format>THEORA</format>
<filename>#PLAYLIST_PATH#</filename>
Modified: package/trunk/conf/streaming/debconf/ezstream-dc-int-replay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/ezstream-dc-int-replay.xml 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/streaming/debconf/ezstream-dc-int-replay.xml 2011-07-22 16:03:18 UTC (rev 694)
@@ -1,5 +1,5 @@
<ezstream>
- <url>http://int-master.video.debconf.org:8000/replay-int.ogv</url>
+ <url>http://lisa.dc11.debconf.org:8000/replay-int.ogv</url>
<sourcepassword>#PASSWORD#</sourcepassword>
<format>THEORA</format>
<filename>#PLAYLIST_PATH#</filename>
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:56:18 UTC (rev 693)
+++ package/trunk/conf/streaming/debconf/icecast-dc-ext-master.xml 2011-07-22 16:03:18 UTC (rev 694)
@@ -30,7 +30,7 @@
<!-- This is the hostname other people will use to connect to your server.
It affects mainly the urls generated by Icecast for playlists and yp
listings. -->
- <hostname>ext-master.video.debconf.org</hostname>
+ <hostname>scelsi.debian.org</hostname>
<listen-socket>
<port>8000</port>
@@ -39,7 +39,7 @@
<fileserve>0</fileserve>
<relay>
- <server>int-master.video.debconf.org</server>
+ <server>lisa.dc11.debconf.org</server>
<port>8000</port>
<mount>/Auditorium.ogv</mount>
<username>relay</username>
@@ -48,7 +48,7 @@
</relay>
<relay>
- <server>int-master.video.debconf.org</server>
+ <server>lisa.dc11.debconf.org</server>
<port>8000</port>
<mount>/Roundroom.ogv</mount>
<username>relay</username>
Modified: package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/streaming/debconf/icecast-dc-int-master.xml 2011-07-22 16:03:18 UTC (rev 694)
@@ -31,8 +31,8 @@
It affects mainly the urls generated by Icecast for playlists and yp
listings. -->
<!-- Inside the conference, video.debconf.org should resolve to this
- server (known externally as int-master.video.debconf.org). -->
- <hostname>int-master.video.debconf.org</hostname>
+ server (known externally as lisa.dc11.debconf.org). -->
+ <hostname>lisa.dc11..debconf.org</hostname>
<listen-socket>
<port>8000</port>
Modified: package/trunk/conf/streaming/debconf/icecast-dc-relay.xml
===================================================================
--- package/trunk/conf/streaming/debconf/icecast-dc-relay.xml 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/conf/streaming/debconf/icecast-dc-relay.xml 2011-07-22 16:03:18 UTC (rev 694)
@@ -44,7 +44,7 @@
<fileserve>0</fileserve>
<relay>
- <server>ext-master.video.debconf.org</server>
+ <server>scelsi.debian.org</server>
<port>8000</port>
<mount>/Auditorium.ogv</mount>
<username>relay</username>
@@ -53,7 +53,7 @@
</relay>
<relay>
- <server>ext-master.video.debconf.org</server>
+ <server>scelsi.debian.org</server>
<port>8000</port>
<mount>/Roundroom.ogv</mount>
<username>relay</username>
@@ -62,7 +62,7 @@
</relay>
<relay>
- <server>ext-master.video.debconf.org</server>
+ <server>scelsi.debian.org</server>
<port>8000</port>
<mount>/replay-ext.ogv</mount>
<username>relay</username>
Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog 2011-07-22 15:56:18 UTC (rev 693)
+++ package/trunk/debian/changelog 2011-07-22 16:03:18 UTC (rev 694)
@@ -1,3 +1,10 @@
+debconf-video (20110722.3) squeeze; urgency=low
+
+ * Make all room names match and update hostnames to lisa.dc11.dc.org
+ and scelsi.debian.org.
+
+ -- Holger Levsen <holger at debian.org> Fri, 22 Jul 2011 18:02:31 +0200
+
debconf-video (20110722.2) squeeze; urgency=low
* Do s#Talk_room_1#Auditorium#g and s#Talk_room_2#Roundroom#g again.
More information about the Debconf-video-commits
mailing list