[pkg-nvidia-devel] r1139 - in /packages/nvidia-graphics-drivers/trunk/debian: nvidia-glx-ia32.postrm nvidia-glx-ia32.preinst nvidia-glx.postrm nvidia-glx.preinst nvidia-vdpau-driver.postinst
anbe-guest at users.alioth.debian.org
anbe-guest at users.alioth.debian.org
Thu Jun 24 09:59:09 UTC 2010
Author: anbe-guest
Date: Thu Jun 24 09:59:08 2010
New Revision: 1139
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1139
Log:
make --quiet mode of dpkg-divert more easily configurable
Modified:
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
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-vdpau-driver.postinst
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm?rev=1139&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm Thu Jun 24 09:59:08 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
# Rationale:
#
@@ -22,15 +24,15 @@
remove|abort-install)
# restore libGL.so* from ia32-libs, diverted to /usr/lib32/nvidia
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.ia32-libs \
- /usr/lib32/libGL.so > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ /usr/lib32/libGL.so
+ dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.1.ia32-libs \
- /usr/lib32/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ /usr/lib32/libGL.so.1
+ dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
- /usr/lib32/libGL.so.1.2 > /dev/null
+ /usr/lib32/libGL.so.1.2
test ! -d /usr/lib32/nvidia || \
rmdir /usr/lib32/nvidia || true;
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst?rev=1139&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst Thu Jun 24 09:59:08 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
case "$1" in
install|upgrade)
@@ -10,15 +12,15 @@
mkdir -p /usr/lib32/nvidia || true
# divert libGL.so* from ia32-libs to /usr/lib32/nvidia
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.ia32-libs \
- /usr/lib32/libGL.so > /dev/null
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ /usr/lib32/libGL.so
+ dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.1.ia32-libs \
- /usr/lib32/libGL.so.1 > /dev/null
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ /usr/lib32/libGL.so.1
+ dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
- /usr/lib32/libGL.so.1.2 > /dev/null
+ /usr/lib32/libGL.so.1.2
# <target: squeeze>
# this file was not shipped in the package but generated by ldconfig
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=1139&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Thu Jun 24 09:59:08 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
@@ -37,25 +39,25 @@
rm -f /usr/lib/libGL.so
fi
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --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/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 > /dev/null
+ /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 --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
+ /usr/lib/xorg/modules/extensions/libglx.so
- dpkg-divert --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so > /dev/null
+ /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=1139&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Thu Jun 24 09:59:08 2010
@@ -1,6 +1,8 @@
#!/bin/sh
set -e
+
+#DIVERT_QUIET="--quiet"
# <target: squeeze>
dpkg-maintscript-helper rm_conffile /etc/default/nvidia-glx 195.36.24-1~ -- "$@"
@@ -16,20 +18,20 @@
mkdir -p /usr/lib/nvidia || true
# make new diversions
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --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/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 > /dev/null
+ /usr/lib/libGL.so.1.2
- 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
+ /usr/lib/xorg/modules/extensions/libglx.so
- dpkg-divert --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+ dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
/usr/lib/nvidia/libGL.so.xlibmesa \
- /usr/lib/libGL.so > /dev/null
+ /usr/lib/libGL.so
;;
esac
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postinst?rev=1139&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-vdpau-driver.postinst Thu Jun 24 09:59:08 2010
@@ -4,6 +4,8 @@
if [ "$1" = "configure" ]; then
# <target: squeeze>
+ # this file was left over by some old versions of the
+ # nvidia-libvdpau* packages
if [ -L /usr/lib/libvdpau_nvidia.so ]; then
rm /usr/lib/libvdpau_nvidia.so || true
fi
More information about the Pkg-nvidia-devel
mailing list