vdr/vdr/debian changelog vdr.default vdr.init

[Tobias Grimm]

Update of /cvsroot/pkg-vdr-dvb/vdr/vdr/debian
In directory haydn:/tmp/cvs-serv13725

Modified Files:
	changelog vdr.default vdr.init 
Log Message:
moved some options from /etc/default/vdr to init script

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- changelog	15 Aug 2004 15:01:22 -0000	1.46
+++ changelog	26 Sep 2004 17:52:17 -0000	1.47
@@ -2,6 +2,11 @@
 
   * Thomas Günther <tom@toms-cafe.de>:
     - new (optional) plugin check (with "vdr -V -P plugin")
+  * Tobias Grimm <tg@e-tobi.net> 
+    - fixed small bug in vdr-recordingaction
+    - moved PLUGIN_DIR, PLUGIN_PREFIX, CFG_DIR, PLUGIN_CFG_DIR,
+      PLUGIN_ORDER_FILE, CMDHOOKSDIR, REC_CMD and SHUTDOWN_CMD from the
+      default file to the init script
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun, 15 Aug 2004 18:00:00 +0200 
 

Index: vdr.default
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.default,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- vdr.default	15 Aug 2004 15:01:22 -0000	1.13
+++ vdr.default	26 Sep 2004 17:52:17 -0000	1.14
@@ -9,35 +9,11 @@
 # Video-Directory
 VIDEO_DIR="/var/lib/video"
 
-# Config-Directory
-CFG_DIR="/var/lib/vdr"
-
-# Plugin-Directory
-PLUGIN_DIR="/usr/lib/vdr/plugins"
-
-# Plugin Config-Directory
-PLUGIN_CFG_DIR="/etc/vdr/plugins"
-
-# Plugin prefix
-PLUGIN_PREFIX="libvdr-"
-
-# Plugin order configuration
-PLUGIN_ORDER_FILE="/etc/vdr/plugins/order.conf"
-
 # Set this to load only startable plugins (check with "vdr -V -P plugin")
 PLUGIN_CHECK_STARTABLE="yes"
 
 # Set this to load only plugins with the correct patch level
 PLUGIN_CHECK_PATCHLEVEL="no"
-
-# Command-Hooks Directory
-CMDHOOKSDIR="/usr/share/vdr/command-hooks"
-
-# Commmand executed on start, stop and editing of a recording
-REC_CMD=/usr/lib/vdr/vdr-recordingaction
-
-# Commmand executed by vdr to shutdown the system
-SHUTDOWN_CMD=/usr/lib/vdr/vdr-shutdown
 
 # Options that will be passed to vdr's commandline
 # for example: OPTIONS="-w 15 --port=0"

Index: vdr.init
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.init,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- vdr.init	7 Aug 2004 11:32:59 -0000	1.26
+++ vdr.init	26 Sep 2004 17:52:17 -0000	1.27
@@ -3,6 +3,30 @@
 # vdr start-stop script
 #
 
+# Config-Directory
+CFG_DIR="/var/lib/vdr"
+
+# Plugin-Directory
+PLUGIN_DIR="/usr/lib/vdr/plugins"
+
+# Plugin Config-Directory
+PLUGIN_CFG_DIR="/etc/vdr/plugins"
+
+# Plugin prefix
+PLUGIN_PREFIX="libvdr-"
+
+# Plugin order configuration
+PLUGIN_ORDER_FILE="/etc/vdr/plugins/order.conf"
+
+# Command-Hooks Directory
+CMDHOOKSDIR="/usr/share/vdr/command-hooks"
+
+# Commmand executed on start, stop and editing of a recording
+REC_CMD=/usr/lib/vdr/vdr-recordingaction
+
+# Commmand executed by vdr to shutdown the system
+SHUTDOWN_CMD=/usr/lib/vdr/vdr-shutdown
+
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 NAME=vdr
 DESC="Linux Video Disk Recorder"