vdr/nvram-wakeup/debian changelog control postinst postrm templates

[Thomas Schmidt]

Update of /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian
In directory haydn:/tmp/cvs-serv24173/vdr/nvram-wakeup/debian

Modified Files:
	changelog control postinst postrm templates 
Log Message:
* depend on makedev
* cleanup postinst/prerm
* update debconf-templates

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian/changelog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- changelog	6 Jul 2004 23:53:20 -0000	1.6
+++ changelog	7 Jul 2004 13:13:47 -0000	1.7
@@ -15,6 +15,7 @@
     - Added 01_Makefile-fix.dpatch to disable optimizing for i686
     - Added watch-file
     - Added 02_nvram-wakeup-mb.c.dpatch mainboardlist from cvs, Rev. 1.210
+    - Depend on makedev
 
  -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>  Sun,  04 Jul 2004 12:10:00 +0200
 

Index: postinst
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian/postinst,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- postinst	4 Jul 2004 10:40:48 -0000	1.2
+++ postinst	7 Jul 2004 13:13:47 -0000	1.3
@@ -23,53 +23,41 @@
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+if [ ! -e /dev/.devfsd ]
+then
+	cd /dev && /dev/MAKEDEV nvram
+	cd /dev && /dev/MAKEDEV rtc
+	cd /dev && /dev/MAKEDEV mem
+fi
+
 case "$1" in
     configure)
 
-	. /usr/share/debconf/confmodule
+		. /usr/share/debconf/confmodule
 
-	db_get nvram-wakeup/install_module
-	install_module="$RET"       
+		db_get nvram-wakeup/install_module
+		install_module="$RET"       
 	
-	if [ $install_module = "true" ]
-	then
-	    # Install required device nodes
-
-	    if [ ! -e /dev/nvram ]
-	    then
-		/dev/MAKEDEV nvram || echo "Error creating /dev/nvram"
-	    fi
-
-	    if [ ! -e /dev/rtc ]
-	    then
-		/dev/MAKEDEV rtc || echo "Error creating /dev/rtc"
-	    fi
-
-	    if [ ! -e /dev/mem ]
-	    then
-		/dev/MAKEDEV mem  c 1 1 || echo "Error creating /dev/mem"
-	    fi
-
-
-	    # Install nvram kernel module
-
-	    if ! lsmod | grep -q nvram
-	    then
-		if insmod nvram
+		if [ $install_module = "true" ]
 		then
-		    if ! cat /etc/modules | grep -q nvram
-		    then
-    			test "$(tail -n1 /etc/modules)" && printf "\n" >> /etc/modules
-    			echo "nvram" >> /etc/modules
-		    fi
+	    	# Install nvram kernel module
+
+	    	if ! lsmod | grep -q nvram
+	    	then
+				if modprobe nvram
+				then
+		    		if ! cat /etc/modules | grep -q nvram
+		    		then
+    					test "$(tail -n1 /etc/modules)" && printf "\n" >> /etc/modules
+    					echo "nvram" >> /etc/modules
+		    		fi
+				fi
+	 	 	fi
 		fi
-	    fi
-	fi
 
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
-
     ;;
 
     *)

Index: postrm
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian/postrm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- postrm	4 Jul 2004 09:56:32 -0000	1.1
+++ postrm	7 Jul 2004 13:13:47 -0000	1.2
@@ -19,21 +19,19 @@
 
 
 case "$1" in
-       purge)
-    	    # purge debconf database	
-	    . /usr/share/debconf/confmodule
-	    db_purge || echo "WARNING: db_purge failed"
-       ;;
+	purge)
+   	# purge debconf database	
+	   . /usr/share/debconf/confmodule
+	   db_purge || echo "WARNING: db_purge failed"
+	;;
        
-       remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
-        ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
+   remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+   ;;
 
+   *)
+   	echo "postrm called with unknown argument \`$1'" >&2
+      exit 1
+	;;
 esac
 
 # dh_installdeb will replace this with shell code automatically

Index: control
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian/control,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- control	5 Jul 2004 17:00:43 -0000	1.3
+++ control	7 Jul 2004 13:13:47 -0000	1.4
@@ -8,7 +8,7 @@
 
 Package: nvram-wakeup
 Architecture: i386
-Depends: ${shlibs:Depends}, debconf
+Depends: ${shlibs:Depends}, debconf, makedev
 Description: A tool to read/write the WakeUp time from/to the BIOS
  nvram-wakeup can read and write the wake up time in the BIOS 
  (via /dev/nvram on recent 2.4.x kernels or direct I/O port access). 

Index: templates
===================================================================
RCS file: /cvsroot/pkg-vdr-dvb/vdr/nvram-wakeup/debian/templates,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- templates	5 Jul 2004 17:00:43 -0000	1.2
+++ templates	7 Jul 2004 13:13:47 -0000	1.3
@@ -14,10 +14,8 @@
  nvram kernel module. If this kernel module is available, but not loaded,
  you may need to perform these steps:
  .
- - mknod /dev/nvram c 10 144
- .
- - insmod nvram
+ - modprobe nvram
  .
  - add nvram to /etc/modules
  .
- - update-modules
+ - alternatively you can use modconf to reach the same result