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

[rdonald at users.alioth.debian.org]

Author: rdonald
Date: Sun Sep 23 00:14:36 2007
New Revision: 319

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=319
Log:
prepare to tag

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

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=319&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Sep 23 00:14:36 2007
@@ -1,4 +1,4 @@
-nvidia-graphics-drivers (100.14.19-1) UNRELEASED; urgency=low
+nvidia-graphics-drivers (100.14.19-1) unstable; urgency=low
 
   * new upstream.
   * Xorg 7.3 compatible (closes: #420177 )
@@ -8,7 +8,7 @@
   * change provides to xserver-xorg-video-2
   * remove use of update-modules (closes: #435650)
 
- -- Randall Donald <rdonald at debian.org>  Sat, 22 Sep 2007 16:56:18 -0700
+ -- Randall Donald <rdonald at debian.org>  Sat, 22 Sep 2007 17:16:06 -0700
 
 nvidia-graphics-drivers (100.14.11-1) unstable; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=319&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Sun Sep 23 00:14:36 2007
@@ -1,7 +1,7 @@
 Source: nvidia-graphics-drivers
 Section: non-free/x11
 Priority: optional
-Maintainer: Randall Donald <rdonald at debian.org>
+Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers
 Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0)
@@ -61,20 +61,21 @@
  See /usr/share/doc/nvidia-glx/README.txt.gz for a complete list 
  of supported GPUs and PCIIDs
  .
- Please see the nvidia-kernel-source package for building the kernel module
- required by this package.
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-100.14.19, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: nvidia-kernel-100.14.19, x11-common (>= 1:7.0.0), xserver-xorg-core (>= 2:1.4), ${shlibs:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= 100.14.19)
 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 
  acceleration of  OpenGL applications via a direct-rendering X Server. 
  AGP, PCIe, SLI, TV-out and flat panel displays are also supported.
+ .
+ Please see the nvidia-kernel-source package for building the kernel module
+ required by this package. This will provide nvidia-kernel-<version>
  .
  The following GPU's are supported:
  GeForce 6800 Ultra, GeForce 6800, GeForce 6800 XE, GeForce 6800 XT
@@ -118,8 +119,6 @@
  See /usr/share/doc/nvidia-glx/README.txt.gz for a complete list 
  of supported GPUs and PCIIDs
  .
- Please see the nvidia-kernel-source package for building the kernel module
- required by this package. This will provide nvidia-kernel-<version>
  
 Package: nvidia-glx-dev
 Architecture: i386 amd64

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=319&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.postrm Sun Sep 23 00:14:36 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.100.14.19 2> /dev/null || true
 	if [ -d /usr/lib/nvidia ]; then
 		rmdir /usr/lib/nvidia/ || true;