vdr/vdr/debian vdr.postinst vdr.links vdr.dirs vdr.default rules

[Thomas Schmidt]

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

Modified Files:
	vdr.postinst vdr.links vdr.dirs vdr.default rules 
Log Message:
* new cfg-dir /var/lib/vdr
* install channels.conf into /var/lib/vdr
* link some files from /etc/vdr to /var/lib/vdr
* link commands.conf/reccmds.conf from /var/cache/vdr to /var/lib/vdr


Index: vdr.default
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.default,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- vdr.default	24 Apr 2004 15:47:03 -0000	1.2
+++ vdr.default	7 May 2004 19:13:51 -0000	1.3
@@ -14,7 +14,7 @@
 VIDEO_DIR="/var/lib/video"
 
 # Config-Directory
-CFG_DIR="/etc/vdr"
+CFG_DIR="/var/lib/vdr"
 
 # Plugin-Directory
 PLUGIN_DIR="/usr/lib/vdr/plugins"

Index: vdr.links
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.links,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vdr.links	6 May 2004 21:03:30 -0000	1.1
+++ vdr.links	7 May 2004 19:13:51 -0000	1.2
@@ -1,2 +1,11 @@
 etc/vdr/command-hooks/commands.custom.conf usr/share/vdr/command-hooks/commands.custom.conf
 etc/vdr/command-hooks/reccmds.custom.conf usr/share/vdr/command-hooks/reccmds.custom.conf
+
+var/cache/vdr/commands.conf var/lib/vdr/commands.conf 
+var/cache/vdr/reccmds.conf var/lib/vdr/reccmds.conf 
+
+etc/vdr/ca.conf var/lib/vdr/ca.conf
+etc/vdr/diseqc.conf var/lib/vdr/diseqc.conf
+etc/vdr/keymacros.conf var/lib/vdr/keymacros.conf
+etc/vdr/sources.conf var/lib/vdr/sources.conf
+etc/vdr/svdrphosts.conf var/lib/vdr/svdrphosts.conf

Index: vdr.postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.postinst,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vdr.postinst	24 Apr 2004 18:30:39 -0000	1.3
+++ vdr.postinst	7 May 2004 19:13:51 -0000	1.4
@@ -32,23 +32,23 @@
 	. /usr/share/debconf/confmodule
 	
 	# install channels.conf 
-	if [ ! -e /etc/vdr/channels.conf ]; then
+	if [ ! -e /var/lib/vdr/channels.conf ]; then
 		db_get vdr/select_dvb_card
 	
 		case "$RET" in
 	    	Sattelite)
-			gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz > /etc/vdr/channels.conf
-			chmod 644 /etc/vdr/channels.conf
+			gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz > /var/lib/vdr/channels.conf
+			chmod 644 /var/lib/vdr/channels.conf
 	    	;;
 
 	    	Terrestrial)
-                	gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz > /etc/vdr/channels.conf
-			chmod 644 /etc/vdr/channels.conf
+                	gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz > /var/lib/vdr/channels.conf
+			chmod 644 /var/lib/vdr/channels.conf
 	    	;;
 
 	    	Cable)
-                	gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz > /etc/vdr/channels.conf
-			chmod 644 /etc/vdr/channels.conf
+                	gzip -dc /usr/share/doc/vdr/examples/channels.conf.cable.gz > /var/lib/vdr/channels.conf
+			chmod 644 /var/lib/vdr/channels.conf
 	    	;;
 		esac
 	fi

Index: vdr.dirs
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.dirs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- vdr.dirs	6 May 2004 21:03:30 -0000	1.3
+++ vdr.dirs	7 May 2004 19:13:51 -0000	1.4
@@ -1,8 +1,10 @@
+etc/vdr/plugins
+etc/vdr/command-hooks
 usr/bin
-usr/sbin
 usr/include/vdr
 usr/lib/vdr/plugins
+usr/sbin
 usr/share/lintian/overrides
-etc/vdr/plugins
-etc/vdr/command-hooks
 usr/share/vdr/command-hooks
+var/cache/vdr
+var/lib/vdr

Index: rules
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/rules,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- rules	6 May 2004 21:30:58 -0000	1.17
+++ rules	7 May 2004 19:13:51 -0000	1.18
@@ -8,7 +8,7 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-CFGDIR    := /etc/vdr
+CFGDIR    := /var/lib/vdr
 DVBDIR    := /usr/include
 PLUGINDIR := /usr/lib/vdr/plugins
 VIDEODIR  := /var/lib/video