vdr/vdr/debian vdr.NEWS changelog vdr.install vdr.postinst

[Thomas Schmidt]

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

Modified Files:
	changelog vdr.install vdr.postinst 
Added Files:
	vdr.NEWS 
Log Message:
move non-static cfg-files from /etc/vdr to /var/lib/vdr and added a simple vdr.NEWS-file to document this

--- NEW FILE: vdr.NEWS ---
vdr (1.2.6-4) unstable; urgency=low

  In this Release, we changed the path of some non-static  conf-files from
  /etc/vdr to /var/lib/vdr, these files will be moved by the postinst-script
  to the right location.

 -- Thomas Schmidt <thomas.schmidt@in.stud.tu-ilmenau.de>  Sat, 29 May 2004 19:43:49 +0200

Index: vdr.install
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.install,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vdr.install	28 May 2004 09:54:10 -0000	1.4
+++ vdr.install	29 May 2004 18:00:51 -0000	1.5
@@ -14,7 +14,7 @@
 debian/plugin-loader.sh   usr/lib/vdr
 debian/commands-loader.sh usr/lib/vdr
 
-ca.conf	        etc/vdr/
+ca.conf	       etc/vdr/
 diseqc.conf     etc/vdr/
 keymacros.conf  etc/vdr/
 sources.conf    etc/vdr/

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/changelog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- changelog	28 May 2004 09:24:44 -0000	1.25
+++ changelog	29 May 2004 18:00:51 -0000	1.26
@@ -18,7 +18,8 @@
     - Added LD_ASSUME_KERNEL=2.4 in runvdr, to be able to run vdr 
       under 2.6 without problems
     - New cfg-dir /var/lib/vdr, link static cfg-files from /etc/vdr to
-      /var/lib/vdr, install channels.conf in postinst to /var/lib/vdr
+      /var/lib/vdr, install channels.conf in postinst to /var/lib/vdr,
+      move non-static cfg-files to /var/lib/vdr in postinst
     - Add an option to vdr, to specify the cfg-dir at build-time,
       and set this to /var/lib/vdr (Closes: Bug#233647)
     - Selection of vdr-binary now handled by update-alternatives

Index: vdr.postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/vdr/debian/vdr.postinst,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- vdr.postinst	7 May 2004 19:13:51 -0000	1.4
+++ vdr.postinst	29 May 2004 18:00:51 -0000	1.5
@@ -31,26 +31,39 @@
 	
 	. /usr/share/debconf/confmodule
 	
-	# install channels.conf 
-	if [ ! -e /var/lib/vdr/channels.conf ]; then
-		db_get vdr/select_dvb_card
+	# move cfg-files from /etc/vdr to /var/lib/vdr
+	for FILE in epg.data remote.conf setup.conf timers.conf do
+		if [ -e /etc/vdr/$FILE ] && [ ! -e /var/lib/vdr/$FILE ]; then
+			printf "Note: Moving /etc/vdr/$FILE to /var/lib/vdr/$FILE\n"
+			mv /etc/vdr/$FILE /var/lib/vdr/$FILE
+		fi
+	done
 	
-		case "$RET" in
-	    	Sattelite)
-			gzip -dc /usr/share/doc/vdr/examples/channels.conf.gz > /var/lib/vdr/channels.conf
-			chmod 644 /var/lib/vdr/channels.conf
-	    	;;
+	# install/move channels.conf 
+	if [ ! -e /var/lib/vdr/channels.conf ]; then
 
-	    	Terrestrial)
-                	gzip -dc /usr/share/doc/vdr/examples/channels.conf.terr.gz > /var/lib/vdr/channels.conf
-			chmod 644 /var/lib/vdr/channels.conf
-	    	;;
+		if  [ -e /etc/vdr/channels.conf ]; then
+			printf "Note: Moving /etc/vdr/channels.conf to /var/lib/vdr/channels.conf\n"
+			mv /etc/vdr/channels.conf /var/lib/vdr/channels.conf
+		else
+			db_get vdr/select_dvb_card
+	
+			case "$RET" in
+	    		Sattelite)
+					gzip -dc /usr/share/doc/vdr/examples/channels.conf.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 > /var/lib/vdr/channels.conf
-			chmod 644 /var/lib/vdr/channels.conf
-	    	;;
-		esac
+	    		Terrestrial)
+					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 > /var/lib/vdr/channels.conf
+					chmod 644 /var/lib/vdr/channels.conf
+	    		;;
+			esac
+		fi
 	fi
 	
 	# create needed devices nodes