[pkg-nvidia-devel] r1317 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: nvidia-glx-legacy-71xx-dev.postrm nvidia-glx-legacy-71xx-dev.preinst.in nvidia-glx-legacy-71xx-ia32.postrm nvidia-glx-legacy-71xx.postrm.in nvidia-glx-legacy-71xx.preinst
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Tue Jul 6 06:53:51 UTC 2010
Author: anbe-guest
Date: Tue Jul 6 06:53:51 2010
New Revision: 1317
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1317
Log:
remove dead code
Modified:
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.postrm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.preinst.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.postrm.in
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.preinst
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.postrm?rev=1317&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.postrm Tue Jul 6 06:53:51 2010
@@ -8,30 +8,15 @@
case "$1" in
remove)
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
-
-# ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-# ln -s /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so
-
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glxtokens.h /usr/X11R6/include/GL/glxtokens.h > /dev/null
-
if [ -d /usr/lib/nvidia/ ]; then
rmdir /usr/lib/nvidia || true;
-
fi
if [ -d /usr/X11R6/lib/nvidia ]; then
rmdir /usr/X11R6/lib/nvidia || true;
-
fi
;;
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.preinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.preinst.in?rev=1317&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.preinst.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-dev.preinst.in Tue Jul 6 06:53:51 2010
@@ -8,7 +8,6 @@
case "$1" in
install|upgrade)
-
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
fi
@@ -16,25 +15,9 @@
mkdir -p /usr/X11R6/lib/nvidia || true
fi
-
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
-# rm /usr/X11R6/lib/libGL.so || true
-
-# ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so || true
-
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/gl.h /usr/X11R6/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glx.h /usr/X11R6/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy-dev --divert /usr/share/nvidia-glx/diversions-X11R6/glxtokens.h /usr/X11R6/include/GL/glxtokens.h > /dev/null
-
;;
abort-upgrade)
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm?rev=1317&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx-ia32.postrm Tue Jul 6 06:53:51 2010
@@ -41,12 +41,9 @@
test -d /emul/ia32-linux/usr/lib/X11R6/nvidia && \
rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia || true;
- ldconfig
-
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
;;
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.postrm.in?rev=1317&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.postrm.in (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.postrm.in Tue Jul 6 06:53:51 2010
@@ -20,34 +20,18 @@
remove|purge)
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-
-# dpkg-divert --remove --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
-
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
-
-
- #rm -f /usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
if [ -d /usr/lib/nvidia ]; then
rmdir /usr/lib/nvidia/ || true;
fi
- #if [ -d /usr/X11R6/lib/nvidia ]; then
- # rmdir /usr/X11R6/lib/nvidia || true;
-
-# fi
- ldconfig
-
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
;;
@@ -58,11 +42,6 @@
esac
-#rm -f /usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
-
-
-
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.preinst?rev=1317&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-legacy-71xx.preinst Tue Jul 6 06:53:51 2010
@@ -15,35 +15,15 @@
case "$1" in
install|upgrade)
-
-
- # Hack right now.
- # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true
-
-
-
-
# create new diversion directories
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
fi
-
- # remove old diversion from nvidia-glx-dev of libGL.so
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null || true
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null || true
-
-
-
# make new diversions
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-legacy --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
dpkg-divert --add --rename --package nvidia-glx-legacy-71xx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
More information about the Pkg-nvidia-devel
mailing list