[pkg-nvidia-devel] r1337 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: changelog nvidia-glx.postinst nvidia-glx.postrm nvidia-glx.preinst

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

Author: anbe-guest
Date: Wed Jul  7 08:54:09 2010
New Revision: 1337

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1337
Log:
remove init script and defaults file from nvidia-glx-legacy

Modified:
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm
    packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog?rev=1337&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog Wed Jul  7 08:54:09 2010
@@ -40,6 +40,7 @@
     the long description, do not list models in the libgl1-nvidia* packages
   * readd transitional packages to get rid of the remaining (closes: #426157)
     nvidia-glx-legacy{,-ia32,-dev} and nvidia-kernel-legacy-source packages
+  * remove init script and defaults file from nvidia-glx-legacy
   * refresh patches
   * update install lists for files not available or named differently in 71xx
   * update copyright

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst?rev=1337&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst Wed Jul  7 08:54:09 2010
@@ -3,6 +3,8 @@
 
 
 # <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 # </target: squeeze>
@@ -12,7 +14,9 @@
     configure)
 
 	# <target: squeeze>
-	if dpkg --compare-versions "$2" lt-nl 71.86.13-2 ; then
+	# also do this on new installations, we might take over nvidia-glx-legacy
+	if dpkg --compare-versions "$2" lt 71.86.13-2 ; then
+	    update-rc.d nvidia-glx-legacy remove || true
 	    update-rc.d $DPKG_MAINTSCRIPT_PACKAGE remove || true
 	fi
 	# </target: squeeze>

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm?rev=1337&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postrm Wed Jul  7 08:54:09 2010
@@ -5,6 +5,8 @@
 #DIVERT_QUIET="--quiet"
 
 # <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 # </target: squeeze>

Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst?rev=1337&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst Wed Jul  7 08:54:09 2010
@@ -10,6 +10,8 @@
 }
 
 # <target: squeeze>
+dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
+dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx-legacy 71.86.13-2~ nvidia-glx-legacy -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
 # </target: squeeze>