[pkg-nvidia-devel] r1141 - /packages/nvidia-graphics-drivers/trunk/debian/
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu Jun 24 11:45:54 UTC 2010
Author: anbe-guest
Date: Thu Jun 24 11:45:52 2010
New Revision: 1141
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1141
Log:
split new package nvidia-libgl1 from nvidia-glx
Added:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.docs
- copied unchanged from r1140, packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.docs
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.symbols
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.install.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.links.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postrm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.preinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.symbols
packages/nvidia-graphics-drivers/trunk/debian/rules
Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Thu Jun 24 11:45:52 2010
@@ -6,6 +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)
-- Andreas Beckmann <debian at abeckmann.de> Wed, 23 Jun 2010 08:33:44 +0200
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Thu Jun 24 11:45:52 2010
@@ -16,7 +16,8 @@
Package: nvidia-glx
Architecture: i386 amd64
Pre-Depends: dpkg (>= 1.15.7.2)
-Depends: nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
+Depends: nvidia-libgl1${nvidia:Legacy},
+ nvidia-kernel${nvidia:Legacy}-${nvidia:Version},
${shlibs:Depends}, ${misc:Depends}
Recommends: nvidia-vdpau-driver (>= ${nvidia:Version})
Suggests: nvidia-settings,
@@ -94,6 +95,32 @@
.
For more information on this source package visit NVIDIA's homepage
at http://www.nvidia.com/ .
+
+Package: nvidia-libgl1
+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})
+Conflicts:
+ nvidia-glx-legacy,
+ nvidia-glx-legacy-71xx,
+ nvidia-glx-legacy-96xx,
+ nvidia-glx-legacy-173xx,
+ fglrx-glx,
+Replaces: nvidia-glx (<< 195.36.31)
+Description: NVIDIA binary OpenGL libraries${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.
+ .
+ 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-kernel-dkms
Section: non-free/kernel
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.symbols
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.symbols?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.symbols (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.symbols Thu Jun 24 11:45:52 2010
@@ -1,1 +1,1 @@
-#include "nvidia-glx.symbols.common"
+#include "nvidia-libgl1.symbols.common"
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.install.in Thu Jun 24 11:45:52 2010
@@ -1,10 +1,4 @@
usr/bin/nvidia-bug-report.sh
-usr/lib/libGL.so.#VERSION#
-usr/lib/libGLcore.so.#VERSION#
-usr/lib/libnvidia-cfg.so.#VERSION#
-usr/lib/libnvidia-tls.so.#VERSION#
-usr/lib/tls/libnvidia-tls.so.#VERSION#
-usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/
usr/X11R6/lib/modules/drivers/nvidia_drv.so usr/lib/xorg/modules/drivers/
usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/
debian/nvidia.ids usr/share/xserver-xorg/pci/
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in Thu Jun 24 11:45:52 2010
@@ -1,8 +1,1 @@
-usr/lib/libGL.so.#VERSION# usr/lib/libGL.so.1
-usr/lib/libGLcore.so.#VERSION# usr/lib/libGLcore.so.1
-usr/lib/libnvidia-cfg.so.#VERSION# usr/lib/libnvidia-cfg.so.1
-usr/lib/libnvidia-tls.so.#VERSION# usr/lib/libnvidia-tls.so.1
-usr/lib/tls/libnvidia-tls.so.#VERSION# usr/lib/tls/libnvidia-tls.so.1
usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so
-usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
-usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.lintian-overrides.in Thu Jun 24 11:45:52 2010
@@ -1,24 +1,12 @@
# The NVIDIA license does not allow any form of modification.
nvidia-glx#LEGACY#: binary-has-unneeded-section
nvidia-glx#LEGACY#: embedded-libpng
-nvidia-glx#LEGACY#: shared-lib-without-dependency-information
#!i386#nvidia-glx#LEGACY#: shlib-with-executable-stack
#!amd64#nvidia-glx#LEGACY#: shlib-with-non-pic-code
#!amd64#nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
-nvidia-glx#LEGACY#: 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#: diversion-for-unknown-file usr/lib/libGL.so preinst:*
-nvidia-glx#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so.1.2 preinst:*
# The diversions are placed here.
nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
# Referenced by upstream documentation.
nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
-
-# 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
-# match the library names it provides.
-nvidia-glx#LEGACY#: package-name-doesnt-match-sonames
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Thu Jun 24 11:45:52 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 195.36.24-3 ; then
+ if dpkg --compare-versions "$2" lt-nl 195.36.31 ; 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/trunk/debian/nvidia-glx.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Thu Jun 24 11:45:52 2010
@@ -33,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 $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.xlibmesa \
- /usr/lib/libGL.so.1
- dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.2.xlibmesa \
- /usr/lib/libGL.so.1.2
-
# 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/libglx.so.xlibmesa \
/usr/lib/xorg/modules/extensions/libglx.so
-
- dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so
test ! -d /usr/lib/nvidia || \
rmdir /usr/lib/nvidia || true;
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Thu Jun 24 11:45:52 2010
@@ -19,19 +19,8 @@
# make new diversions
dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.xlibmesa \
- /usr/lib/libGL.so.1
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.1.2.xlibmesa \
- /usr/lib/libGL.so.1.2
-
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libglx.so.xlibmesa \
/usr/lib/xorg/modules/extensions/libglx.so
-
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so
;;
esac
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.install.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.install.in Thu Jun 24 11:45:52 2010
@@ -1,11 +1,6 @@
-usr/bin/nvidia-bug-report.sh
usr/lib/libGL.so.#VERSION#
usr/lib/libGLcore.so.#VERSION#
usr/lib/libnvidia-cfg.so.#VERSION#
usr/lib/libnvidia-tls.so.#VERSION#
usr/lib/tls/libnvidia-tls.so.#VERSION#
usr/X11R6/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/
-usr/X11R6/lib/modules/drivers/nvidia_drv.so usr/lib/xorg/modules/drivers/
-usr/X11R6/lib/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/
-debian/nvidia.ids usr/share/xserver-xorg/pci/
-debian/99-nvidia-glx.conf usr/share/X11/xorg.conf.d/
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.links.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.links.in Thu Jun 24 11:45:52 2010
@@ -3,6 +3,5 @@
usr/lib/libnvidia-cfg.so.#VERSION# usr/lib/libnvidia-cfg.so.1
usr/lib/libnvidia-tls.so.#VERSION# usr/lib/libnvidia-tls.so.1
usr/lib/tls/libnvidia-tls.so.#VERSION# usr/lib/tls/libnvidia-tls.so.1
-usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so
usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.lintian-overrides.in Thu Jun 24 11:45:52 2010
@@ -1,24 +1,20 @@
# The NVIDIA license does not allow any form of modification.
-nvidia-glx#LEGACY#: binary-has-unneeded-section
-nvidia-glx#LEGACY#: embedded-libpng
-nvidia-glx#LEGACY#: shared-lib-without-dependency-information
-#!i386#nvidia-glx#LEGACY#: shlib-with-executable-stack
-#!amd64#nvidia-glx#LEGACY#: shlib-with-non-pic-code
-#!amd64#nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
-nvidia-glx#LEGACY#: spelling-error-in-binary
+nvidia-libgl1#LEGACY#: binary-has-unneeded-section
+nvidia-libgl1#LEGACY#: shared-lib-without-dependency-information
+#!i386#nvidia-libgl1#LEGACY#: shlib-with-executable-stack
+#!amd64#nvidia-libgl1#LEGACY#: shlib-with-non-pic-code
+#!amd64#nvidia-libgl1#LEGACY#: shlib-without-PT_GNU_STACK-section
+nvidia-libgl1#LEGACY#: 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#: diversion-for-unknown-file usr/lib/libGL.so preinst:*
-nvidia-glx#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so.1.2 preinst:*
+nvidia-libgl1#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so preinst:*
+nvidia-libgl1#LEGACY#: diversion-for-unknown-file usr/lib/libGL.so.1.2 preinst:*
# The diversions are placed here.
-nvidia-glx#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
-
-# Referenced by upstream documentation.
-nvidia-glx#LEGACY#: script-with-language-extension usr/bin/nvidia-bug-report.sh
+nvidia-libgl1#LEGACY#: package-contains-empty-directory usr/lib/nvidia/
# 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
# match the library names it provides.
-nvidia-glx#LEGACY#: package-name-doesnt-match-sonames
+nvidia-libgl1#LEGACY#: package-name-doesnt-match-sonames
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postinst?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postinst Thu Jun 24 11:45:52 2010
@@ -20,45 +20,8 @@
fi
-# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
-# </target: squeeze>
-
-
case "$1" in
configure)
-
- # <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 195.36.24-3 ; then
- update-rc.d nvidia-glx remove || true
- fi
- # </target: squeeze>
-
- # <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 195.36.24-2 ; then
- if [ -f /etc/default/nvidia-glx.dpkg-new ]; then
- rm -f /etc/default/nvidia-glx.dpkg-new
- fi
- fi
- # </target: squeeze>
-
- # <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 195.36.24-1 ; then
- # remove obsolete diversions
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
- fi
- # </target: squeeze>
-
- # <target: squeeze>
- # remove libGL.so created before the trigger was introduced
- # will be recreated by the trigger
- if dpkg --compare-versions "$2" lt-nl 195.36.24-3 ; then
- rm -f /usr/lib/libGL.so
- fi
- # </target: squeeze>
# activate our trigger
dpkg-trigger /usr/lib/libGL.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postrm?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.postrm Thu Jun 24 11:45:52 2010
@@ -3,12 +3,6 @@
#DIVERT_QUIET="--quiet"
-
-# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
-# </target: squeeze>
-
# Rationale:
#
@@ -45,25 +39,12 @@
dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.1.2.xlibmesa \
/usr/lib/libGL.so.1.2
-
- # 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/libglx.so.xlibmesa \
- /usr/lib/xorg/modules/extensions/libglx.so
-
dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.xlibmesa \
/usr/lib/libGL.so
test ! -d /usr/lib/nvidia || \
rmdir /usr/lib/nvidia || 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
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.preinst?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.preinst Thu Jun 24 11:45:52 2010
@@ -3,12 +3,6 @@
#DIVERT_QUIET="--quiet"
-
-# <target: squeeze>
-dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
-dpkg-maintscript-helper rm_conffile /etc/init.d/nvidia-glx 195.36.24-3~ -- "$@"
-# </target: squeeze>
-
case "$1" in
install|upgrade)
@@ -24,11 +18,6 @@
dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.1.2.xlibmesa \
/usr/lib/libGL.so.1.2
-
- dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /usr/lib/nvidia/libglx.so.xlibmesa \
- /usr/lib/xorg/modules/extensions/libglx.so
-
dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.xlibmesa \
/usr/lib/libGL.so
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.symbols
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.symbols?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.symbols (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libgl1.symbols Thu Jun 24 11:45:52 2010
@@ -1,4 +1,4 @@
-#include "nvidia-glx.symbols.common"
+#include "nvidia-libgl1.symbols.common"
libXvMCNVIDIA_dynamic.so.1 #PACKAGE# #MINVER#
XvMCBlendSubpicture2 at Base 1.0.4349
XvMCBlendSubpicture at Base 1.0.4349
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1141&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Thu Jun 24 11:45:52 2010
@@ -14,12 +14,13 @@
dirname_x86 = $(NVIDIA_DIRNAME_X86)
dirname_x86_64 = $(NVIDIA_DIRNAME_X86_64)
-ALL_CONTROL := $(wildcard debian/nvidia-glx* debian/nvidia-kernel*)
-LEGACY_CONTROL := $(wildcard debian/nvidia-glx$(legacy)* debian/nvidia-kernel$(legacy)*)
+ALL_CONTROL := $(wildcard debian/nvidia-glx* debian/nvidia-libgl1* debian/nvidia-kernel*)
+LEGACY_CONTROL := $(wildcard debian/nvidia-glx$(legacy)* debian/nvidia-libgl1$(legacy)* debian/nvidia-kernel$(legacy)*)
RENAME_CONTROL = $(filter-out $(LEGACY_CONTROL),$(ALL_CONTROL))
RENAMED_CONTROL = $(patsubst debian/nvidia-glx%,debian/nvidia-glx$(legacy)%,\
+ $(patsubst debian/nvidia-libgl1%,debian/nvidia-libgl1$(legacy)%,\
$(patsubst debian/nvidia-kernel%,debian/nvidia-kernel$(legacy)%,\
- $(RENAME_CONTROL)))
+ $(RENAME_CONTROL))))
TEMPLATES := $(wildcard debian/*.in debian/module/debian/*.in)
AUTOGEN += $(patsubst %.in,%,$(TEMPLATES))
AUTOGEN += debian/module/debian/changelog
@@ -181,6 +182,9 @@
# Renaming control files for legacy packaging
ifneq (,$(legacy))
nvidia-glx$(legacy)%: nvidia-glx%
+ cp -a $< $@
+
+nvidia-libgl1$(legacy)%: nvidia-libgl1%
cp -a $< $@
nvidia-kernel$(legacy)%: nvidia-kernel%
More information about the Pkg-nvidia-devel
mailing list