Delete the following file from the svn repository:
debian/nvidia-glx-dev.preinst.in
Index: debian/control
===================================================================
--- debian/control (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/control (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -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.
Index: debian/nvidia-glx.postrm.in
===================================================================
--- debian/nvidia-glx.postrm.in (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/nvidia-glx.postrm.in (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -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
Index: debian/nvidia-glx-dev.postrm
===================================================================
--- debian/nvidia-glx-dev.postrm (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/nvidia-glx-dev.postrm (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -18,7 +18,6 @@
# 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)
@@ -26,13 +25,6 @@
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
-
;;
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
Index: debian/rules
===================================================================
--- debian/rules (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/rules (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -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 \
Index: debian/nvidia-glx-dev.postinst
===================================================================
--- debian/nvidia-glx-dev.postinst (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/nvidia-glx-dev.postinst (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -23,6 +23,14 @@
if [ -e /etc/init.d/nvidia-glx ] ; then
invoke-rc.d nvidia-glx start
fi
+
+ #
+ 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
+ #
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Index: debian/nvidia-glx.postinst
===================================================================
--- debian/nvidia-glx.postinst (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/nvidia-glx.postinst (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -50,6 +50,15 @@
fi
#
+ #
+ 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
+ #
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Index: debian/nvidia-glx.preinst
===================================================================
--- debian/nvidia-glx.preinst (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/nvidia-glx.preinst (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -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
Index: debian/changelog
===================================================================
--- debian/changelog (.../anbe-225-script-cleanup) (revision 1945)
+++ debian/changelog (.../anbe-230-diversion-cleanup) (revision 1945)
@@ -58,6 +58,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
-- Andreas Beckmann Sun, 11 Apr 2010 12:23:16 +0200