[pkg-nvidia-devel] r1148 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx-ia32.lintian-overrides.in nvidia-glx-ia32.preinst nvidia-libgl1-ia32.lintian-overrides.in nvidia-libgl1-ia32.preinst
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu Jun 24 19:10:30 UTC 2010
Author: anbe-guest
Date: Thu Jun 24 19:09:51 2010
New Revision: 1148
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1148
Log:
introduce the nvidia-libgl1-ia32 package
Added:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in
- copied, changed from r1146, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
Removed:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.preinst
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1148&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jun 24 19:09:51 2010
@@ -6,8 +6,8 @@
* Update nvidia.ids.
* Add /usr/share/X11/xorg.conf.d/99-nvidia-glx.conf for autoconfiguration of
Xorg in single-GPU setups. (Closes: #586502)
- * Split the nvidia-glx package, move the runtime libraries to nvidia-libgl1.
- (Closes: #369316)
+ * Split the nvidia-glx{,-ia32} packages, move the runtime libraries to
+ nvidia-libgl1{,-ia32}. (Closes: #369316)
* Rename package nvidia-glx-dev to nvidia-libgl1-dev (add dummy).
* Let nvidia-libgl1 provide libgl1. (Closes: #389971)
* Introduce virtual package nvidia-glx, add Provides/Conflicts: nvidia-glx
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1148&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu Jun 24 19:09:51 2010
@@ -69,7 +69,7 @@
nvidia-glx-legacy-71xx-ia32,
nvidia-glx-legacy-96xx-ia32,
nvidia-glx-legacy-173xx-ia32,
-Description: NVIDIA binary driver 32bit libs${nvidia:LegacyDesc}
+Description: NVIDIA binary driver 32-bit libs${nvidia:LegacyDesc}
These binary drivers provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
@@ -108,9 +108,35 @@
fglrx-glx,
Replaces: nvidia-glx${nvidia:Legacy} (<< 195.36.31)
Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
- These binary drivers provide optimized hardware acceleration of
+ These binary libraries provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
- AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
+ .
+ This version only supports GeForce 6xxx and higher of the Geforce GPUs
+ plus complimentary Quadros and nforce. Look at the legacy packages
+ for older cards.
+ .
+ See /usr/share/doc/nvidia-libgl1${nvidia:Legacy}/README.txt.gz for a complete list
+ of supported GPUs and PCIIDs.
+
+Package: nvidia-libgl1-ia32
+Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
+Depends:
+ ${shlibs:Depends}, ${misc:Depends}
+Recommends:
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Suggests:
+ nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
+ | nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
+Provides:
+ nvidia-libgl1-ia32,
+Conflicts:
+ nvidia-libgl1-ia32,
+ fglrx-glx-ia32,
+Replaces: nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31)
+Description: NVIDIA binary OpenGL 32-bit libraries${nvidia:LegacyDesc}
+ These binary 32-bit libraries provide optimized hardware acceleration of
+ OpenGL applications via a direct-rendering X Server.
.
This version only supports GeForce 6xxx and higher of the Geforce GPUs
plus complimentary Quadros and nforce. Look at the legacy packages
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst?rev=1148&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst Thu Jun 24 19:09:51 2010
@@ -6,21 +6,6 @@
case "$1" in
install|upgrade)
-
- # the destination directory for the diversions
- test -d /usr/lib32/nvidia || \
- mkdir -p /usr/lib32/nvidia || true
-
- # divert libGL.so* from ia32-libs to /usr/lib32/nvidia
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/libGL.so.ia32-libs \
- /usr/lib32/libGL.so
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/libGL.so.1.ia32-libs \
- /usr/lib32/libGL.so.1
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
- /usr/lib32/libGL.so.1.2
# <target: squeeze>
# this file was not shipped in the package but generated by ldconfig
Copied: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in (from r1146, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in)
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in?rev=1148&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.lintian-overrides.in Thu Jun 24 19:09:51 2010
@@ -1,15 +1,15 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-glx#LEGACY#-ia32: binary-has-unneeded-section
-nvidia-glx#LEGACY#-ia32: shared-lib-without-dependency-information
-nvidia-glx#LEGACY#-ia32: shlib-with-non-pic-code
-nvidia-glx#LEGACY#-ia32: shlib-without-PT_GNU_STACK-section
-nvidia-glx#LEGACY#-ia32: spelling-error-in-binary
+nvidia-libgl1#LEGACY#-ia32: binary-has-unneeded-section
+nvidia-libgl1#LEGACY#-ia32: shared-lib-without-dependency-information
+nvidia-libgl1#LEGACY#-ia32: shlib-with-non-pic-code
+nvidia-libgl1#LEGACY#-ia32: shlib-without-PT_GNU_STACK-section
+nvidia-libgl1#LEGACY#-ia32: spelling-error-in-binary
# We divert a bunch of files not provided by this package to ensure that
# programs don't pick up the wrong libGL by mistake.
-nvidia-glx#LEGACY#-ia32: diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:*
+nvidia-libgl1#LEGACY#-ia32: diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:*
# 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.
-nvidia-glx#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink
+nvidia-libgl1#LEGACY#-ia32: non-dev-pkg-with-shlib-symlink
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.preinst?rev=1148&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1-ia32.preinst Thu Jun 24 19:09:51 2010
@@ -11,6 +11,24 @@
test -d /usr/lib32/nvidia || \
mkdir -p /usr/lib32/nvidia || true
+ # <target: squeeze>
+ # migrate diversions from nvidia-glx-ia32
+ for file in libGL.so libGL.so.1 libGL.so.1.2
+ do
+ old_diverter="`dpkg-divert --listpackage /usr/lib32/$file`"
+ if [ -n "$old_diverter" ] \
+ && [ "$old_diverter" != "$DPKG_MAINTSCRIPT_PACKAGE" ]
+ then
+ dpkg-divert --remove --package $old_diverter --divert \
+ /usr/lib32/nvidia/$file.ia32-libs \
+ /usr/lib32/$file
+ dpkg-divert --add --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ /usr/lib32/nvidia/$file.ia32-libs \
+ /usr/lib32/$file
+ fi
+ done
+ # </target: squeeze>
+
# divert libGL.so* from ia32-libs to /usr/lib32/nvidia
dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.ia32-libs \
@@ -22,12 +40,6 @@
/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
/usr/lib32/libGL.so.1.2
- # <target: squeeze>
- # this file was not shipped in the package but generated by ldconfig
- test ! -L /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || \
- rm /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || true
- # </target: squeeze>
-
;;
esac
More information about the Pkg-nvidia-devel
mailing list