[pkg-nvidia-devel] r1442 - in /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian: ./ module/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Wed Sep 1 08:56:12 UTC 2010
Author: anbe-guest
Date: Wed Sep 1 08:56:09 2010
New Revision: 1442
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1442
Log:
synchronize packaging with nvidia-graphics-drivers 195.36.31-3 (r1441)
Added:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/compat
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/compat
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/extract-pci-ids.sh
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/extract-pci-ids.sh
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-dev.links
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.links
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-dev.postinst
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.postinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-dev.prerm
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-dev.prerm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.docs
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.docs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.install.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.install.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.links.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.postinst
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.postinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.prerm
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx-ia32.prerm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.docs
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.install.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.install.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.links.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.postinst
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.postinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.prerm
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/libgl1-nvidia-glx.prerm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/compat
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/module/debian/compat
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/control.template.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/module/debian/control.template.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/module/debian/genchanges
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/module/debian/genchanges
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.dirs
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.dirs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.docs
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.install.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.links.in
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.prerm
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/restore-upstream-directory-structure
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/rules
- copied unchanged from r1441, packages/nvidia-graphics-drivers/trunk/debian/rules
Removed:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.preinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.dirs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.preinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.triggers
Modified:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.preinst
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Wed Sep 1 08:56:09 2010
@@ -5,17 +5,22 @@
- nvidia-glx now provides xserver-xorg-video-6
- add Conflicts: nvidia-glx-legacy that was never really taken care of
- drop Conflicts: ccache, set CCACHE_DISABLE instead
- * synchronize packaging with nvidia-graphics-drivers 195.36.31-1
+ * synchronize packaging with nvidia-graphics-drivers 195.36.31-3
- fix the shlibs and symbols files
- split the nvidia-glx-legacy-173xx{,-ia32} packages, moving the shared
libraries to libgl1-nvidia-legacy-173xx-glx{,-ia32}
- rename nvidia-glx-legacy-173xx-dev to libgl1-nvidia-legacy-173xx-dev
- add Provides/Conflicts for the new virtual packages nvidia-glx{,-ia32},
libgl1-nvidia-glx{,-ia32}, libgl1-nvidia-dev
+ - use alternatives for libGL.so.1, libGL.so, libglx.so and let the
+ lib{gl1,glx}-nvidia-alternatives{,-ia32} packages (not built from this
+ source package) handle the diversions
- add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32 (closes: #588590)
+ - add Conflicts: with badly sorting obsolete packages
+ linux-{image,headers}-2.6.32-trunk-*
- nvidia-glx-legacy-173xx: install HTML variant of the README
- - update to Standards-Version: 3.9.0
- - move diversions to /usr/lib{,32}/nvidia/diversions
+ - update to Standards-Version: 3.9.1
+ - update to debhelper compat level 8
- drop LEGACY part from virtual package name nvidia-kernel-NVIDIAVERSION
- lots of small fixes and cleanup
- extract nvidia.ids from nv-kernel.o
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control Wed Sep 1 08:56:09 2010
@@ -7,13 +7,13 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/
Build-Depends:
- debhelper (>= 7.4.16~),
+ debhelper (>= 8),
bzip2,
dkms (>= 2.1.1.1),
libxext6,
quilt,
ia32-libs (>= 20090804) [amd64],
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Homepage: http://www.nvidia.com
Package: nvidia-glx-legacy-173xx
@@ -21,6 +21,7 @@
Pre-Depends: dpkg (>= 1.15.7.2)
Depends:
libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
+ libglx-nvidia-alternatives,
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-settings,
@@ -93,6 +94,7 @@
Section: non-free/libs
Architecture: i386 amd64
Depends:
+ libgl1-nvidia-alternatives,
${shlibs:Depends}, ${misc:Depends}
Recommends:
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
@@ -123,6 +125,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},
@@ -188,7 +191,14 @@
nvidia-kernel-${nvidia:Version}${nvidia:Perfkit},
Conflicts:
nvidia-kernel-dkms,
- binutils-gold (>> 2.20.51)
+ linux-headers-2.6.32-trunk-486 [i386], linux-image-2.6.32-trunk-486 [i386],
+ linux-headers-2.6.32-trunk-686 [i386], linux-image-2.6.32-trunk-686 [i386],
+ linux-headers-2.6.32-trunk-686-bigmem [i386], linux-image-2.6.32-trunk-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-amd64, linux-image-2.6.32-trunk-amd64,
+ linux-headers-2.6.32-trunk-vserver-686 [i386], linux-image-2.6.32-trunk-vserver-686 [i386],
+ linux-headers-2.6.32-trunk-vserver-686-bigmem [i386], linux-image-2.6.32-trunk-vserver-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-vserver-amd64 [amd64], linux-image-2.6.32-trunk-vserver-amd64 [amd64],
+ binutils-gold (>> 2.20.51),
Description: NVIDIA binary kernel module DKMS source${nvidia:LegacyDesc}
This package builds the NVIDIA Xorg binary kernel module needed by
nvidia-glx${nvidia:Legacy}, using DKMS.
@@ -209,10 +219,18 @@
Package: nvidia-kernel-legacy-173xx-source
Section: non-free/kernel
Architecture: i386 amd64
-Depends: ${misc:Depends}, debhelper (>= 7.2.3~), make, quilt (>= 0.46-7~)
+Depends: ${misc:Depends}, debhelper (>= 8), make, quilt (>= 0.46-7~)
Recommends: module-assistant | kernel-package,
nvidia-glx${nvidia:Legacy} (>= ${nvidia:Version}), nvidia-kernel-common
-Conflicts: binutils-gold (>> 2.20.51)
+Conflicts:
+ linux-headers-2.6.32-trunk-486 [i386], linux-image-2.6.32-trunk-486 [i386],
+ linux-headers-2.6.32-trunk-686 [i386], linux-image-2.6.32-trunk-686 [i386],
+ linux-headers-2.6.32-trunk-686-bigmem [i386], linux-image-2.6.32-trunk-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-amd64, linux-image-2.6.32-trunk-amd64,
+ linux-headers-2.6.32-trunk-vserver-686 [i386], linux-image-2.6.32-trunk-vserver-686 [i386],
+ linux-headers-2.6.32-trunk-vserver-686-bigmem [i386], linux-image-2.6.32-trunk-vserver-686-bigmem [i386],
+ linux-headers-2.6.32-trunk-vserver-amd64 [amd64], linux-image-2.6.32-trunk-vserver-amd64 [amd64],
+ binutils-gold (>> 2.20.51),
Description: NVIDIA binary kernel module source${nvidia:LegacyDesc}
This package provides the source for the NVIDIA Xorg binary kernel module
needed by nvidia-glx${nvidia:Legacy} in a form suitable
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx-ia32.lintian-overrides.in Wed Sep 1 08:56:09 2010
@@ -5,20 +5,11 @@
libgl1-nvidia#LEGACY#-glx-ia32: shlib-without-PT_GNU_STACK-section
libgl1-nvidia#LEGACY#-glx-ia32: spelling-error-in-binary
-# The diversions are placed here.
-libgl1-nvidia#LEGACY#-glx-ia32: package-contains-empty-directory usr/lib32/nvidia/diversions/
-
-# We divert the original /usr/lib32/libGL.so symlink.
-# In order to retain its functionality (i.e. pointing the MESA libGL.so.1)
-# we ship a link pointing to the diverted library.
-libgl1-nvidia#LEGACY#-glx-ia32: non-dev-pkg-with-shlib-symlink
-
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes. Therefore we use a special
# combination of shlibs files (for libGL.so.1) and symbols files (for all
# other libraries).
libgl1-nvidia#LEGACY#-glx-ia32: shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
-libgl1-nvidia#LEGACY#-glx-ia32: shlib-missing-in-symbols-control-file libGL 1 for usr/lib32/libGL.so.#VERSION#
# Due to complex maintainer script operations (migration of diversions) a
# simple Breaks+Recommends is not sufficient to ensure clean up-/downgrades.
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/libgl1-nvidia-glx.lintian-overrides.in Wed Sep 1 08:56:09 2010
@@ -6,15 +6,11 @@
#!amd64#libgl1-nvidia#LEGACY#-glx: shlib-without-PT_GNU_STACK-section
libgl1-nvidia#LEGACY#-glx: spelling-error-in-binary
-# The diversions are placed here.
-libgl1-nvidia#LEGACY#-glx: package-contains-empty-directory usr/lib/nvidia/diversions/
-
# Packages built against the NVIDIA libGL should declare dependencies on
# the free version for Debian's purposes. Therefore we use a special
# combination of shlibs files (for libGL.so.1) and symbols files (for all
# other libraries).
libgl1-nvidia#LEGACY#-glx: shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
-libgl1-nvidia#LEGACY#-glx: shlib-missing-in-symbols-control-file libGL 1 for usr/lib/libGL.so.#VERSION#
# This package is a strange special case since it overrides standard
# libraries and diverts them, so the package name won't ever be able to
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in Wed Sep 1 08:56:09 2010
@@ -5,8 +5,8 @@
#!amd64#nvidia-glx#LEGACY#: shlib-with-non-pic-code
#!amd64#nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
-# The diversions are placed here.
-nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/diversions/
+# The alternatives are placed here.
+nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/xorg/modules/extensions/
# Referenced by upstream documentation.
nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postinst?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postinst Wed Sep 1 08:56:09 2010
@@ -8,8 +8,8 @@
# </target: squeeze>
-case "$1" in
- configure)
+if [ "$1" = "configure" ]
+then
# <target: squeeze>
if dpkg --compare-versions "$2" lt-nl 173.14.25-3 ; then
@@ -45,8 +45,9 @@
dpkg-trigger /usr/lib/libGL.so
# </target: squeeze>
- ;;
-esac
+ update-alternatives --install /usr/lib/xorg/modules/extensions/libglx.so libglx.so /usr/lib/nvidia/libglx.so 42
+
+fi
#DEBHELPER#
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postrm?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.postrm Wed Sep 1 08:56:09 2010
@@ -1,8 +1,6 @@
#!/bin/sh
set -e
-
-#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 173.14.25-3~ -- "$@"
@@ -10,47 +8,6 @@
# </target: squeeze>
-# Rationale:
-#
-# Remove our diversions at the remove stage, since even if we have
-# configuration files left, we want to put back everything we moved. Do not
-# try to do this again on purge since remove will have already been called.
-#
-# In the abort-install case, we may have gotten far enough to create our
-# diversions in our preinst, so back out of them.
-#
-# Remove /usr/lib/libGL.so only if we still own a diversion of it, since the
-# link may have been created by our trigger in postinst or later.
-#
-# Leave all of our diversions alone during upgrades or aborted upgrades, since
-# we're staying installed in all cases and the diversions are still correct.
-#
-# It's not clear what to do on disappear, but for now leave everything alone
-# and assume that our overwriting package will have logic to take over the
-# diversions and doesn't want us messing with them.
-
-
-case "$1" in
- remove|abort-install)
-
- # work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
- if [ -d /usr/lib/nvidia ] && [ ! -d /usr/lib/xorg/modules/extensions ]; then
- mkdir -p /usr/lib/xorg/modules/extensions
- fi
-
- dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libglx.so \
- /usr/lib/xorg/modules/extensions/libglx.so
-
- rmdir /usr/lib/nvidia/diversions /usr/lib/nvidia 2>/dev/null || true
-
- # work around dpkg-divert bug #581544: useless errors on not writable destination if source does not exist
- rmdir /usr/lib/xorg/modules/extensions /usr/lib/xorg/modules /usr/lib/xorg 2>/dev/null || true
-
- ;;
-esac
-
-
#DEBHELPER#
exit 0
Modified: packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.preinst?rev=1442&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.preinst Wed Sep 1 08:56:09 2010
@@ -1,13 +1,6 @@
#!/bin/sh
set -e
-
-#DIVERT_QUIET="--quiet"
-
-exists()
-{
- test -e "$1" || test -L "$1"
-}
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/$DPKG_MAINTSCRIPT_PACKAGE 173.14.25-3~ -- "$@"
@@ -15,56 +8,6 @@
# </target: squeeze>
-case "$1" in
- install|upgrade)
-
- # the destination directory for the diversions
- test -d /usr/lib/nvidia/diversions || \
- mkdir -p /usr/lib/nvidia/diversions || true
-
- # <target: squeeze>
- # update the diversion
- if dpkg --compare-versions "$2" lt-nl 173.14.25-3
- then
- file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
- file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
- file_new_divert="/usr/lib/nvidia/diversions/libglx.so"
- old_diverter="`dpkg-divert --listpackage $file_orig`"
-
- if [ -n "$old_diverter" ]
- then
- # avoid dpkg-divert --add --rename in upgrade scenarios,
- # it might rename *our* existing file -- see dpkg bug #588077
-
- dpkg-divert --remove --package $old_diverter --divert \
- "$file_old_divert" \
- "$file_orig"
- if exists "$file_old_divert"
- then
- echo "Moving $file_old_divert to $file_new_divert"
- mv "$file_old_divert" "$file_new_divert"
- fi
- dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- "$file_new_divert" \
- "$file_orig"
- fi
- if exists "$file_old_divert"
- then
- echo "ERROR: $file_old_divert does still exist. Aborting."
- exit 1
- fi
- fi
- # </target: squeeze>
-
- # make new diversions
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/diversions/libglx.so \
- /usr/lib/xorg/modules/extensions/libglx.so
-
- ;;
-esac
-
-
#DEBHELPER#
exit 0
More information about the Pkg-nvidia-devel
mailing list