[pkg-nvidia-devel] r316 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control.in nvidia-glx.postrm.in nvidia-glx.preinst

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Sat Sep 22 23:45:56 2007
New Revision: 316

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=316
Log:
add new diversions for wfb.so and Glcore.so

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=316&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sat Sep 22 23:45:56 2007
@@ -1,11 +1,13 @@
 nvidia-graphics-drivers (100.14.19-1) UNRELEASED; urgency=low
 
   * new upstream.
-  * Xorg 7.3 compatible (closes:   )
-  * divert libwfb.so and libGLcore.so (closes: )
-  * change maintainer to packaging team. 
-
- -- Randall Donald <rdonald at debian.org>  Wed, 19 Sep 2007 12:34:02 -0700
+  * Xorg 7.3 compatible (closes: #420177 )
+  * divert libwfb.so and libGLcore.so (closes: #442846, #441400)
+  * change maintainer to packaging team.
+  * change x11-common depends to 1:7.3+2
+  * change provides to xserver-xorg-video-2
+
+ -- Randall Donald <rdonald at debian.org>  Sat, 22 Sep 2007 16:39:06 -0700
 
 nvidia-graphics-drivers (100.14.11-1) unstable; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=316&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Sat Sep 22 23:45:56 2007
@@ -64,10 +64,10 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), xserver-xorg-core (>= 2:1.4), ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
 Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5)
-Provides: xserver-xorg-video-1.0
+Provides: xserver-xorg-video-2
 Replaces: nvidia-glx-src
 Description: NVIDIA binary Xorg driver
  These binary drivers provide optimized hardware 

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=316&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm.in Sat Sep 22 23:45:56 2007
@@ -24,10 +24,12 @@
 	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
+	dpkg-divert --remove --rename --package nvidia-glx --divert /usr/lib/nvidia/libwfb.so.xserver-xorg-core /usr/lib/xorg/modules/libwfb.so > /dev/null	
 	rm -f /usr/lib/xorg/modules/extensions/libglx.so.#VERSION# 2> /dev/null || true
 	if [ -d /usr/lib/nvidia ]; then
 		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=316&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.preinst Sat Sep 22 23:45:56 2007
@@ -89,11 +89,12 @@
 	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
-	
+	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)