vdr/vdr/debian changelog commands-loader.sh config-loader.sh

[Tobias Grimm]

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

Modified Files:
	changelog commands-loader.sh config-loader.sh 
Log Message:
new warning in commands.conf/reccmds.conf

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- changelog	2 Jan 2005 17:58:43 -0000	1.68
+++ changelog	5 Jan 2005 20:36:20 -0000	1.69
@@ -22,6 +22,7 @@
       processed, if one script requests to delay the shutdown.
     - Extracted loading of VDR deamon config options to separate file for
       later reuse by other start scripts
+    - Fixed warning message in generated commands.conf and reccmds.conf  
   * Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>
     - Do not run as user root anymore, the user vdr will be created
       and the video-directory and config-files will be changed, so the

Index: commands-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/commands-loader.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- commands-loader.sh	26 Oct 2004 23:41:14 -0000	1.4
+++ commands-loader.sh	5 Jan 2005 20:36:20 -0000	1.5
@@ -6,16 +6,9 @@
 {
 echo -e \
 "#\n"\
-"# WARNING: Do not edit this file! It is automatically generated by the\n"\
-"#          vdr init-script. If you want to define some custom commands,\n"\
-"#          put them in a file called $1.<name>.conf and restart vdr.\n"\
-"#          All $1.*.conf files will be concatenated to this file.\n"\
-"#\n"\
-"# WARNUNG: Ändern Sie nicht diese Datei! Diese Datei wird automatisch vom\n"\
-"#          vdr init-Skript generiert. Wenn Sie eigene Kommandos definieren\n"\
-"#          möchten, so schreiben Sie diese in eine Datei mit dem Namen\n"\
-"#          $1.<name>.conf und starten Sie vdr erneut. Alle\n"\
-"#          $1.*.conf -Dateien werden zu dieser Datei zusammengefügt.\n"\
+"# This file is automatically generated by the vdr init-script. You can\n"\
+"# define custom commands in /etc/vdr/command-hooks/$1.custom conf.\n"\
+"# (see /usr/share/doc/README.Debian.gz)
 "#\n\n\n"
 }
 

Index: config-loader.sh
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/config-loader.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- config-loader.sh	2 Jan 2005 17:58:43 -0000	1.1
+++ config-loader.sh	5 Jan 2005 20:36:20 -0000	1.2
@@ -3,7 +3,8 @@
 #
 
 #
-# Edit options for the VDR daemon in /etc/default/vdr !!!
+# Defaults - don't touch, edit options for the VDR daemon in
+# /etc/default/vdr !!!
 #
 
 # Config-Directory