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

[holger at alioth.debian.org]

Author: holger
Date: 2008-08-08 23:06:46 +0000 (Fri, 08 Aug 2008)
New Revision: 227

Modified:
   package/trunk/conf/dc8/default-barney
   package/trunk/conf/dc8/default-scratchy
   package/trunk/conf/dc8/default-selma
   package/trunk/debian/changelog
   package/trunk/src/dc-import-recordings
Log:
* Fix syntax error in dc-import-recordings.
* Capitalize room names in conf/dc8/
* Add venue name to conf/dc8/default-barney.

Modified: package/trunk/conf/dc8/default-barney
===================================================================
--- package/trunk/conf/dc8/default-barney	2008-08-08 20:26:40 UTC (rev 226)
+++ package/trunk/conf/dc8/default-barney	2008-08-08 23:06:46 UTC (rev 227)
@@ -1,5 +1,6 @@
 # Name of the location from which we are recording
 CONFERENCE_NAME='DebConf8'
+VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
 # Database access (pygresql)
 DATABASE_DSN="skinner.debconf.org:pentabarf"
 DATABASE_USER=dc7video
@@ -8,3 +9,4 @@
 FILE_BASE="/video"
 ENCODING_HOSTS="daffy"
 PUBLICATION_PATH="apu.debconf.org:/dvd/2008/debconf8"
+

Modified: package/trunk/conf/dc8/default-scratchy
===================================================================
--- package/trunk/conf/dc8/default-scratchy	2008-08-08 20:26:40 UTC (rev 226)
+++ package/trunk/conf/dc8/default-scratchy	2008-08-08 23:06:46 UTC (rev 227)
@@ -1,6 +1,6 @@
 # Name of the location from which we are recording
 VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="microcine"
+ROOM_NAME="Microcine"
 # Sources and sinks
 SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
 SINKS="icecast:daffy file:barney"

Modified: package/trunk/conf/dc8/default-selma
===================================================================
--- package/trunk/conf/dc8/default-selma	2008-08-08 20:26:40 UTC (rev 226)
+++ package/trunk/conf/dc8/default-selma	2008-08-08 23:06:46 UTC (rev 227)
@@ -1,6 +1,6 @@
 # Name of the location from which we are recording
 VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="salon del mar"
+ROOM_NAME="Salon del mar"
 # Sources and sinks
 SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
 SINKS="icecast:daffy file:barney"

Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog	2008-08-08 20:26:40 UTC (rev 226)
+++ package/trunk/debian/changelog	2008-08-08 23:06:46 UTC (rev 227)
@@ -1,3 +1,11 @@
+debconf-video (8.0~dc8+9) UNRELEASED; urgency=low
+
+  * Fix syntax error in dc-import-recordings.
+  * Capitalize room names in conf/dc8/
+  * Add venue name to conf/dc8/default-barney.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 08 Aug 2008 19:02:58 -0300
+
 debconf-video (8.0~dc8+8) etch; urgency=low
 
   * Set conferenence name in barneys config.

Modified: package/trunk/src/dc-import-recordings
===================================================================
--- package/trunk/src/dc-import-recordings	2008-08-08 20:26:40 UTC (rev 226)
+++ package/trunk/src/dc-import-recordings	2008-08-08 23:06:46 UTC (rev 227)
@@ -62,7 +62,7 @@
                 ' recording_time, recording_duration, recording_filename,'
                 ' file_status_id)'
                 ' VALUES (%(conf_id)d, '
-                ' (SELECT conference_room FROM conference_room WHERE conference_id=%(conf_id)d AND lower(replace(conference_room, ' ', '_'))=%(room)s),'
+                ' (SELECT conference_room FROM conference_room WHERE conference_id=%(conf_id)d AND conference_room=%(room)s),'
                 ' %(date_time)s, %(duration)s, %(filename)s,'
                 ' (SELECT id FROM video_file_status WHERE file_status_code=%(status)s))',
                 {'conf_id': conf_id,