Please see attached patch which takes into consideration the recent changes made to the Nvidia graphics drivers in Ubuntu Saucy (LP: #1129409).

In debian/control and debian/rules, I've replaced the long list of alternate build/build-depends on nvidia-* packages with 'libcuda1 | nvidia-current | libcuda-5.0-1'. Also, in debian/rules, I have removed the 'is_Ubuntu' check as well as override_dh_makeshlibs.

This built on the PPA builders and I have tested installing it in a Saucy VM. I hope the changes are compatible with your Debian packaging.

diff -Nru nvidia-cuda-toolkit-5.0.35/debian/control nvidia-cuda-toolkit-5.0.35/debian/control
--- nvidia-cuda-toolkit-5.0.35/debian/control	2013-05-05 12:01:48.000000000 +0200
+++ nvidia-cuda-toolkit-5.0.35/debian/control	2013-07-15 12:24:06.000000000 +0200
@@ -7,16 +7,7 @@
  Russ Allbery <[email protected]>,
 Build-Depends:
  debhelper (>= 9),
- libcuda1
- | nvidia-current
- | nvidia-current-updates
- | nvidia-experimental-304
- | nvidia-experimental-310
- | nvidia-304
- | nvidia-304-updates
- | nvidia-310
- | nvidia-310-updates
- | nvidia-313-updates
+ libcuda1 | nvidia-current | libcuda-5.0-1
 Standards-Version: 3.9.4
 Homepage: http://www.nvidia.com/CUDA
 Vcs-Svn: svn://anonscm.debian.org/pkg-nvidia/packages/nvidia-cuda-toolkit/trunk
diff -Nru nvidia-cuda-toolkit-5.0.35/debian/rules nvidia-cuda-toolkit-5.0.35/debian/rules
--- nvidia-cuda-toolkit-5.0.35/debian/rules	2013-05-05 12:01:48.000000000 +0200
+++ nvidia-cuda-toolkit-5.0.35/debian/rules	2013-07-15 12:48:56.000000000 +0200
@@ -5,7 +5,6 @@
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-is_Ubuntu		?= $(shell dpkg-vendor --derives-from Ubuntu && echo Ubuntu)
 
 include debian/rules.defs
 CUDA_VERSION_TOOLKIT	:= $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
@@ -19,32 +18,14 @@
 filename	 = $(filename_$(DEB_HOST_ARCH))
 download_url	 = $(if $(CUDA_BETA),$(CUDA_DOWNLOAD_URL_BETA),$(CUDA_DOWNLOAD_URL))
 
-package_libcuda1		?= $(or \
-	$(if $(is_Ubuntu), \
-		nvidia-current (>= $${nvidia:MinVersion}) \
-		| nvidia-current-updates (>= $${nvidia:MinVersion}) \
-		| nvidia-experimental-304 (>= $${nvidia:MinVersion}) \
-		| nvidia-experimental-310 (>= $${nvidia:MinVersion}) \
-		| nvidia-304 (>= $${nvidia:MinVersion}) \
-		| nvidia-304-updates (>= $${nvidia:MinVersion}) \
-		| nvidia-310 (>= $${nvidia:MinVersion}) \
-		| nvidia-310-updates (>= $${nvidia:MinVersion}) \
-		| nvidia-313-updates (>= $${nvidia:MinVersion}) \
-	), \
-	libcuda1 (>= $${nvidia:MinVersion}))
-package_nvidia-libopencl1	?= $(or \
-	$(if $(is_Ubuntu), \
-		nvidia-current \
-		| nvidia-current-updates \
-		| nvidia-experimental-304 \
-		| nvidia-experimental-310 \
-		| nvidia-304 \
-		| nvidia-304-updates \
-		| nvidia-310 \
-		| nvidia-310-updates \
-		| nvidia-313-updates \
-	), \
-	nvidia-libopencl1)
+package_libcuda1 \
+	= libcuda1 (>= $${nvidia:MinVersion}) \
+	| nvidia-current \
+	| libcuda-5.0-1
+        
+package_nvidia-libopencl1 \
+	= nvidia-libopencl1 \
+	| nvidia-current
 
 # system libdir
 libdir			 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
@@ -128,10 +109,6 @@
 override_dh_compress:
 	dh_compress -X.c -X.h -Xindex.hh
 
-override_dh_makeshlibs:
-	dh_makeshlibs
-	$(if $(is_Ubuntu),echo "libcuda 1 $(subst $${nvidia:MinVersion},$(version_driver),$(package_libcuda1))" > debian/shlibs.local)
-
 override_dh_gencontrol:
 	dh_gencontrol -- \
 		-V'package:libcuda1=$(package_libcuda1)' \

Reply via email to