Merge branch '2.5' into 2.6

This commit is contained in:
Juergen Daubert 2009-06-13 23:07:08 +02:00
commit 1a6a735ac7
8 changed files with 21 additions and 22 deletions

View File

@ -1,3 +1,3 @@
c92bf44516b82cad857fb386dbb64bfe my.cnf
1732a0a06c3cf0f0fb6e6fb77ae11456 mysql-5.0.82.tar.gz
051392064a1e32cca5c23a593908b10e mysql-5.0.83.tar.gz
642a596f13ebd7e459c5ff2fd382f06b mysqld

View File

@ -4,7 +4,7 @@
# Depends on: ncurses readline zlib
name=mysql
version=5.0.82
version=5.0.83
release=1
source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.0/$name-$version.tar.gz \
my.cnf mysqld)

View File

@ -16,29 +16,29 @@ drwxr-xr-x root/root usr/include/nvidia/GL/
-r--r--r-- root/root usr/include/nvidia/GL/glxext.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libGL.la
-rwxr-xr-x root/root usr/lib/libGL.so.180.60
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.180.60
lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.180.60
-rwxr-xr-x root/root usr/lib/libGLcore.so.180.60
-rwxr-xr-x root/root usr/lib/libcuda.so.180.60
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.180.60
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.180.60
-rwxr-xr-x root/root usr/lib/libvdpau.so.180.60
-rwxr-xr-x root/root usr/lib/libvdpau_nvidia.so.180.60
-rwxr-xr-x root/root usr/lib/libvdpau_trace.so.180.60
-rwxr-xr-x root/root usr/lib/libGL.so.185.18.14
lrwxrwxrwx root/root usr/lib/libGL_so_1_2_nvidia -> libGL.so.185.18.14
lrwxrwxrwx root/root usr/lib/libGLcore.so -> libGLcore.so.185.18.14
-rwxr-xr-x root/root usr/lib/libGLcore.so.185.18.14
-rwxr-xr-x root/root usr/lib/libcuda.so.185.18.14
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.185.18.14
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.185.18.14
-rwxr-xr-x root/root usr/lib/libvdpau.so.185.18.14
-rwxr-xr-x root/root usr/lib/libvdpau_nvidia.so.185.18.14
-rwxr-xr-x root/root usr/lib/libvdpau_trace.so.185.18.14
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.180.60
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.185.18.14
drwxr-xr-x root/root usr/lib/xorg/
-r--r--r-- root/root usr/lib/xorg/libXvMCNVIDIA.a
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.180.60
-rwxr-xr-x root/root usr/lib/xorg/libXvMCNVIDIA.so.185.18.14
drwxr-xr-x root/root usr/lib/xorg/modules/
drwxr-xr-x root/root usr/lib/xorg/modules/drivers/
-rwxr-xr-x root/root usr/lib/xorg/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/lib/xorg/modules/extensions/
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libGLcore.so -> /usr/lib/libGLcore.so
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.180.60
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.180.60
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.180.60
-rwxr-xr-x root/root usr/lib/xorg/modules/extensions/libglx.so.185.18.14
lrwxrwxrwx root/root usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.185.18.14
-rwxr-xr-x root/root usr/lib/xorg/modules/libnvidia-wfb.so.185.18.14
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz

View File

@ -1,2 +1,2 @@
84fb2ac671804f94544237b11a63ba31 NVIDIA-Linux-x86-180.60-pkg0.run
a91d31a9dec5deb2f9e4ca9a09e0019f NVIDIA-Linux-x86-185.18.14-pkg0.run
8921f37eaad3576532f0023d291b9e51 nvidia-makefile.patch

View File

@ -5,7 +5,7 @@
# Depends on: gtk gl-select
name=nvidia
version=180.60
version=185.18.14
release=1
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
$name-makefile.patch)

View File

@ -440,7 +440,6 @@ drwxr-xr-x root/root usr/lib/ocaml/ocamldoc/custom/
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_module.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_name.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_ocamlhtml.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_opt.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_parameter.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_parser.cmi
-rw-r--r-- root/root usr/lib/ocaml/ocamldoc/odoc_print.cmi

View File

@ -1 +1 @@
6ed1c3ed660a15408362242fa8fa4668 ocaml-3.11.0.tar.bz2
fe011781f37f6b41fe08e0706969a89e ocaml-3.11.1.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: ncurses, gdbm
name=ocaml
version=3.11.0
version=3.11.1
release=1
source=(http://caml.inria.fr/pub/distrib/$name-3.11/$name-$version.tar.bz2)