[pkg-nvidia-devel] r828 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx-dev.postinst nvidia-glx-dev.postrm nvidia-glx-dev.preinst.in nvidia-glx.postinst nvidia-glx.postrm.in nvidia-glx.preinst rules
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 04:37:29 UTC 2010
Author: rra
Date: Sun Apr 25 04:37:28 2010
New Revision: 828
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=828
Log:
Clean up obsolete diversions
[ Andreas Beckmann ]
* nvidia-glx: stop diverting /usr/lib/xorg/modules/extensions/libGLcore.so,
was removed in Xorg 1.6, add Breaks: xserver-xorg-core (<< 2:1.6) instead
* nvidia-glx: stop diverting files not seen in etch or later:
- /usr/lib/xorg/modules/extensions/libGLcore.a
- /usr/lib/xorg/modules/extensions/libglx.a
* nvidia-glx: clean up diversion of /usr/lib/libGL.a (was not being created
in etch or later), the file is provided by libgl1-mesa-swx11-dev which
conflicts with nvidia-glx
* remove empty maintainer script nvidia-glx-dev.preinst.in
Removed:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst.in
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
packages/nvidia-graphics-drivers/trunk/debian/control
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst
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=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:37:28 2010
@@ -64,6 +64,15 @@
- remove diversion transition and cleanup code introduced before etch
release
- remove libwfb.so diversion cleanup code introduced before lenny release
+ * nvidia-glx: stop diverting /usr/lib/xorg/modules/extensions/libGLcore.so,
+ was removed in Xorg 1.6, add Breaks: xserver-xorg-core (<< 2:1.6) instead
+ * nvidia-glx: stop diverting files not seen in etch or later:
+ - /usr/lib/xorg/modules/extensions/libGLcore.a
+ - /usr/lib/xorg/modules/extensions/libglx.a
+ * nvidia-glx: clean up diversion of /usr/lib/libGL.a (was not being created
+ in etch or later), the file is provided by libgl1-mesa-swx11-dev which
+ conflicts with nvidia-glx
+ * remove empty maintainer script nvidia-glx-dev.preinst.in
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Apr 25 04:37:28 2010
@@ -32,6 +32,7 @@
Architecture: i386 amd64
Depends: nvidia-kernel-${nvidia:Version}, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
Suggests: nvidia-settings, nvidia-kernel-source (>= ${nvidia:Version})
+Breaks: xserver-xorg-core (<< 2:1.6)
Description: NVIDIA binary Xorg driver
These binary drivers provide optimized hardware
acceleration of OpenGL applications via a direct-rendering X Server.
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst?rev=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postinst Sun Apr 25 04:37:28 2010
@@ -23,6 +23,14 @@
if [ -e /etc/init.d/nvidia-glx ] ; then
invoke-rc.d nvidia-glx start
fi
+
+ # <target: squeeze>
+ if dpkg --compare-versions "$2" lt-nl 190.53-5 ; then
+ # remove obsolete diversions
+ dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
+ fi
+ # </target: squeeze>
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm?rev=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.postrm Sun Apr 25 04:37:28 2010
@@ -18,20 +18,12 @@
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
-# released versions: etch: 1.0.8776-4, lenny: 173.14.09-5
case "$1" in
purge|remove)
rm /usr/lib/libGL.so || true
invoke-rc.d nvidia-glx start || true
-
- # this diversion is no longer being created since r93 = 1.0.8774-5
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-
- if [ -d /usr/lib/nvidia/ ]; then
- rmdir /usr/lib/nvidia || true;
- fi
;;
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=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Sun Apr 25 04:37:28 2010
@@ -50,6 +50,15 @@
fi
# </target: squeeze>
+ # <target: squeeze>
+ if dpkg --compare-versions "$2" lt-nl 190.53-5 ; then
+ # remove obsolete diversions
+ dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
+ dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
+ fi
+ # </target: squeeze>
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in?rev=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Sun Apr 25 04:37:28 2010
@@ -49,9 +49,6 @@
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
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=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Sun Apr 25 04:37:28 2010
@@ -26,9 +26,6 @@
dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.xlibmesa /usr/lib/libGL.so.1 > /dev/null
dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so.1.2 > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.a.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGLcore.so.xlibmesa /usr/lib/xorg/modules/extensions/libGLcore.so > /dev/null
- dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.a.xlibmesa /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libglx.so.xlibmesa /usr/lib/xorg/modules/extensions/libglx.so > /dev/null
dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=828&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:37:28 2010
@@ -33,7 +33,6 @@
debian/nvidia-glx.postrm debian/nvidia-glx.init \
debian/nvidia-glx-ia32.links \
debian/nvidia-libvdpau1-ia32.links \
-debian/nvidia-glx-dev.preinst \
debian/libcuda1.install \
debian/libcuda1-ia32.install \
debian/libcuda1.links debian/libcuda1-ia32.links \
More information about the Pkg-nvidia-devel
mailing list