[Debconf-video-commits] r673 - in package/trunk: conf/dc11 debian

[Holger Levsen]

Author: holger
Date: 2011-07-20 19:55:24 +0000 (Wed, 20 Jul 2011)
New Revision: 673

Removed:
   package/trunk/conf/dc11/default-daffy
   package/trunk/conf/dc11/dvswitchrc-daffy
   package/trunk/conf/dc11/dvswitchrc-marge
Modified:
   package/trunk/conf/dc11/default-selma
   package/trunk/debian/changelog
Log:
Adjust configuration for selma, drop configs from unused hosts.

& release

Deleted: package/trunk/conf/dc11/default-daffy
===================================================================
--- package/trunk/conf/dc11/default-daffy	2011-07-20 19:54:04 UTC (rev 672)
+++ package/trunk/conf/dc11/default-daffy	2011-07-20 19:55:24 UTC (rev 673)
@@ -1,23 +0,0 @@
-# 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.video.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="skinner.debconf.org:pentabarf"
-DATABASE_USER="dc7video"
-DATABASE_PASSWORD=#DATABASE_PASSWORD#

Modified: package/trunk/conf/dc11/default-selma
===================================================================
--- package/trunk/conf/dc11/default-selma	2011-07-20 19:54:04 UTC (rev 672)
+++ package/trunk/conf/dc11/default-selma	2011-07-20 19:55:24 UTC (rev 673)
@@ -3,8 +3,8 @@
 VENUE_NAME="Banski Dvor, Banja Luka, Bosnia and Herzegovina"
 ROOM_NAME="Talk_room_1"
 # Sources and sinks
-SOURCES="firewire:sideshow firewire:patty firewire:jackie"
-SINKS="icecast:ned file:selma"
+SOURCES="firewire:selma firewire:patty firewire:jackie"
+SINKS="icecast:todd file:selma"
 # Icecast streaming server parameters
 ICECAST_ADDR=lisa.dc11.debconf.org
 ICECAST_PORT=8000

Deleted: package/trunk/conf/dc11/dvswitchrc-daffy
===================================================================
--- package/trunk/conf/dc11/dvswitchrc-daffy	2011-07-20 19:54:04 UTC (rev 672)
+++ package/trunk/conf/dc11/dvswitchrc-daffy	2011-07-20 19:55:24 UTC (rev 673)
@@ -1,3 +0,0 @@
-MIXER_HOST=scratchy
-MIXER_PORT=4321
-VIDEO_STANDARD=pal

Deleted: package/trunk/conf/dc11/dvswitchrc-marge
===================================================================
--- package/trunk/conf/dc11/dvswitchrc-marge	2011-07-20 19:54:04 UTC (rev 672)
+++ package/trunk/conf/dc11/dvswitchrc-marge	2011-07-20 19:55:24 UTC (rev 673)
@@ -1,3 +0,0 @@
-MIXER_HOST=selma
-MIXER_PORT=4321
-VIDEO_STANDARD=pal

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2011-07-20 19:54:04 UTC (rev 672)
+++ package/trunk/debian/changelog	2011-07-20 19:55:24 UTC (rev 673)
@@ -1,8 +1,9 @@
-debconf-video (20110719.2) UNRELEASED; urgency=low
+debconf-video (20110720.1) squeeze; urgency=low
 
   * Rename ROOM_NAMEs and URLs to "Talk_room_1" +2.
+  * Adjust configuration for selma, drop configs from unused hosts.
 
- -- Holger Levsen <holger at debian.org>  Wed, 20 Jul 2011 11:59:21 +0200
+ -- Holger Levsen <holger at debian.org>  Wed, 20 Jul 2011 21:51:54 +0200
 
 debconf-video (20110719.1) squeeze; urgency=low