This commit was manufactured by cvs2git to create branch

'unlabeled-1.262.2'.

Sprout from master 2010-05-18 17:39:02 UTC Arkadiusz Miśkiewicz <arekm@maven.pl> '- release 2'
Delete:
    X11-driver-nvidia-GL.patch
    X11-driver-nvidia-desktop.patch
    gl.pc.in
    xorg-driver-video-nvidia-xinitrc.sh

diff --git a/X11-driver-nvidia-GL.patch b/X11-driver-nvidia-GL.patch
deleted file mode 100644 (file)
index b96ac9c..0000000
--- a/X11-driver-nvidia-GL.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h~        2004-07-27 17:33:20.000000000 +0200
-+++ NVIDIA-Linux-x86-1.0-6111-pkg1/usr/include/GL/gl.h 2004-09-13 13:23:24.188682536 +0200
-@@ -1620,6 +1620,7 @@
- WINGDIAPI void APIENTRY glVertex4sv (const GLshort *v);
- WINGDIAPI void APIENTRY glVertexPointer (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer);
- WINGDIAPI void APIENTRY glViewport (GLint x, GLint y, GLsizei width, GLsizei height);
-+#define GL_COLOR_INDEX8_EXT               0x80E5
- 
- #ifdef __DEFINED_GLAPI
- # undef GLAPI

diff --git a/X11-driver-nvidia-desktop.patch b/X11-driver-nvidia-desktop.patch
deleted file mode 100644 (file)
index f9e62ee..0000000
--- a/X11-driver-nvidia-desktop.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- NVIDIA-Linux-x86-1.0-8774-pkg1/usr/share/applications/nvidia-settings.desktop~     2006-08-24 23:20:06.166925750 +0200
-+++ NVIDIA-Linux-x86-1.0-8774-pkg1/usr/share/applications/nvidia-settings.desktop      2006-08-24 23:25:53.264618000 +0200
-@@ -1,9 +1,13 @@
- [Desktop Entry]
- Type=Application
- Encoding=UTF-8
--Name=NVIDIA X Server Settings
--Comment=Configure NVIDIA X Server Settings
-+Name=nVidia X Server Settings
-+Name[pl]=Ustawienia X serwera nVidii
-+Comment=Configure nVidia X Server Settings
-+Comment[pl]=Konfiguracja ustawień X serwera NVndii
- Exec=__UTILS_PATH__/nvidia-settings
- Icon=__PIXMAP_PATH__/nvidia-settings.png
- Categories=Application;Settings;
--
-+Exec=nvidia-settings
-+Icon=nvidia-settings
-+Categories=Settings;HardwareSettings;

diff --git a/gl.pc.in b/gl.pc.in
deleted file mode 100644 (file)
index c6746ac..0000000
--- a/gl.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@@prefix@@
-exec_prefix=${prefix}
-libdir=@@libdir@@
-includedir=@@includedir@@
-
-Name: gl
-Description: NVIDIA OpenGL library
-Version: @@version@@
-Libs: -L${libdir} -lGL
-Cflags: -I${includedir} 

diff --git a/xorg-driver-video-nvidia-xinitrc.sh b/xorg-driver-video-nvidia-xinitrc.sh
deleted file mode 100644 (file)
index a8243b1..0000000
--- a/xorg-driver-video-nvidia-xinitrc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -r "${HOME}/.nvidia-settings-rc" ]; then
-       /usr/bin/nvidia-settings -l > /dev/null 2>&1
-fi