[pkg-nvidia-devel] r1176 - in /packages/nvidia-cuda-toolkit/trunk/debian: nvidia-cuda-dev.install nvidia-cuda-dev.postrm nvidia-cuda-dev.preinst

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

Author: anbe-guest
Date: Sat Jun 26 16:53:51 2010
New Revision: 1176

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1176
Log:
ship all headers and divert the conflicting ones from nvidia-libopencl1-dev

Added:
    packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.postrm
    packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.preinst
Modified:
    packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.install

Modified: packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.install
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.install?rev=1176&op=diff
==============================================================================
--- packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.install (original)
+++ packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.install Sat Jun 26 16:53:51 2010
@@ -1,5 +1,4 @@
 usr/include/*.h
-usr/include/CL/cl*ext.h
-usr/include/CL/opencl.h
+usr/include/CL/*.h
 usr/include/crt/*.h
 usr/lib/*.so

Added: packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.postrm
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.postrm?rev=1176&op=file
==============================================================================
--- packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.postrm (added)
+++ packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.postrm Sat Jun 26 16:53:51 2010
@@ -1,0 +1,27 @@
+#!/bin/sh
+set -e
+
+
+#DIVERT_QUIET="--quiet"
+
+case "$1" in
+    remove|abort-install)
+
+	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl.h
+	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl_gl.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl_gl.h
+	dpkg-divert $DIVERT_QUIET --remove --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl_platform.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl_platform.h
+
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0
+

Added: packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.preinst
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.preinst?rev=1176&op=file
==============================================================================
--- packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.preinst (added)
+++ packages/nvidia-cuda-toolkit/trunk/debian/nvidia-cuda-dev.preinst Sat Jun 26 16:53:51 2010
@@ -1,0 +1,27 @@
+#!/bin/sh
+set -e
+
+
+#DIVERT_QUIET="--quiet"
+
+case "$1" in
+    install|upgrade)
+
+	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl.h
+	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl_gl.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl_gl.h
+	dpkg-divert $DIVERT_QUIET --add --rename --package $DPKG_MAINTSCRIPT_PACKAGE --divert \
+		/usr/include/CL/cl_platform.h.nvidia-libopencl1-dev \
+		/usr/include/CL/cl_platform.h
+
+    ;;
+esac
+
+
+#DEBHELPER#
+
+exit 0
+