[Debconf-video-commits] r169 - in package/trunk: conf conf/dc8 debian
holger at alioth.debian.org
holger at alioth.debian.org
Tue Aug 5 16:58:24 UTC 2008
Author: holger
Date: 2008-08-05 16:58:23 +0000 (Tue, 05 Aug 2008)
New Revision: 169
Added:
package/trunk/conf/dc8/default-itchy
package/trunk/conf/dc8/default-patty
package/trunk/conf/dc8/default-scratchy
package/trunk/conf/dc8/default-selma
Removed:
package/trunk/conf/dc8/default-talk1
package/trunk/conf/dc8/default-talk2
package/trunk/conf/dc8/dvswitchrc-talk1
package/trunk/conf/dc8/dvswitchrc-talk2
Modified:
package/trunk/conf/default
package/trunk/debian/changelog
package/trunk/debian/control
package/trunk/debian/rules
Log:
* Install the conf dir into /usr/share/doc/debconf-video/conf so we can copy
it with fai to /etc/default/debconf-video and sed the right passwords in,
after setting them manually once.
* Added Ben and myself to uploaders.
Copied: package/trunk/conf/dc8/default-itchy (from rev 168, package/trunk/conf/dc8/dvswitchrc-talk2)
===================================================================
--- package/trunk/conf/dc8/default-itchy (rev 0)
+++ package/trunk/conf/dc8/default-itchy 2008-08-05 16:58:23 UTC (rev 169)
@@ -0,0 +1,2 @@
+MIXER_HOST=scratchy
+MIXER_PORT=4321
Copied: package/trunk/conf/dc8/default-patty (from rev 168, package/trunk/conf/dc8/dvswitchrc-talk1)
===================================================================
--- package/trunk/conf/dc8/default-patty (rev 0)
+++ package/trunk/conf/dc8/default-patty 2008-08-05 16:58:23 UTC (rev 169)
@@ -0,0 +1,2 @@
+MIXER_HOST=selma
+MIXER_PORT=4321
Copied: package/trunk/conf/dc8/default-scratchy (from rev 168, package/trunk/conf/dc8/default-talk2)
===================================================================
--- package/trunk/conf/dc8/default-scratchy (rev 0)
+++ package/trunk/conf/dc8/default-scratchy 2008-08-05 16:58:23 UTC (rev 169)
@@ -0,0 +1,18 @@
+# Name of the location from which we are recording
+VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
+ROOM_NAME="Microcine"
+# Sources and sinks
+SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
+SINKS="icecast:daffy file:barney"
+# Icecast streaming server parameters
+ICECAST_ADDR=int-master.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"
Copied: package/trunk/conf/dc8/default-selma (from rev 168, package/trunk/conf/dc8/default-talk1)
===================================================================
--- package/trunk/conf/dc8/default-selma (rev 0)
+++ package/trunk/conf/dc8/default-selma 2008-08-05 16:58:23 UTC (rev 169)
@@ -0,0 +1,18 @@
+# Name of the location from which we are recording
+VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
+ROOM_NAME="Salon del Mar"
+# Sources and sinks
+SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
+SINKS="icecast:daffy file:barney"
+# Icecast streaming server parameters
+ICECAST_ADDR=int-master.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"
Deleted: package/trunk/conf/dc8/default-talk1
===================================================================
--- package/trunk/conf/dc8/default-talk1 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/conf/dc8/default-talk1 2008-08-05 16:58:23 UTC (rev 169)
@@ -1,18 +0,0 @@
-# Name of the location from which we are recording
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="Salon del Mar"
-# Sources and sinks
-SOURCES="firewire:selma firewire:patty/0 firewire:patty/1"
-SINKS="icecast:daffy file:barney"
-# Icecast streaming server parameters
-ICECAST_ADDR=int-master.video.debconf.org
-ICECAST_PORT=8000
-ICECAST_PASS=hackme
-# 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"
Deleted: package/trunk/conf/dc8/default-talk2
===================================================================
--- package/trunk/conf/dc8/default-talk2 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/conf/dc8/default-talk2 2008-08-05 16:58:23 UTC (rev 169)
@@ -1,18 +0,0 @@
-# Name of the location from which we are recording
-VENUE_NAME="Hotel Dora, Mar del Plata, Argentina"
-ROOM_NAME="Microcine"
-# Sources and sinks
-SOURCES="firewire:scratchy firewire:itchy/0 firewire:itchy/1"
-SINKS="icecast:daffy file:barney"
-# Icecast streaming server parameters
-ICECAST_ADDR=int-master.video.debconf.org
-ICECAST_PORT=8000
-ICECAST_PASS=hackme
-# 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"
Deleted: package/trunk/conf/dc8/dvswitchrc-talk1
===================================================================
--- package/trunk/conf/dc8/dvswitchrc-talk1 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/conf/dc8/dvswitchrc-talk1 2008-08-05 16:58:23 UTC (rev 169)
@@ -1,2 +0,0 @@
-MIXER_HOST=selma
-MIXER_PORT=4321
Deleted: package/trunk/conf/dc8/dvswitchrc-talk2
===================================================================
--- package/trunk/conf/dc8/dvswitchrc-talk2 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/conf/dc8/dvswitchrc-talk2 2008-08-05 16:58:23 UTC (rev 169)
@@ -1,2 +0,0 @@
-MIXER_HOST=scratchy
-MIXER_PORT=4321
Modified: package/trunk/conf/default
===================================================================
--- package/trunk/conf/default 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/conf/default 2008-08-05 16:58:23 UTC (rev 169)
@@ -8,7 +8,7 @@
# Icecast streaming server parameters
ICECAST_ADDR=int-master.video.debconf.org
ICECAST_PORT=8000
-ICECAST_PASS=hackme
+ICECAST_PASS=#ICECAST_PASS#
# Stream encoding parameters
VIDEO_STREAM_WIDTH=320
VIDEO_STREAM_HEIGHT=240
Modified: package/trunk/debian/changelog
===================================================================
--- package/trunk/debian/changelog 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/debian/changelog 2008-08-05 16:58:23 UTC (rev 169)
@@ -5,8 +5,14 @@
* Changed dc-do-transcoding to set generated_time
* Added dc-make-rss script to generate an RSS feed of published videos
- --
+ [ Holger Levsen ]
+ * Install the conf dir into /usr/share/doc/debconf-video/conf so we can copy
+ it with fai to /etc/default/debconf-video and sed the right passwords in,
+ after setting them manually once.
+ * Added Ben and myself to uploaders.
+ -- Holger Levsen <holger at debian.org> Tue, 05 Aug 2008 13:58:11 -0300
+
debconf-video (8.0~dc8+1) etch; urgency=low
[ Ben Hutchings ]
Modified: package/trunk/debian/control
===================================================================
--- package/trunk/debian/control 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/debian/control 2008-08-05 16:58:23 UTC (rev 169)
@@ -2,6 +2,7 @@
Section: graphics
Priority: extra
Maintainer: DebConf video team <debconf-video at lists.debconf.org>
+Uploaders: Ben Hutchings <ben at decadent.org.uk>, Holger Levsen <holger at debian.org>
Build-Depends: debhelper (>= 5.0.0), python
Standards-Version: 3.7.2
Modified: package/trunk/debian/rules
===================================================================
--- package/trunk/debian/rules 2008-08-05 16:40:39 UTC (rev 168)
+++ package/trunk/debian/rules 2008-08-05 16:58:23 UTC (rev 169)
@@ -16,6 +16,8 @@
# debconf-video-common: common configuration file
mkdir -p -m 755 debian/debconf-video-common/etc/default
install -m 664 -g video conf/default debian/debconf-video-common/etc/default/debconf-video
+ mkdir -p debian/debconf-video-common/usr/share/doc/debconf-video-common/
+ cp -a conf debian/debconf-video-common/usr/share/doc/debconf-video-common/
# debconf-video-switch: scripts for the switch machines
mkdir -p -m 755 debian/debconf-video-switch/usr/bin
install src/dc-record-stream src/dc-start-sink src/dc-start-source debian/debconf-video-switch/usr/bin/
More information about the Debconf-video-commits
mailing list