[pkg-nvidia-devel] r1413 - /packages/nvidia-graphics-drivers/trunk/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Sat Aug 21 04:17:52 UTC 2010
Author: anbe-guest
Date: Sat Aug 21 04:17:39 2010
New Revision: 1413
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1413
Log:
Move trigger and maintainer scripts handling the diversions/alternatives
of the libGL.so* from MESA to separate packages that can be used by the
legacy packages, too: libgl1-nvidia-alternatives{,-ia32}.
Added:
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.dirs
- copied unchanged from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst
- copied, changed from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postrm
- copied unchanged from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.prerm
- copied, changed from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.dirs
- copied unchanged from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.dirs
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.lintian-overrides
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postinst
- copied, changed from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postrm
- copied, changed from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postrm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.prerm
- copied, changed from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.triggers
- copied unchanged from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers
Removed:
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.dirs
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postrm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.triggers
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat Aug 21 04:17:39 2010
@@ -1,4 +1,13 @@
-nvidia-graphics-drivers (195.36.31-1) unstable; urgency=low
+nvidia-graphics-drivers (195.36.31-2) UNRELEASED; urgency=low
+
+ [ Andreas Beckmann ]
+ * Move trigger and maintainer scripts handling the diversions/alternatives
+ of the libGL.so* from MESA to separate packages that can be used by the
+ legacy packages, too: libgl1-nvidia-alternatives{,-ia32}.
+
+ -- Andreas Beckmann <debian at abeckmann.de> Fri, 20 Aug 2010 23:15:21 -0500
+
+nvidia-graphics-drivers (195.36.31-1) UNRELEASED; urgency=low
[ Andreas Beckmann ]
* New upstream release.
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sat Aug 21 04:17:39 2010
@@ -98,6 +98,7 @@
Section: non-free/libs
Architecture: i386 amd64
Depends:
+ libgl1-nvidia-alternatives,
${shlibs:Depends}, ${misc:Depends}
Recommends:
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
@@ -128,6 +129,7 @@
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
Depends:
+ libgl1-nvidia-alternatives-ia32,
${shlibs:Depends}, ${misc:Depends}
Recommends:
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
@@ -553,3 +555,31 @@
This package contains the development files for the installable client driver
loader (ICD Loader) library provided by NVIDIA.
+Package: libgl1-nvidia-alternatives
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${misc:Depends}
+Breaks:
+ nvidia-glx (<< 195.36.31-2), libgl1-nvidia-glx-ia32 (<< 195.36.31-2),
+ nvidia-glx-legacy-71xx (<< 71.86.13-2),
+ nvidia-glx-legacy-96xx (<< 96.43.17),
+ nvidia-glx-legacy-173xx (<< 173.14.25-3),
+Description: simplify replacing the MESA libGL.so* with GPU vendor implementations
+ Diverts the free libGL.so implementation (MESA) and introduces
+ alternatives to simplify plugging in accelerated implementations from GPU
+ vendors. Handles both libGL.so.1 and libGL.so.
+
+Package: libgl1-nvidia-alternatives-ia32
+Section: non-free/libs
+Architecture: amd64
+Depends: ${misc:Depends}
+Breaks:
+ nvidia-glx-ia32 (<< 195.36.31-2), libgl1-nvidia-glx-ia32 (<< 195.36.31-2),
+ nvidia-glx-legacy-71xx-ia32 (<< 71.86.13-2),
+ nvidia-glx-legacy-96xx-ia32 (<< 96.43.17),
+ nvidia-glx-legacy-173xx-ia32 (<< 173.14.25-3),
+Description: simplify replacing the MESA libGL.so* with GPU vendor implementations (32-bit)
+ Diverts the free libGL.so (32-bit) implementation (MESA) and introduces
+ alternatives to simplify plugging in accelerated implementations from GPU
+ vendors. Handles both libGL.so.1 and libGL.so.
+
Added: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.lintian-overrides?rev=1413&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.lintian-overrides Sat Aug 21 04:17:39 2010
@@ -1,0 +1,2 @@
+# The diversions are placed here.
+libgl1-nvidia-alternatives-ia32: package-contains-empty-directory usr/lib32/nvidia/diversions/
Copied: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst (from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.postinst Sat Aug 21 04:17:39 2010
@@ -72,12 +72,8 @@
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1 42
update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1 5
-
update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so 9995
- # disabled in order to prevent compile time linking vs. libGL.so.1 from NVIDIA
- #update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/libGL.so 42
fi
Copied: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.prerm (from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.prerm?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives-ia32.prerm Sat Aug 21 04:17:39 2010
@@ -4,11 +4,8 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
- update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/libGL.so
update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so
-
update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1
- update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1
fi
Added: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.lintian-overrides?rev=1413&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.lintian-overrides (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.lintian-overrides Sat Aug 21 04:17:39 2010
@@ -1,0 +1,2 @@
+# The diversions are placed here.
+libgl1-nvidia-alternatives: package-contains-empty-directory usr/lib/nvidia/diversions/
Copied: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postinst (from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postinst?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postinst Sat Aug 21 04:17:39 2010
@@ -90,9 +90,8 @@
then
# The old nvidia-glx postrm would delete /usr/lib/nvidia/diversions
# out from under us, so create it if it doesn't exist.
- if [ ! -d /usr/lib/nvidia/diversions ] ; then
- install -d -m 755 /usr/lib/nvidia/diversions
- fi
+ test -d /usr/lib/nvidia/diversions || \
+ mkdir -p /usr/lib/nvidia/diversions
# make new diversions
dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
@@ -146,8 +145,6 @@
if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/lib/libGL.so.1 libGL.so.1 /usr/lib/nvidia/libGL.so.1 42
-
# activate our trigger
dpkg-trigger /usr/lib/libGL.so.1
dpkg-trigger /usr/lib/libGL.so
Copied: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postrm (from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postrm)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postrm?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.postrm Sat Aug 21 04:17:39 2010
@@ -27,12 +27,6 @@
case "$1" in
remove|abort-install)
- if [ -L /usr/lib/libGL.so ] && \
- [ "`dpkg-divert --listpackage /usr/lib/libGL.so`" = "$DPKG_MAINTSCRIPT_PACKAGE" ]; then
- echo "$DPKG_MAINTSCRIPT_PACKAGE: Removing /usr/lib/libGL.so created by trigger."
- rm -f /usr/lib/libGL.so
- fi
-
dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/diversions/libGL.so.1.2 \
/usr/lib/libGL.so.1.2
Copied: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.prerm (from r1412, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.prerm?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-alternatives.prerm Sat Aug 21 04:17:39 2010
@@ -5,9 +5,7 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
update-alternatives --remove libGL.so /usr/lib/nvidia/diversions/libGL.so
-
update-alternatives --remove libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1
- update-alternatives --remove libGL.so.1 /usr/lib/nvidia/libGL.so.1
fi
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst Sat Aug 21 04:17:39 2010
@@ -1,81 +1,11 @@
#!/bin/sh
set -e
-
-
-#DIVERT_QUIET="--quiet"
-
-# <target: squeeze>
-exists()
-{
- test -e "$1" || test -L "$1"
-}
-
-if [ "$1" = "configure" ]
-then
-
- # <target: squeeze>
- # take over diversions from nvidia-glx{,-legacy-*xx}-ia32
- for file in libGL.so.1.2 libGL.so.1 libGL.so
- do
- file_orig="/usr/lib32/$file"
- file_old_divert="/usr/lib32/nvidia/$file.ia32-libs"
- file_new_divert="/usr/lib32/nvidia/diversions/$file"
- old_diverter="`dpkg-divert --listpackage $file_orig`"
-
- if [ -n "$old_diverter" ] \
- && [ "$old_diverter" != "$DPKG_MAINTSCRIPT_PACKAGE" ]
- then
- if ! exists "$file_orig" || ! exists "$file_old_divert"
- then
- dpkg-divert --remove --rename --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- else
- dpkg-divert --remove --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- echo "Moving $file_old_divert to $file_new_divert"
- mv "$file_old_divert" "$file_new_divert"
- dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- "$file_new_divert" \
- "$file_orig"
- fi
- fi
- if exists "$file_old_divert"
- then
- echo "ERROR: $file_old_divert does still exist. Aborting."
- exit 1
- fi
- done
- # </target: squeeze>
-
-fi
-# </target: squeeze>
-
-
-if [ "$1" = "configure" ]
-then
-
- # make new diversions
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/diversions/libGL.so \
- /usr/lib32/libGL.so
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/diversions/libGL.so.1 \
- /usr/lib32/libGL.so.1
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/diversions/libGL.so.1.2 \
- /usr/lib32/libGL.so.1.2
-
-fi
if [ "$1" = "configure" ]; then
update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1 42
- update-alternatives --install /usr/lib32/libGL.so.1 ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1 5
- update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so 9995
# disabled in order to prevent compile time linking vs. libGL.so.1 from NVIDIA
#update-alternatives --install /usr/lib32/libGL.so ia32-libGL.so /usr/lib32/nvidia/libGL.so 42
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm Sat Aug 21 04:17:39 2010
@@ -5,9 +5,6 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/libGL.so
- update-alternatives --remove ia32-libGL.so /usr/lib32/nvidia/diversions/libGL.so
-
- update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/diversions/libGL.so.1
update-alternatives --remove ia32-libGL.so.1 /usr/lib32/nvidia/libGL.so.1
fi
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst Sat Aug 21 04:17:39 2010
@@ -1,156 +1,10 @@
#!/bin/sh
set -e
-
-
-# A trigger that handles the alternatives for /usr/lib/libGL.so and
-# /usr/lib/libGL.so.1.
-if [ "$1" = "triggered" ]; then
-
- if [ -L /usr/lib/nvidia/diversions/libGL.so.1 ]; then
- update-alternatives --install /usr/lib/libGL.so.1 libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1 5
- else
- update-alternatives --remove libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1
- fi
-
- if [ -L /usr/lib/nvidia/diversions/libGL.so ]; then
- # libgl-mesa-dev was installed, create libGL.so
- update-alternatives --install /usr/lib/libGL.so libGL.so /usr/lib/nvidia/diversions/libGL.so 9995
- else
- # libgl-mesa-dev was removed, drop libGL.so
- update-alternatives --remove libGL.so /usr/lib/nvidia/diversions/libGL.so
- fi
-
-fi
-
-
-#DIVERT_QUIET="--quiet"
-
-# <target: squeeze>
-exists()
-{
- test -e "$1" || test -L "$1"
-}
-
-if [ "$1" = "configure" ]
-then
-
- # <target: squeeze>
- # remove libGL.so created by obsolete nvidia-glx* init script
- # otherwise we dpkg-divert --rename an unowned file
- if [ -L /usr/lib/libGL.so ] && \
- [ "$(readlink /usr/lib/libGL.so)" != "/etc/alternatives/libGL.so" ] && \
- [ "$(readlink /usr/lib/libGL.so)" != "libGL.so.1" ]
- then
- echo "Removing /usr/lib/libGL.so symlink from unknown origin."
- rm -f /usr/lib/libGL.so
- fi
- # </target: squeeze>
-
- # <target: squeeze>
- # take over diversions from nvidia-glx{,-legacy-*xx}
- for file in libGL.so.1.2 libGL.so.1 libGL.so
- do
- file_orig="/usr/lib/$file"
- file_old_divert="/usr/lib/nvidia/$file.xlibmesa"
- file_new_divert="/usr/lib/nvidia/diversions/$file"
- old_diverter="`dpkg-divert --listpackage $file_orig`"
-
- if [ -n "$old_diverter" ] \
- && [ "$old_diverter" != "$DPKG_MAINTSCRIPT_PACKAGE" ]
- then
- if ! exists "$file_orig" || ! exists "$file_old_divert"
- then
- dpkg-divert --remove --rename --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- else
- dpkg-divert --remove --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- echo "Moving $file_old_divert to $file_new_divert"
- mv "$file_old_divert" "$file_new_divert"
- dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- "$file_new_divert" \
- "$file_orig"
- fi
- fi
- if exists "$file_old_divert"
- then
- echo "ERROR: $file_old_divert does still exist. Aborting."
- exit 1
- fi
- done
- # </target: squeeze>
-
-fi
-# </target: squeeze>
-
-
-if [ "$1" = "configure" ]
-then
- # The old nvidia-glx postrm would delete /usr/lib/nvidia/diversions
- # out from under us, so create it if it doesn't exist.
- if [ ! -d /usr/lib/nvidia/diversions ] ; then
- install -d -m 755 /usr/lib/nvidia/diversions
- fi
-
- # make new diversions
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libGL.so \
- /usr/lib/libGL.so
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libGL.so.1 \
- /usr/lib/libGL.so.1
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libGL.so.1.2 \
- /usr/lib/libGL.so.1.2
-
-fi
-
-
-# <target: squeeze>
-if [ "$1" = "configure" ]
-then
-
- # <target: squeeze>
- # do some validation of the diverted libGL.so
-
- # check ownership of the original libGL.so
- libGLso="$(dpkg-query -S /usr/lib/libGL.so 2>/dev/null | grep -v '^diversion by' || true)"
-
- if [ -L /usr/lib/nvidia/diversions/libGL.so ] && \
- [ -z "$libGLso" ]
- then
- echo "Removing diverted libGL.so symlink owned by no package."
- rm /usr/lib/nvidia/diversions/libGL.so
- fi
-
- if [ -L /usr/lib/nvidia/diversions/libGL.so ] && \
- [ "`readlink /usr/lib/nvidia/diversions/libGL.so`" != "libGL.so.1" ]
- then
- echo "Removing diverted libGL.so symlink with unexpected target."
- rm /usr/lib/nvidia/diversions/libGL.so
- fi
-
- if [ ! -L /usr/lib/nvidia/diversions/libGL.so ] && \
- [ -n "$libGLso" ]
- then
- echo "Restoring diverted libGL.so symlink."
- ln -s libGL.so.1 /usr/lib/nvidia/diversions/libGL.so
- fi
- # </target: squeeze>
-
-fi
-# </target: squeeze>
if [ "$1" = "configure" ]; then
update-alternatives --install /usr/lib/libGL.so.1 libGL.so.1 /usr/lib/nvidia/libGL.so.1 42
-
- # activate our trigger
- dpkg-trigger /usr/lib/libGL.so.1
- dpkg-trigger /usr/lib/libGL.so
fi
Modified: packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm?rev=1413&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm Sat Aug 21 04:17:39 2010
@@ -4,9 +4,7 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
- update-alternatives --remove libGL.so /usr/lib/nvidia/diversions/libGL.so
-
- update-alternatives --remove libGL.so.1 /usr/lib/nvidia/diversions/libGL.so.1
+ update-alternatives --remove libGL.so /usr/lib/nvidia/libGL.so
update-alternatives --remove libGL.so.1 /usr/lib/nvidia/libGL.so.1
fi
More information about the Pkg-nvidia-devel
mailing list