[pkg-nvidia-devel] r1435 - in /packages/nvidia-graphics-drivers/trunk/debian: changelog restore-upstream-directory-structure rules

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

Author: anbe-guest
Date: Fri Aug 27 10:04:44 2010
New Revision: 1435

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=1435
Log:
debian/{rules, restore-upstream-directory-structure}: prepare 256.xx
support by restoring the upstream structure used by legacy-71xx up to
195.xx.

Added:
    packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure
Modified:
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=1435&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Fri Aug 27 10:04:44 2010
@@ -16,6 +16,9 @@
     packages linux-{image,headers}-2.6.32-trunk-*.
   * extract-pci-ids.sh: sync with nvidia_supported script from Ubuntu maverick
     to add 256.xx nv-kernel.o parsing support.
+  * debian/{rules, restore-upstream-directory-structure}: prepare 256.xx
+    support by restoring the upstream structure used by legacy-71xx up to
+    195.xx.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Tue, 24 Aug 2010 19:27:52 +0200
 

Added: packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure?rev=1435&op=file
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure (added)
+++ packages/nvidia-graphics-drivers/trunk/debian/restore-upstream-directory-structure Fri Aug 27 10:04:44 2010
@@ -1,0 +1,26 @@
+#!/usr/bin/make -f
+
+# NVIDIA switched to a flat layout in 256.xx, so create some directories and
+# symlinks to have the files accessible in the old locations for compatibility
+# with the legacy packages
+restore-upstream-directory-structure:
+	mkdir -p etc/OpenCL usr/X11R6 usr/share usr/src
+	ln -s ../.. etc/OpenCL/vendors
+	ln -s .. usr/bin
+	ln -s .. usr/include
+	ln -s . CL
+	ln -s . GL
+	ln -s . cuda
+	ln -s .. usr/lib
+	test ! -d vdpau || rmdir vdpau
+	ln -s . vdpau
+	ln -s ../.. usr/X11R6/lib
+	ln -s . modules
+	ln -s . drivers
+	ln -s . extensions
+	test ! -d 32 || ln -s ../32 usr/lib32
+	test ! -d 32/vdpau || rmdir 32/vdpau
+	test ! -d 32 || ln -s . 32/vdpau
+	ln -s ../.. usr/share/doc
+	ln -s ../../kernel usr/src/nv
+

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=1435&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Fri Aug 27 10:04:44 2010
@@ -47,6 +47,10 @@
 	ln -s ${dirname_x86} NVIDIA-Linux-i386
 	ln -s ${dirname_x86_64} NVIDIA-Linux-amd64
 	ln -s NVIDIA-Linux-$(DEB_HOST_ARCH) NVIDIA-Linux
+	test -d NVIDIA-Linux-i386/usr || \
+		$(MAKE) -C NVIDIA-Linux-i386 -f ../debian/restore-upstream-directory-structure
+	test -d NVIDIA-Linux-amd64/usr || \
+		$(MAKE) -C NVIDIA-Linux-amd64 -f ../debian/restore-upstream-directory-structure
 	test -f NVIDIA-Linux/usr/share/doc/README.txt || \
 		mv NVIDIA-Linux/usr/share/doc/README NVIDIA-Linux/usr/share/doc/README.txt
 	ls -al