[pkg-nvidia-devel] r1212 - /packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Wed Jun 30 11:07:50 UTC 2010
Author: anbe-guest
Date: Wed Jun 30 11:07:41 2010
New Revision: 1212
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1212
Log:
synchronize packaging with nvidia-graphics-drivers 195.36.31-1 (r1210)
Added:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/README.source
- copied unchanged from r1210, packages/nvidia-graphics-drivers/trunk/debian/README.source
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.preinst
- copied unchanged from r1210, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.docs
- copied unchanged from r1210, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.install.in
- copied unchanged from r1210, 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 r1210, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx.lintian-overrides.in
- copied unchanged from r1210, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
Removed:
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-dev.install.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-dev.links
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.dirs
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.install.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.links.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.lintian-overrides.in
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/nvidia-glx-ia32.symbols
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/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=1212&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/changelog Wed Jun 30 11:07:41 2010
@@ -5,6 +5,16 @@
- 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
+ - 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
+ - add Conflicts: fglrx-driver, fglrx-glx, fglrx-glx-ia32
+ - nvidia-glx-legacy-173xx: install HTML variant of the README
+ - update to Standards-Version: 3.9.0
-- Andreas Beckmann <debian at abeckmann.de> Tue, 29 Jun 2010 13:51:58 +0200
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=1212&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers-legacy-173xx/trunk/debian/control Wed Jun 30 11:07:41 2010
@@ -9,26 +9,30 @@
Build-Depends: debhelper (>= 7.4.16~), bzip2, dkms (>= 2.1.1.1), libxext6,
quilt, ia32-libs (>= 20090804) [amd64], lib32gcc1 [amd64], lib32z1 [amd64],
libc6-dev-i386 [amd64]
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
Homepage: http://www.nvidia.com
Package: nvidia-glx-legacy-173xx
Architecture: i386 amd64
Pre-Depends: dpkg (>= 1.15.7.2)
-Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Depends:
+ libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-vdpau-driver (>= ${nvidia:Version})
Suggests: nvidia-settings,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
Breaks: xserver-xorg-core (<< 2:1.6)
-Provides: xserver-xorg-video-6
+Provides:
+ xserver-xorg-video-6,
+ nvidia-glx,
Conflicts:
nvidia-glx,
nvidia-glx-legacy,
nvidia-glx-legacy-71xx,
nvidia-glx-legacy-96xx,
- fglrx-glx,
+ fglrx-driver,
Description: NVIDIA binary Xorg driver${nvidia:LegacyDesc}
These binary drivers provide optimized hardware acceleration of
OpenGL applications via a direct-rendering X Server.
@@ -84,18 +88,22 @@
Package: nvidia-glx-legacy-173xx-ia32
Architecture: amd64
Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Depends:
+ libgl1-nvidia${nvidia:Legacy}-glx-ia32 (= ${binary:Version}),
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-vdpau-driver-ia32 (>= ${nvidia:Version})
Suggests: nvidia-settings,
nvidia-kernel${nvidia:Legacy}-dkms (>= ${nvidia:Version})
| nvidia-kernel${nvidia:Legacy}-source (>= ${nvidia:Version})
+Provides:
+ nvidia-glx-ia32,
Conflicts:
nvidia-glx-ia32,
nvidia-glx-legacy-ia32,
nvidia-glx-legacy-71xx-ia32,
nvidia-glx-legacy-96xx-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.
@@ -143,16 +151,88 @@
of supported GPUs and PCIIDs.
Package: nvidia-glx-legacy-173xx-dev
-Architecture: i386 amd64
-Depends: ${misc:Depends}, nvidia-glx${nvidia:Legacy} (= ${binary:Version}),
+Section: non-free/oldlibs
+Architecture: i386 amd64
+Depends: libgl1-nvidia${nvidia:Legacy}-dev, ${misc:Depends}
+Description: NVIDIA OpenGL development files (transitional package)${nvidia:LegacyDesc}
+ This is a transitional dummy package to aid migration to
+ libgl1-nvidia${nvidia:Legacy}-dev.
+ .
+ For building portable OpenGL applications, please install libgl1-mesa-dev
+ instead.
+
+Package: libgl1-nvidia-glx
+Section: non-free/libs
+Architecture: i386 amd64
+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:
+ libgl1-nvidia-glx,
+Conflicts:
+ libgl1-nvidia-glx,
+ fglrx-glx,
+ nvidia-glx${nvidia:Legacy} (<< 195.36.31),
+Replaces: nvidia-glx${nvidia:Legacy} (<< 195.36.31)
+Description: NVIDIA binary OpenGL libraries${nvidia:LegacyDesc}
+ These binary 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
+ for older cards.
+ .
+ See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz for a complete list
+ of supported GPUs and PCIIDs.
+
+Package: libgl1-nvidia-glx-ia32
+Section: non-free/libs
+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:
+ libgl1-nvidia-glx-ia32,
+Conflicts:
+ libgl1-nvidia-glx-ia32,
+ fglrx-glx-ia32,
+ nvidia-glx${nvidia:Legacy}-ia32 (<< 195.36.31),
+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
+ for older cards.
+ .
+ See /usr/share/doc/libgl1-nvidia${nvidia:Legacy}-glx/README.txt.gz for a complete list
+ of supported GPUs and PCIIDs.
+
+Package: libgl1-nvidia-dev
+Section: non-free/libdevel
+Architecture: i386 amd64
+Depends:
+ libgl1-nvidia${nvidia:Legacy}-glx (= ${binary:Version}),
libx11-dev,
+ ${misc:Depends}
Recommends: libgl1-mesa-dev | libgl-dev
-Conflicts:
- nvidia-glx,
- nvidia-glx-legacy,
- nvidia-glx-legacy-71xx,
- nvidia-glx-legacy-96xx,
-Description: NVIDIA binary Xorg driver development files${nvidia:LegacyDesc}
+Provides:
+ libgl1-nvidia-dev,
+Conflicts:
+ libgl1-nvidia-dev,
+ nvidia-glx${nvidia:Legacy}-dev (<< 195.36.31),
+Replaces: nvidia-glx${nvidia:Legacy}-dev (<< 195.36.31)
+Description: NVIDIA OpenGL development files${nvidia:LegacyDesc}
This package contains the development files for the NVIDIA OpenGL
implementation. This package is only needed for applications that use some
extensions available in the NVIDIA driver only. Include and library search
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=1212&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 Jun 30 11:07:41 2010
@@ -1,23 +1,5 @@
#!/bin/sh
set -e
-
-
-# A trigger that handles creating/removing /usr/lib/libGL.so
-if [ "$1" = "triggered" ]; then
- LINK_origin=/usr/lib/libGL.so
- LINK_diverted=/usr/lib/nvidia/libGL.so.xlibmesa
- LINK_create=nvidia/libGL.so.1.2.xlibmesa
-
- if [ -L "$LINK_origin" ] && [ ! -L "$LINK_diverted" ]; then
- # libgl-mesa-dev was removed, drop libGL.so
- echo "$DPKG_MAINTSCRIPT_PACKAGE: Removing $LINK_origin"
- rm -f "$LINK_origin"
- elif [ ! -L "$LINK_origin" ] && [ -L "$LINK_diverted" ]; then
- # libgl-mesa-dev was installed, create libGL.so
- echo "$DPKG_MAINTSCRIPT_PACKAGE: Creating $LINK_origin"
- ln -s "$LINK_create" "$LINK_origin"
- fi
-fi
# <target: squeeze>
@@ -53,15 +35,15 @@
# </target: squeeze>
# <target: squeeze>
- # remove libGL.so created before the trigger was introduced
+ # remove libGL.so created before the trigger was moved to nvidia-libgl1
# will be recreated by the trigger
if dpkg --compare-versions "$2" lt-nl 173.14.25-2 ; then
rm -f /usr/lib/libGL.so
fi
+
+ # activate the trigger
+ dpkg-trigger /usr/lib/libGL.so
# </target: squeeze>
-
- # activate our trigger
- dpkg-trigger /usr/lib/libGL.so
;;
esac
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=1212&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 Jun 30 11:07:41 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 173.14.25-2~ -- "$@"
@@ -31,31 +33,14 @@
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 --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.xlibmesa \
- /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.2.xlibmesa \
- /usr/lib/libGL.so.1.2 > /dev/null
-
# 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 --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+
+ dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libglx.so.xlibmesa \
- /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
-
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so > /dev/null
+ /usr/lib/xorg/modules/extensions/libglx.so
test ! -d /usr/lib/nvidia || \
rmdir /usr/lib/nvidia || true;
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=1212&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 Jun 30 11:07:41 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 173.14.25-2~ -- "$@"
@@ -16,20 +18,9 @@
mkdir -p /usr/lib/nvidia || true
# make new diversions
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.xlibmesa \
- /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.2.xlibmesa \
- /usr/lib/libGL.so.1.2 > /dev/null
-
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libglx.so.xlibmesa \
- /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
-
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so > /dev/null
+ /usr/lib/xorg/modules/extensions/libglx.so
;;
esac
More information about the Pkg-nvidia-devel
mailing list