[pkg-nvidia-devel] r1287 - in /packages/nvidia-graphics-drivers/trunk/debian: nvidia-glx.postinst nvidia-glx.postrm nvidia-glx.preinst

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Sat Jul  3 11:11:55 2010
New Revision: 1287

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1287
Log:
use DPKG_MAINTSCRIPT_PACKAGE as the name of the init script/defaults file to cleanup

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst?rev=1287&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Sat Jul  3 11:11:55 2010
@@ -3,8 +3,8 @@
 
 
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-1~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-3~ -- "$@"
 # </target: squeeze>
 
 
@@ -13,14 +13,14 @@
 
 	# <target: squeeze>
 	if dpkg --compare-versions "$2" lt-nl 195.36.24-3 ; then
-	    update-rc.d nvidia-glx remove || true
+	    update-rc.d $DPKG_MAINTSCRIPT_PACKAGE remove || true
 	fi
 	# </target: squeeze>
 
 	# <target: squeeze>
         if dpkg --compare-versions "$2" lt-nl 195.36.24-2 ; then
-	    if [ -f /etc/default/nvidia-glx.dpkg-new ]; then
-		rm -f /etc/default/nvidia-glx.dpkg-new
+	    if [ -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new ]; then
+		rm -f /etc/default/$DPKG_MAINTSCRIPT_PACKAGE.dpkg-new
 	    fi
 	fi
 	# </target: squeeze>

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm?rev=1287&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Sat Jul  3 11:11:55 2010
@@ -5,8 +5,8 @@
 #DIVERT_QUIET="--quiet"
 
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-1~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-3~ -- "$@"
 # </target: squeeze>
 
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst?rev=1287&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Sat Jul  3 11:11:55 2010
@@ -5,8 +5,8 @@
 #DIVERT_QUIET="--quiet"
 
 # <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-1~ -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 195.36.24-3~ -- "$@"
 # </target: squeeze>