[pkg-nvidia-devel] r827 - /packages/nvidia-graphics-drivers/trunk/debian/
rra at users.alioth.debian.org
rra at users.alioth.debian.org
Sun Apr 25 04:32:53 UTC 2010
Author: rra
Date: Sun Apr 25 04:32:53 2010
New Revision: 827
URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=827
Log:
General maintainer script cleanup
* maintainer scripts:
- synchronize with dh_make templates
- document the target release squeeze for some cleanup operations as a
hint to remove them after squeeze release
- remove code deactivated before etch release
- remove diversion transition and cleanup code introduced before etch
release
- remove libwfb.so diversion cleanup code introduced before lenny release
Modified:
packages/nvidia-graphics-drivers/trunk/debian/changelog
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-dev.preinst.in
packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst
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.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/nvidia-glx.prerm
packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.postinst
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=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Apr 25 04:32:53 2010
@@ -56,6 +56,14 @@
* debian/rules: rename target configure-stamp to unpack-stamp and fix
dependencies
* debian/rules: remove unused stamp files, targets and variables
+ * maintainer scripts:
+ - synchronize with dh_make templates
+ - document the target release squeeze for some cleanup operations as a
+ hint to remove them after squeeze release
+ - remove code deactivated before etch release
+ - remove diversion transition and cleanup code introduced before etch
+ release
+ - remove libwfb.so diversion cleanup code introduced before lenny release
-- Russ Allbery <rra at debian.org> Sat, 24 Apr 2010 20:35:20 -0700
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=827&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:32:53 2010
@@ -1,14 +1,42 @@
-#!/bin/sh
+#!/bin/sh
+# postinst script for nvidia-glx-dev
+#
+# see: dh_installdeb(1)
set -e
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
case "$1" in
- configure)
+ configure)
if [ -e /etc/init.d/nvidia-glx ] ; then
invoke-rc.d nvidia-glx start
fi
- ;;
-esac
-
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
#DEBHELPER#
+
+exit 0
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=827&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:32:53 2010
@@ -1,48 +1,52 @@
-#! /bin/sh
-# postrm script for nvidia-glx
+#!/bin/sh
+# postrm script for nvidia-glx-dev
#
# see: dh_installdeb(1)
set -e
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# 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
- remove|purge)
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
+ purge|remove)
+
rm /usr/lib/libGL.so || true
invoke-rc.d nvidia-glx start || true
-# ln -s /usr/lib/nvidia/libGL.so.1.2.xlibmesa /usr/lib/libGL.so
-
+ # 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
-
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
if [ -d /usr/lib/nvidia/ ]; then
rmdir /usr/lib/nvidia || true;
-
fi
;;
-
+
upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
- ;;
+ ;;
*)
echo "postrm called with unknown argument \`$1'" >&2
- exit 0
-
+ exit 1
+ ;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
+
+exit 0
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst.in?rev=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.preinst.in Sun Apr 25 04:32:53 2010
@@ -1,96 +1,35 @@
-#! /bin/sh
-# preinst script for nvidia-glx
+#!/bin/sh
+# preinst script for nvidia-glx-dev
#
# see: dh_installdeb(1)
set -e
+# summary of how this script can be called:
+# * <new-preinst> `install'
+# * <new-preinst> `install' <old-version>
+# * <new-preinst> `upgrade' <old-version>
+# * <old-preinst> `abort-upgrade' <new-version>
+# 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
install|upgrade)
- # diversion transition
- if [ -d /usr/share/nvidia-glx/diversions/ ] ; then
- rm -f /usr/lib/libGL.so
- rm -f /usr/lib/libGL.a
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
- rmdir /usr/share/nvidia-glx/diversions/ || true
- rmdir /usr/share/nvidia-glx || true
+ # <disabled since r93 = 1.0.8774-5>
+# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
+ # </disabled since r93 = 1.0.8774-5>
- fi
-
- if [ -d /usr/share/nvidia-glx/diversions ] ; then
- rm -f /usr/lib/libGL.so
- rm -f /usr/lib/libGL.a
-
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.so /usr/lib/libGL.so > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/libGL.a /usr/lib/libGL.a > /dev/null
-
-
- rmdir /usr/share/nvidia-glx/diversions || true
- rmdir /usr/share/nvidia-glx || true
- fi
-
-
- if [ ! -d /usr/lib/nvidia ]; then
- mkdir -p /usr/lib/nvidia || true
- fi
-
-# to remove old old old gl header diversions
-
-
- if [ -e /usr/share/nvidia-glx/diversions/gl.h ]; then
- if [ -e /usr/include/GL/gl.h ]; then
- rm -f /usr/include/GL/gl.h /usr/include/GL/glx.h /usr/include/GL/glxtokens.h
- fi
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxext.h /usr/include/GL/glxext.h > /dev/null
-
- fi
-
- # make sure these diversions don't exist anymore
- if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
- fi
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
-# rm /usr/lib/libGL.so || true
-
-# ln -s /usr/lib/libGL.so.#VERSION# /usr/lib/libGL.so || true
-
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/gl.h /usr/include/GL/gl.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glx.h /usr/include/GL/glx.h > /dev/null
-# dpkg-divert --add --rename --package nvidia-glx-dev --divert /usr/share/nvidia-glx/diversions/glxtokens.h /usr/include/GL/glxtokens.h > /dev/null
-
- ;;
+ ;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
- exit 0
+ exit 1
;;
esac
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst?rev=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postinst Sun Apr 25 04:32:53 2010
@@ -21,6 +21,7 @@
case "$1" in
configure)
+ # <target: squeeze>
# remove diversion created before the
# /emul/ia32-linux/usr/lib => /usr/lib32 transition
dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
@@ -35,6 +36,7 @@
test -d /emul/ia32-linux/usr/lib/nvidia && \
rmdir /emul/ia32-linux/usr/lib/nvidia || true;
+ # </target: squeeze>
;;
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=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.postrm Sun Apr 25 04:32:53 2010
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# postrm script for nvidia-glx-ia32
#
# see: dh_installdeb(1)
@@ -20,7 +20,7 @@
case "$1" in
- remove|purge)
+ purge|remove)
# restore libGL.so* from ia32-libs, diverted to /usr/lib32/nvidia
dpkg-divert --remove --rename --package nvidia-glx-ia32 --divert \
@@ -43,10 +43,9 @@
*)
echo "postrm called with unknown argument \`$1'" >&2
- exit 0
+ exit 1
;;
esac
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
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=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.preinst Sun Apr 25 04:32:53 2010
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# preinst script for nvidia-glx-ia32
#
# see: dh_installdeb(1)
@@ -31,9 +31,11 @@
/usr/lib32/nvidia/libGL.so.1.2.ia32-libs \
/usr/lib32/libGL.so.1.2 > /dev/null
+ # <target: squeeze>
# this file was not shipped in the package but generated by ldconfig
test ! -L /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || \
rm /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1 || true
+ # </target: squeeze>
;;
@@ -42,10 +44,9 @@
*)
echo "preinst called with unknown argument \`$1'" >&2
- exit 0
+ exit 1
;;
esac
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
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=827&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:32:53 2010
@@ -1,6 +1,22 @@
#!/bin/sh
+# postinst script for nvidia-glx
+#
+# see: dh_installdeb(1)
set -e
+
+# summary of how this script can be called:
+# * <postinst> `configure' <most-recently-configured-version>
+# * <old-postinst> `abort-upgrade' <new version>
+# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+# <new-version>
+# * <postinst> `abort-remove'
+# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+# <failed-install-package> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
rm_conffile() {
mv_conffile "$1" "$1.dpkg-bak"
@@ -24,12 +40,15 @@
fi
}
-case "$1" in
+
+case "$1" in
configure)
+ # <target: squeeze>
if dpkg --compare-versions "$2" lt-nl 190.53-5 ; then
rm_conffile /etc/default/nvidia-glx
fi
+ # </target: squeeze>
;;
@@ -37,21 +56,14 @@
;;
*)
- echo "$0 called with unknown argument '$1'" >&2
+ echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
-
-#make sure wfb diversion is removed
-dpkg-divert --rename --remove --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so >/dev/null || true
-
-
-
-
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
#DEBHELPER#
-
-
-ldconfig
+exit 0
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=827&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:32:53 2010
@@ -1,7 +1,22 @@
-#! /bin/sh
+#!/bin/sh
# postrm script for nvidia-glx
+#
+# see: dh_installdeb(1)
set -e
+
+# summary of how this script can be called:
+# * <postrm> `remove'
+# * <postrm> `purge'
+# * <old-postrm> `upgrade' <new-version>
+# * <new-postrm> `failed-upgrade' <old-version>
+# * <new-postrm> `abort-install'
+# * <new-postrm> `abort-install' <old-version>
+# * <new-postrm> `abort-upgrade' <old-version>
+# * <disappearer's-postrm> `disappear' <overwriter>
+# <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
# Rationale:
#
@@ -23,12 +38,14 @@
# and assume that our overwriting package will have logic to take over the
# diversions and doesn't want us messing with them.
+
case "$1" in
remove|abort-install)
if [ remove = "$1" ] ; then
# remove file created by init script
rm /usr/lib/libGL.so || true
fi
+
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
@@ -42,28 +59,21 @@
if [ -d /usr/lib/nvidia ]; then
rmdir /usr/lib/nvidia/ || true;
fi
- ldconfig
-
+
;;
-
- upgrade|failed-upgrade|abort-upgrade|disappear|purge)
-
- ;;
+ purge|upgrade|failed-upgrade|abort-upgrade|disappear)
+ ;;
*)
echo "postrm called with unknown argument \`$1'" >&2
- exit 0
-
+ exit 1
+ ;;
esac
-
-
-#rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
-
-
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
+
+exit 0
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=827&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:32:53 2010
@@ -1,4 +1,4 @@
-#! /bin/sh
+#!/bin/sh
# preinst script for nvidia-glx
#
# see: dh_installdeb(1)
@@ -10,75 +10,13 @@
# * <new-preinst> `install' <old-version>
# * <new-preinst> `upgrade' <old-version>
# * <old-preinst> `abort-upgrade' <new-version>
-#
-# For details see /usr/share/doc/packaging-manual/
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
case "$1" in
install|upgrade)
-
-
- # Hack right now.
- # rm -f /usr/X11R6/lib/modules/extensions/libglx.so.1.0.5336 2>/dev/null || true
-
- # clean up from old diversions
- if [ -d /usr/share/nvidia-glx/diversions ]; then
- rm -f /usr/lib/libGL.so.1
- rm -f /usr/lib/libGL.so.1.2
-
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
- rm -f /usr/lib/xorg/modules/extensions/libGLcore.a
- rm -f /usr/lib/xorg/modules/extensions/libglx.a
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGLcore.a /usr/lib/xorg/modules/extensions/libGLcore.a > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libglx.a /usr/lib/xorg/modules/extensions/libglx.a > /dev/null
-
- rmdir /usr/share/nvidia-glx/diversions || true;
- rmdir /usr/share/nvidia-glx || true;
- fi
- if [ -d /usr/share/nvidia-glx/diversions ]; then
-
- rm -f /usr/lib/libGL.so.1
- rm -f /usr/lib/libGL.so.1.2
-
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1 /usr/lib/libGL.so.1 > /dev/null
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/share/nvidia-glx/diversions/libGL.so.1.2 /usr/lib/libGL.so.1.2 > /dev/null
-
- rmdir /usr/share/nvidia-glx/diversions || true;
- rmdir /usr/share/nvidia-glx || true;
- fi
- # remove X11R6 diversions
-
- if dpkg-divert --list /usr/X11R6/lib/libGL.so.1 | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.xlibmesa /usr/X11R6/lib/libGL.so.1 > /dev/null
- fi
-
- if dpkg-divert --list /usr/X11R6/lib/libGL.so.1.2 | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGL.so.1.2.xlibmesa /usr/X11R6/lib/libGL.so.1.2 > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libGLcore.a | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libGLcore.a.xlibmesa /usr/X11R6/lib/modules/extensions/libGLcore.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.a | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.a.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/modules/extensions/libglx.so | grep 'nvidia-glx' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx --divert /usr/X11R6/lib/nvidia/libglx.so.xlibmesa /usr/X11R6/lib/modules/extensions/libglx.so > /dev/null
- fi
-
- # make sure these diversions don't exist anymore
- if dpkg-divert --list /usr/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.so.xlibmesa /usr/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/lib/libGL.a | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/lib/nvidia/libGL.a.xlibmesa /usr/lib/libGL.a > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.so.xlibmesa /usr/X11R6/lib/libGL.so > /dev/null
- fi
- if dpkg-divert --list /usr/X11R6/lib/libGL.so | grep 'nvidia-glx-dev' > /dev/null ; then
- dpkg-divert --remove --rename --package nvidia-glx-dev --divert /usr/X11R6/lib/nvidia/libGL.a.xlibmesa /usr/X11R6/lib/libGL.a > /dev/null
- fi
# create new diversion directories
if [ ! -d /usr/lib/nvidia ]; then
mkdir -p /usr/lib/nvidia || true
@@ -94,19 +32,17 @@
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
-# dpkg-divert --add --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null
- ;;
+
+ ;;
abort-upgrade)
;;
*)
echo "preinst called with unknown argument \`$1'" >&2
- exit 0
+ exit 1
;;
esac
-
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm?rev=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.prerm Sun Apr 25 04:32:53 2010
@@ -1,5 +1,5 @@
-#! /bin/sh
-# prerm script for nvidia-drivers
+#!/bin/sh
+# prerm script for nvidia-glx
#
# see: dh_installdeb(1)
@@ -19,19 +19,18 @@
case "$1" in
remove|upgrade|deconfigure)
-# install-info --quiet --remove /usr/info/nvidia-drivers.info.gz
rm -f /usr/lib/libGL.so || true
/etc/init.d/nvidia-glx start || true
- ;;
+ ;;
+
failed-upgrade)
- ;;
+ ;;
+
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
-
-
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
@@ -39,5 +38,3 @@
#DEBHELPER#
exit 0
-
-
Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.postinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.postinst?rev=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau1-ia32.postinst Sun Apr 25 04:32:53 2010
@@ -21,14 +21,16 @@
case "$1" in
configure)
+ # <target: squeeze>
# these files were not shipped in the package nvidia-libvdpau (before
- # the emul/ia32-linux transiotion) but generated by ldconfig
+ # the emul/ia32-linux transition) but generated by ldconfig
test ! -L /emul/ia32-linux/usr/lib/libvdpau.so.1 || \
rm /emul/ia32-linux/usr/lib/libvdpau.so.1 || true
test ! -L /emul/ia32-linux/usr/lib/libvdpau_nvidia.so || \
rm /emul/ia32-linux/usr/lib/libvdpau_nvidia.so || true
test ! -L /emul/ia32-linux/usr/lib/libvdpau_trace.so || \
rm /emul/ia32-linux/usr/lib/libvdpau_trace.so || true
+ # </target: squeeze>
;;
Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=827&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Apr 25 04:32:53 2010
@@ -176,7 +176,6 @@
install $(dirname)/usr/X11R6/lib/modules/extensions/libglx.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/extensions/
-# install $(dirname)/usr/X11R6/lib/modules/libnvidia-wfb.so.${version} $(CURDIR)/debian/nvidia-glx/usr/lib/xorg/modules/
if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
install -D $(dirname)/usr/lib32/libGLcore.so.${version} \
More information about the Pkg-nvidia-devel
mailing list