[pkg-nvidia-devel] r980 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog control nvidia-glx-dev.install.in

[anbe-guest at users.alioth.debian.org]

Author: anbe-guest
Date: Wed Jun  2 09:34:06 2010
New Revision: 980

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=980
Log:
  * nvidia-glx-dev: install headers into /usr/include/nvidia/GL and depend on
    libgl1-mesa-dev | libgl-dev instead of conflicting with it
    (closes: #278256, #370542, #552388)
  * compiling OpenGL applications will use the MESA implementation by default,
    to explicitly compile with the NVIDIA headers use -I/usr/include/nvidia

Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.install.in

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=980&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Wed Jun  2 09:34:06 2010
@@ -34,6 +34,11 @@
   * nvidia-glx-{dev,ia32}: ship /usr/lib{,32}/nvidia/libGL.so, allowing
     explicit linking with the NVIDIA OpenGL implementation via
     ... -L/usr/lib/nvidia -lGL ...
+  * nvidia-glx-dev: install headers into /usr/include/nvidia/GL and depend on
+    libgl1-mesa-dev | libgl-dev instead of conflicting with it
+    (closes: #278256, #370542, #552388)
+  * compiling OpenGL applications will use the MESA implementation by default,
+    to explicitly compile with the NVIDIA headers use -I/usr/include/nvidia
 
  -- Russ Allbery <rra at debian.org>  Wed, 26 May 2010 07:19:43 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control?rev=980&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control Wed Jun  2 09:34:06 2010
@@ -68,13 +68,12 @@
 
 Package: nvidia-glx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx (= ${binary:Version}), libx11-dev, ${misc:Depends}
-Provides: libgl-dev
-Conflicts: libgl-dev, mesa-common-dev,
+Depends: ${misc:Depends}, nvidia-glx (= ${binary:Version}),
+ libx11-dev, libgl1-mesa-dev | libgl-dev
+Conflicts:
  nvidia-glx-legacy-71xx,
  nvidia-glx-legacy-96xx,
  nvidia-glx-legacy-173xx,
-Replaces: libgl-dev
 Description: NVIDIA binary Xorg driver development files
  This package contains the NVIDIA binary Xorg driver
  development files.

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.install.in?rev=980&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.install.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.install.in Wed Jun  2 09:34:06 2010
@@ -1,5 +1,5 @@
-usr/include/GL/gl.h
-usr/include/GL/glext.h
-usr/include/GL/glx.h
-usr/include/GL/glxext.h
+usr/include/GL/gl.h		usr/include/nvidia/GL/
+usr/include/GL/glext.h		usr/include/nvidia/GL/
+usr/include/GL/glx.h		usr/include/nvidia/GL/
+usr/include/GL/glxext.h		usr/include/nvidia/GL/
 usr/X11R6/lib/libXvMCNVIDIA.a	usr/lib/