[pkg-nvidia-devel] r1090 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: nvidia-glx-legacy-173xx-dev.postrm nvidia-glx-legacy-173xx-dev.preinst.in nvidia-glx-legacy-173xx.postrm.in nvidia-glx-legacy-173xx.preinst nvidia-glx-legacy-173xx.prerm
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu Jun 10 12:56:57 UTC 2010
Author: anbe-guest
Date: Thu Jun 10 12:56:54 2010
New Revision: 1090
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1090
Log:
drop obsolete cleanup code intended for nvidia-glx NOT -legacy.*
Modified:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.prerm
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.postrm?rev=1090&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.postrm Thu Jun 10 12:56:54 2010
@@ -7,27 +7,9 @@
case "$1" in
remove|purge)
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
rm /usr/lib/libGL.so || true
/etc/init.d/nvidia-glx start || true
-# ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
- if [ -d /usr/lib/nvidia/ ]; then
- rmdir /usr/lib/nvidia || true;
-
- fi
;;
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst.in?rev=1090&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx-dev.preinst.in Thu Jun 10 12:56:54 2010
@@ -7,81 +7,6 @@
case "$1" in
install|upgrade)
- # diversion transition
- if [ -d /usr/share/nvidia-glx/diversions/ ] ; then
- rm -f /usr/lib/libGL.so
- rm -f /usr/lib/libGL.a
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
-
- rmdir /usr/share/nvidia-glx/diversions/ || true
- rmdir /usr/share/nvidia-glx || true
-
- fi
-
- if [ -d /usr/share/nvidia-glx/diversions ] ; then
- rm -f /usr/lib/libGL.so
- rm -f /usr/lib/libGL.a
-
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
-
-
- rmdir /usr/share/nvidia-glx/diversions || true
- rmdir /usr/share/nvidia-glx || true
- fi
-
-
- if [ ! -d /usr/lib/nvidia ]; then
- mkdir -p /usr/lib/nvidia || true
- fi
-
-# to remove old old old gl header diversions
-
-
- if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then
- if [ -e /usr/include/GL/gl.h ]; then
- rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h
- fi
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
- fi
-
- # make sure these diversions don't exist anymore
- if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
- fi
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# rm /usr/lib/libGL.so || true
-
-# ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so || true
-
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
;;
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in?rev=1090&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.postrm.in Thu Jun 10 12:56:54 2010
@@ -29,7 +29,7 @@
dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-173xx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
+
if [ -d /usr/lib/nvidia ]; then
rmdir /usr/lib/nvidia/ || true;
fi
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst?rev=1090&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.preinst Thu Jun 10 12:56:54 2010
@@ -16,69 +16,6 @@
case "$1" in
install|upgrade)
-
- # Hack right now.
- # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true
-
- # clean up from old diversions
- if [ -d /usr/share/nvidia-glx/diversions ]; then
- rm -f /usr/lib/libGL.so.1
- rm -f /usr/lib/libGL.so.1.2
-
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
-
- rm -f /usr/lib/xorg/modules/extensions/libGLcore.a
- rm -f /usr/lib/xorg/modules/extensions/libglx.a
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
-
- rmdir /usr/share/nvidia-glx/diversions || true;
- rmdir /usr/share/nvidia-glx || true;
- fi
- if [ -d /usr/share/nvidia-glx/diversions ]; then
-
- rm -f /usr/lib/libGL.so.1
- rm -f /usr/lib/libGL.so.1.2
-
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
-
- rmdir /usr/share/nvidia-glx/diversions || true;
- rmdir /usr/share/nvidia-glx || true;
- fi
- # remove X11R6 diversions
-
- if dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- fi
-
- if dpkg-divert --list /usr/X11R6/lib/libGL.so.1.2 | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libGLcore.a | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.a | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.so | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.so.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.so > /dev/null
- fi
-
- # make sure these diversions don't exist anymore
- if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
- fi
# create new diversion directories
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.prerm?rev=1090&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.prerm (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-legacy-173xx.prerm Thu Jun 10 12:56:54 2010
@@ -19,7 +19,6 @@
case "$1" in
remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/nvidia-drivers.info.gz
rm -f /usr/lib/libGL.so || true
/etc/init.d/nvidia-glx start || true
;;
More information about the Pkg-nvidia-devel
mailing list