[pkg-nvidia-devel] r388 - in /packages/nvidia-graphics-drivers/trunk: debian.binary/changelog debian/changelog debian/nvidia-glx.postinst

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Mon May 26 16:29:58 2008
New Revision: 388

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=388
Log:
make sure wfb diversion is removed

Modified:
    packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/changelog?rev=388&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/changelog Mon May 26 16:29:58 2008
@@ -1,3 +1,14 @@
+nvidia-kernel (169.12-2) unstable; urgency=low
+
+  * Add initial linux-modules-nonfree-2.6 intergration, 2.6.24 only
+  * create storage directories for old patches and don't include in binary
+    packages.
+  * Remove wfb diversion and don't install nvidia's copy.
+  * Patch for 2.6.25 support
+  * Patch to compile on xen enabled kernels (closes: #476504, #481485)
+
+ -- Randall Donald <rdonald at debian.org>  Sat, 24 May 2008 19:57:18 -0700
+
 nvidia-kernel (169.12-1) unstable; urgency=low
 
   * fix shlib dep

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=388&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Mon May 26 16:29:58 2008
@@ -1,3 +1,9 @@
+nvidia-graphics-drivers (169.12-3) unstable; urgency=low
+
+  * Make sure wfb diversion is removed. (closes: #482995)
+
+ -- Randall Donald <rdonald at debian.org>  Mon, 26 May 2008 09:27:40 -0700
+
 nvidia-graphics-drivers (169.12-2) unstable; urgency=low
 
   * Add initial linux-modules-nonfree-2.6 intergration, 2.6.24 only

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=388&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postinst Mon May 26 16:29:58 2008
@@ -2,6 +2,8 @@
 
 set -e
 
+#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