[pkg-nvidia-devel] r1338 - in /packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian: changelog libgl1-nvidia-dev.postinst nvidia-glx-ia32.postinst nvidia-glx.postinst nvidia-glx.preinst
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Wed Jul 7 09:06:00 UTC 2010
Author: anbe-guest
Date: Wed Jul 7 09:05:57 2010
New Revision: 1338
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1338
Log:
cleanup diversions from nvidia-glx-legacy
Modified:
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog?rev=1338&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/changelog Wed Jul 7 09:05:57 2010
@@ -38,14 +38,15 @@
* adjust version numbers in maintainer scripts
* only list the GPUs supported in this legacy series for the last time in
the long description, do not list models in the libgl1-nvidia* packages
- * readd transitional packages to get rid of the remaining (closes: #426157)
- nvidia-glx-legacy{,-ia32,-dev} and nvidia-kernel-legacy-source packages
- * remove init script and defaults file from nvidia-glx-legacy
* refresh patches
* update install lists for files not available or named differently in 71xx
* update copyright
* update symbols files
* update lintian overrides
+ * readd transitional packages to get rid of the remaining (closes: #426157)
+ nvidia-glx-legacy{,-ia32,-dev} and nvidia-kernel-legacy-source packages
+ * remove init script and defaults file from nvidia-glx-legacy
+ * cleanup diversions from nvidia-glx-legacy
-- Andreas Beckmann <debian at abeckmann.de> Tue, 06 Jul 2010 01:30:44 +0200
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst?rev=1338&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/libgl1-nvidia-dev.postinst Wed Jul 7 09:05:57 2010
@@ -1,13 +1,23 @@
#! /bin/sh
set -e
+
+
+# $1=original $2=diverted
+undivert()
+{
+ old_diverter="$(dpkg-divert --listpackage "$1")"
+ test -z "$old_diverter" || \
+ dpkg-divert --remove --rename --package ${old_diverter} \
+ --divert "$2" "$1"
+}
if [ "$1" = "configure" ] && [ "$2" = "" ]
then
# <target: squeeze>
- # remove obsolete diversions from nvidia-glx-legacy-71xx-dev
- dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-legacy-71xx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
+ # remove obsolete diversions from nvidia-glx-legacy{,-71xx}-dev
+ undivert /usr/lib/libGL.a /usr/lib/nvidia/libGL.a.xlibmesa
+ undivert /usr/X11R6/lib/libGL.a /usr/X11R6/lib/nvidia/libGL.a.xlibmesa
rmdir /usr/lib/nvidia /usr/X11R6/lib/nvidia /usr/X11R6/lib /usr/X11R6 2>/dev/null || true
# </target: squeeze>
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst?rev=1338&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx-ia32.postinst Wed Jul 7 09:05:57 2010
@@ -1,6 +1,15 @@
#!/bin/sh
set -e
+
+# $1=original $2=diverted
+undivert()
+{
+ old_diverter="$(dpkg-divert --listpackage "$1")"
+ test -z "$old_diverter" || \
+ dpkg-divert --remove --rename --package ${old_diverter} \
+ --divert "$2" "$1"
+}
case "$1" in
configure)
@@ -8,15 +17,9 @@
# <target: squeeze>
# remove diversion created before the
# /emul/ia32-linux/usr/lib => /usr/lib32 transition
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs \
- /emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+ undivert /emul/ia32-linux/usr/lib/libGL.so.1.2 /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.2.ia32-libs
+ undivert /emul/ia32-linux/usr/lib/libGL.so.1 /emul/ia32-linux/usr/lib/nvidia/libGL.so.1.ia32-libs
+ undivert /emul/ia32-linux/usr/lib/libGL.so /emul/ia32-linux/usr/lib/nvidia/libGL.so.ia32-libs
test -d /emul/ia32-linux/usr/lib/nvidia && \
rmdir /emul/ia32-linux/usr/lib/nvidia || true;
@@ -24,15 +27,9 @@
# <target: squeeze>
# remove ancient diversions
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.ia32-libs \
- /emul/ia32-linux/usr/lib/X11R6/libGL.so > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs \
- /emul/ia32-linux/usr/lib/X11R6/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
- /emul/ia32-linux/usr/X11R6/lib/nvidia/libGL.so.1.2.ia32-libs \
- /emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2 > /dev/null
+ undivert /emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2 /emul/ia32-linux/usr/X11R6/lib/nvidia/libGL.so.1.2.ia32-libs
+ undivert /emul/ia32-linux/usr/lib/X11R6/libGL.so.1 /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.1.ia32-libs
+ undivert /emul/ia32-linux/usr/lib/X11R6/libGL.so /emul/ia32-linux/usr/lib/X11R6/nvidia/libGL.so.ia32-libs
rmdir /emul/ia32-linux/usr/lib/X11R6/nvidia /emul/ia32-linux/usr/lib/X11R6 2>/dev/null || true
rmdir /emul/ia32-linux/usr/X11R6/lib/nvidia /emul/ia32-linux/usr/X11R6/lib /emul/ia32-linux/usr/X11R6 2>/dev/null || true
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst?rev=1338&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.postinst Wed Jul 7 09:05:57 2010
@@ -9,6 +9,15 @@
dpkg-maintscript-helper rm_conffile /etc/init.d/$DPKG_MAINTSCRIPT_PACKAGE 71.86.13-2~ -- "$@"
# </target: squeeze>
+
+# $1=original $2=diverted
+undivert()
+{
+ old_diverter="$(dpkg-divert --listpackage "$1")"
+ test -z "$old_diverter" || \
+ dpkg-divert --remove --rename --package ${old_diverter} \
+ --divert "$2" "$1"
+}
case "$1" in
configure)
@@ -30,11 +39,12 @@
# </target: squeeze>
# <target: squeeze>
- if dpkg --compare-versions "$2" lt-nl 71.86.13-2 ; 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
+ # also do this on new installations, we might take over nvidia-glx-legacy
+ if dpkg --compare-versions "$2" lt 71.86.13-2 ; then
+ # remove obsolete diversions
+ undivert /usr/lib/xorg/modules/extensions/libGLcore.so /usr/lib/nvidia/libGLcore.so.xlibmesa
+ undivert /usr/lib/xorg/modules/extensions/libGLcore.a /usr/lib/nvidia/libGLcore.a.xlibmesa
+ undivert /usr/lib/xorg/modules/extensions/libglx.a /usr/lib/nvidia/libglx.a.xlibmesa
fi
# </target: squeeze>
Modified: packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst?rev=1338&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers-legacy-71xx/trunk/debian/nvidia-glx.preinst Wed Jul 7 09:05:57 2010
@@ -26,7 +26,8 @@
# <target: squeeze>
# update the diversion
- if dpkg --compare-versions "$2" lt-nl 71.86.13-2
+ # also do this on new installations, we might take over nvidia-glx-legacy
+ if dpkg --compare-versions "$2" lt 71.86.13-2
then
file_orig="/usr/lib/xorg/modules/extensions/libglx.so"
file_old_divert="/usr/lib/nvidia/libglx.so.xlibmesa"
More information about the Pkg-nvidia-devel
mailing list