[pkg-nvidia-devel] r563 - in /packages/nvidia-graphics-drivers/trunk: ./ debian.binary/ debian/

rdonald at users.alioth.debian.org rdonald at users.alioth.debian.org
Sun Jul 5 23:47:29 UTC 2009


Author: rdonald
Date: Sun Jul  5 23:47:29 2009
New Revision: 563

URL: http://svn.debian.org/wsvn/pkg-nvidia/?sc=1&rev=563
Log:
apply beckmann patches

Modified:
    packages/nvidia-graphics-drivers/trunk/conftest.h
    packages/nvidia-graphics-drivers/trunk/debian.binary/override.template
    packages/nvidia-graphics-drivers/trunk/debian.binary/rules
    packages/nvidia-graphics-drivers/trunk/debian/changelog
    packages/nvidia-graphics-drivers/trunk/debian/control.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.NEWS
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.NEWS
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in
    packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs
    packages/nvidia-graphics-drivers/trunk/debian/rules

Modified: packages/nvidia-graphics-drivers/trunk/conftest.h
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/conftest.h?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/conftest.h (original)
+++ packages/nvidia-graphics-drivers/trunk/conftest.h Sun Jul  5 23:47:29 2009
@@ -160,7 +160,7 @@
 /* Only kernels sometime before 2.4.0 don't have this function, and who */
 /* cares anymore */
 #define NV_SMP_CALL_FUNCTION_PRESENT
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29)
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27)
  #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 3
 #else
  #define NV_SMP_CALL_FUNCTION_ARGUMENT_COUNT 4

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/override.template
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/override.template?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/override.template (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/override.template Sun Jul  5 23:47:29 2009
@@ -1,3 +1,2 @@
-nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:32
-nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:41
-nvidia-kernel-#KVERS#: unstripped-binary-or-object ./lib/modules/#KVERS#/kernel/drivers/video/nvidia.o
+nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:36
+nvidia-kernel-#KVERS#: mknod-in-maintainer-script postinst:45

Modified: packages/nvidia-graphics-drivers/trunk/debian.binary/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian.binary/rules?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian.binary/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian.binary/rules Sun Jul  5 23:47:29 2009
@@ -31,6 +31,12 @@
 	dh_testroot
 
 	dh_prep
+
+ifneq (,$(wildcard makefile))
+	@echo "ERROR: unclean build directory from older version found, please clean first:"
+	@echo "    module-assistant clean nvidia"
+	@exit 1
+endif
 
 	# Build the modules
 	$(MAKE) -C . LINUXDIR=$(KSRC) KVERREL=$(KVERS)

Modified: packages/nvidia-graphics-drivers/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/changelog?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/changelog (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/changelog Sun Jul  5 23:47:29 2009
@@ -1,10 +1,43 @@
-nvidia-graphics-drivers (185.18.14-2) UNRELEASED; urgency=low
-
-  * /emul/ia32-linux/usr/lib to /usr/lib32 transition (closes: 534873)
-  * cleanup /emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.1
-  * Thanks to Andreas Beckmann <debian at abeckmann.de> for ias32 work
-  
- -- Randall Donald <rdonald at debian.org>  Wed, 01 Jul 2009 15:04:38 -0700
+nvidia-graphics-drivers (185.18.14-2) unstable; urgency=low
+
+  * do not ship generated files in the source package
+  * nvidia-kernel-source: recommend module-assistant
+  * shlibs cleanup (closes: #533515)
+    - update Build-Depends to include all needed libraries
+    - updates for ia32-libs changes, now separate ia32-lib* packages
+    - let the shlibs system generate all dependencies
+    - debian/nvidia-glx.shlibs: switch to libgl1-mesa-glx | libgl1 (closes:
+      #526463)
+    - debian/nvidia-glx-ia32.shlibs: new file
+  * debian/nvidia-glx-dev.links.in: remove comment (generates unwanted and
+    invalid symlink)
+  * switch to dh_lintian
+  * update lintian overrides for nvidia-glx*
+  * nvidia-libvdpau* cleanup (closes: #519792)
+  * debian/nvidia-libvdpau.shlibs: removed, identical to generated shlibs
+  * rename nvidia-libvdpau* to nvidia-libvdpau1* (closes: #534536)
+  * cleanup leftover files from nvidia-libvdpau-ia32
+  * add overrides and symbol files for nvidia-libvdpau1*
+  * libcuda1, libcuda1-ia32, libcuda-dev: split from their respective
+    nvidia-glx-* packages (closes: #497077)
+  * add overrides and symbol files for libcuda1*
+  * restore support for 2.6.2[78] (closes: #523727)
+  * really put 32 and 64 bit versions of nv-kernel.o in the source package
+    (closes: #533279)
+  * nvidia-kernel-source: abort module compilation with helpful error message
+    if build directory was not cleaned after old package build (closes:
+    #533217, #523947)
+  * debian/nvidia-glx.README.Debian:
+    - update references (closes: #533195)
+    - drop outdated section about header installation (closes: #411894)
+  * debian/nvidia-glx-dev.links.in: removed, contained only a dangling symlink
+  * debian/nvidia-kernel-source.README.Debian.in: fix typo (closes: #434376)
+  * lintian cleanup
+    - nvidia-glx.NEWS, nvidia-kernel-source.NEWS: reindent
+    - debian/watch: add dummy file, website is not parsable
+    - debian/control.in: cosmetics 
+
+ -- Andreas Beckmann <debian at abeckmann.de>  Sat, 04 Jul 2009 11:20:56 +0200
 
 nvidia-graphics-drivers (185.18.14-1) unstable; urgency=low
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/control.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/control.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/control.in Sun Jul  5 23:47:29 2009
@@ -3,16 +3,18 @@
 Priority: optional
 Maintainer: Debian NVIDIA Maintainers <pkg-nvidia-devel at lists.alioth.debian.org>
 Uploaders: Randall Donald <rdonald at debian.org>
-XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers
-Build-Depends: debhelper (>> 4.0.0), sed (>> 3.0), libxext6, bzip2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-nvidia/packages/nvidia-graphics-drivers
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers
+Build-Depends: debhelper (>= 6.0.7~), sed (>> 3.0), libxext6, bzip2,
+ libc6-dev-i386 [amd64], lib32gcc1 [amd64], lib32z1 [amd64],
+ ia32-libs (<< 15) [amd64] | ia32-libxext6 [amd64],
 Standards-Version: 3.6.2
-
+Homepage: http://www.nvidia.com
 
 Package: nvidia-glx-ia32
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: nvidia-kernel-#VERSION#, ia32-libs, ${shlibs:Depends}
+Depends: nvidia-kernel-#VERSION#, ${shlibs:Depends}, ${misc:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
 Conflicts: nvidia-glx-src
 Replaces: nvidia-glx-src
@@ -30,7 +32,7 @@
 
 Package: nvidia-glx
 Architecture: i386 amd64
-Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: nvidia-kernel-#VERSION#, x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}
 Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
 Conflicts: nvidia-glx-src, nvidia-glx-dev (<< 1.0.8774-5)
 Replaces: nvidia-glx-src
@@ -48,10 +50,10 @@
  See /usr/share/doc/nvidia-glx/README.txt.gz for a complete list 
  of supported GPUs and PCIIDs
  .
- 
+
 Package: nvidia-glx-dev
 Architecture: i386 amd64
-Depends: nvidia-glx (>= #VERSION#)
+Depends: nvidia-glx (>= #VERSION#), ${misc:Depends}
 Provides: libgl-dev
 Conflicts: nvidia-glx (>= #NEXTVER#), libgl-dev, mesa-common-dev
 Replaces: libgl-dev
@@ -62,42 +64,53 @@
  For more information on this source package visit NVIDIA's homepage
  at http://www.nvidia.com/ .
 
-Package: nvidia-libvdpau-ia32
+Package: nvidia-libvdpau1-ia32
+Section: non-free/libs
 Architecture: amd64
 Pre-Depends: libc6-i386 (>= 2.9-18)
-Depends: ia32-libs, ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
-Replaces: nvidia-glx-ia32 (< 180.51)
-Conflicts: nvidia-glx-ia32 (< 180.51)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32
+Conflicts: nvidia-glx-ia32 (< 180.51), nvidia-libvdpau-ia32
 Description: NVIDIA vdpau 32bit libraries
  These libraries provide the Video Decode and Presentation API for Unix
  (32 bit). They provide accelerated video playback (incl. H.264) for the 
  supported graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz 
  for more information.
 
-Package: nvidia-libvdpau
+Package: nvidia-libvdpau1
+Section: non-free/libs
 Architecture: i386 amd64
-Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}
-Replaces: nvidia-glx (< 180.51)
-Conflicts: nvidia-glx (< 180.51)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (< 180.51), nvidia-libvdpau
+Conflicts: nvidia-glx (< 180.51), nvidia-libvdpau
 Description: NVIDIA vdpau libraries
  These libraries provide the Video Decode and Presentation API for Unix.
  They provide accelerated video playback (incl. H.264) for the supported 
  graphics cards. See /usr/share/doc/nvidia-libvdpau/README.txt.gz for 
  more information.
- 
+
 Package: nvidia-libvdpau-dev
+Section: non-free/libdevel
 Architecture: i386 amd64
-Depends: nvidia-libvdpau (>= #VERSION#)
+Depends: nvidia-libvdpau1 (>= #VERSION#), ${misc:Depends}
 Replaces: nvidia-glx-dev (< 180.51)
-Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau (>= #NEXTVER#)
+Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau1 (>= #NEXTVER#)
+Provides: nvidia-libvdpau1-dev
 Description: NVIDIA vdpau development files
- This package contains the NVIDIA vdpau development files.
+ The NVIDIA Video Decode and Presentation API for Unix (VDPAU) provides a
+ complete solution for decoding, post-processing, compositing, and displaying
+ compressed or uncompressed video streams.
+ .
+ This package contains the VDPAU development files.
 
 Package: nvidia-kernel-source
 Architecture: i386 amd64
-Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0)
-Recommends: nvidia-glx (>= #VERSION#), kernel-package (>= 8.082), devscripts
+Depends: debhelper (>> 4.0.0), make, sed (>> 3.0), dpatch (>= 2.0.0), ${misc:Depends}
+Recommends: nvidia-glx (>= #VERSION#), kernel-package (>= 8.082), module-assistant, devscripts
 Conflicts: nvidia-kernel-src
 Replaces: nvidia-kernel-src
 Description: NVIDIA binary kernel module source
@@ -109,3 +122,64 @@
  PLEASE read /usr/share/doc/nvidia-kernel-source/README.Debian for building
  information.
  .
+
+Package: libcuda1
+Section: non-free/libs
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx (<< 185.18.14-2), nvidia-glx-dev (<< 185.18.14-2)
+Description: NVIDIA CUDA runtime library
+ The Compute Unified Device Architecture (CUDA) enables NVIDIA
+ graphics processing units (GPUs) to be used for massively parallel
+ general purpose computation.
+ .
+ This package contains the driver specific runtime library.
+ .
+ Supported NVIDIA devices include GPUs starting from GeForce 8 and Quadro FX
+ series, as well as the Tesla computing processors.
+ .
+ Please see the nvidia-kernel-source package for building the kernel module
+ required by this package. This will provide nvidia-kernel-<version>
+ .
+
+Package: libcuda1-ia32
+Section: non-free/libs
+Architecture: amd64
+Pre-Depends: libc6-i386 (>= 2.9-18)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
+Replaces: nvidia-glx-ia32 (<< 185.18.14-2)
+Description: NVIDIA CUDA runtime library (32-bit)
+ The Compute Unified Device Architecture (CUDA) enables NVIDIA
+ graphics processing units (GPUs) to be used for massively parallel
+ general purpose computation.
+ .
+ This package contains the driver specific runtime library (32-bit).
+ .
+ Supported NVIDIA devices include GPUs starting from GeForce 8 and Quadro FX
+ series, as well as the Tesla computing processors.
+ .
+ Please see the nvidia-kernel-source package for building the kernel module
+ required by this package. This will provide nvidia-kernel-<version>
+ .
+
+Package: libcuda1-dev
+Section: non-free/libdevel
+Architecture: i386 amd64
+Depends: libcuda1 (>= #VERSION#), ${misc:Depends}
+Provides: libcuda-dev
+Replaces: nvidia-glx-dev (<< 185.18.14-2)
+Description: NVIDIA CUDA development files
+ The Compute Unified Device Architecture (CUDA) enables NVIDIA
+ graphics processing units (GPUs) to be used for massively parallel
+ general purpose computation.
+ .
+ This package contains the driver specific NVIDIA CUDA
+ development files.
+ .
+ For more information on this source package visit NVIDIA's CUDA Zone
+ at http://www.nvidia.com/object/cuda_home.html .
+

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.dirs Sun Jul  5 23:47:29 2009
@@ -1,3 +1,2 @@
 usr/include/GL
-usr/include/cuda
 usr/lib/nvidia

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-dev.links.in Sun Jul  5 23:47:29 2009
@@ -1,2 +1,0 @@
-#usr/lib/libGL.so.#VERSION# usr/lib/libGL.so
-usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.links.in Sun Jul  5 23:47:29 2009
@@ -1,6 +1,5 @@
 usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so.1
-usr/lib32/libGL.so.#VERSION# usr/lib32/libGL.so
-usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.so
+usr/lib32/libGL.so.1 usr/lib32/libGL.so
+usr/lib32/libGLcore.so.#VERSION# usr/lib32/libGLcore.so.1
 usr/lib32/libnvidia-tls.so.#VERSION# usr/lib32/libnvidia-tls.so.1
 usr/lib32/tls/libnvidia-tls.so.#VERSION# usr/lib32/tls/libnvidia-tls.so.1
-usr/lib32/libcuda.so.#VERSION#  usr/lib32/libcuda.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx-ia32.override.in Sun Jul  5 23:47:29 2009
@@ -1,9 +1,0 @@
-nvidia-glx-ia32: library-not-linked-against-libc ./emul/ia32-linux/usr/lib/libGL.so.#VERSION#
-
-nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libGLcore.so.#VERSION#
-
-
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.#VERSION#
-nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGLcore.so.#VERSION#
-
-nvidia-glx-ia32: non-dev-pkg-with-shlib-symlink emul/ia32-linux/usr/lib/libGL.so.#VERSION# emul/ia32-linux/usr/lib/libGL.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.NEWS
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.NEWS?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.NEWS (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.NEWS Sun Jul  5 23:47:29 2009
@@ -1,27 +1,27 @@
 nvidia-graphics-drivers (1.0.8174-1) unstable; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
- Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
- DO NOT INSTALL THIS RELEASE!!! They are no longer supported. 
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
+  DO NOT INSTALL THIS RELEASE!!! They are no longer supported. 
       
  -- Randall Donald <rdonald at debian.org>  Sat, 10 Dec 2005 00:01:32 -0800
 
 nvidia-graphics-drivers (1.0.7667-2) unstable; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
- Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
- DO NOT INSTALL THIS RELEASE!!!  Use the nvidia-glx-legacy,
- nvidia-glx-legacy-dev, nvidia-kernel-source-legacy packages instead.  
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
+  DO NOT INSTALL THIS RELEASE!!!  Use the nvidia-glx-legacy,
+  nvidia-glx-legacy-dev, nvidia-kernel-source-legacy packages instead.  
       
  -- Randall Donald <rdonald at debian.org>  Wed, 13 Jun 2005 00:01:32 -0700
 
 nvidia-graphics-drivers (1.0.7664-1) experimental; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
- Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
- DO NOT INSTALL THIS RELEASE!!!  NVIDIA will be supporting these cards in a
- special legacy driver (as yet unreleased and not included in this package). 
- So if you have the one of the above listed GPUs, 
- remain with the 1.0.7174-3 release.
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
+  DO NOT INSTALL THIS RELEASE!!!  NVIDIA will be supporting these cards in a
+  special legacy driver (as yet unreleased and not included in this package). 
+  So if you have the one of the above listed GPUs, 
+  remain with the 1.0.7174-3 release.
       
  -- Randall Donald <rdonald at debian.org>  Tue, 21 Jun 2005 00:01:32 -0700

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.README.Debian Sun Jul  5 23:47:29 2009
@@ -56,19 +56,10 @@
 	In Section "Device"
 	   Change Driver "nv" to Driver "nvidia"
 	
-	See /usr/share/doc/nvidia-glx/README.gz and
+	See /usr/share/doc/nvidia-glx/README.txt.gz and
 	/usr/share/doc/nvidia-glx/examples/XF86Config.sample.gz
 	for descriptions of all supported options. 
-	Appendix F:  CONFIGURING AGP is an important section.
-	
-
-Note about OpenGL headers: The header files are not installed to 
-/usr/include/GL but to /usr/share/doc/nvidia-glx-dev/include/GL. 
-This allows use of and not overwriting of the  
-preinstalled headers (e.g. xlibmesa-dev). If you wish to use the NVIDIA
-supplied headers (e.g. you require NVIDIA GL extensions) you must copy them to
-/usr/include/GL yourself or include /usr/share/doc/nvidia-glx-dev/include in
-your includes path when compiling.
+	Chapter 12: Configuring AGP is an important section.
 
 
 Also note all users using GLX must be in group video. (i.e. adduser <user>

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.links.in Sun Jul  5 23:47:29 2009
@@ -4,5 +4,3 @@
 usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so
 usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA.so.1
 usr/lib/libXvMCNVIDIA.so.#VERSION# usr/lib/libXvMCNVIDIA_dynamic.so.1
-usr/lib/libcuda.so.#VERSION#			usr/lib/libcuda.so
-usr/lib/libcuda.so.#VERSION#			usr/lib/libcuda.so.1

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.override.in Sun Jul  5 23:47:29 2009
@@ -1,14 +1,0 @@
-nvidia-glx: library-not-linked-against-libc ./usr/lib/libGL.so.#VERSION#
-
-nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libGLcore.so.#VERSION#
-
-nvidia-glx: library-not-linked-against-libc ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
-
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGL.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/lib/libGLcore.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.#VERSION#
-nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/libXvMCNVIDIA.so.#VERSION#
-
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/libGL.so.#VERSION# usr/lib/libGL.so
-nvidia-glx: non-dev-pkg-with-shlib-symlink usr/lib/xorg/modules/extensions/libglx.so.#VERSION# usr/lib/xorg/modules/extensions/libglx.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-glx.shlibs Sun Jul  5 23:47:29 2009
@@ -1,4 +1,4 @@
-libGL     1 xlibmesa-gl | libgl1
-libGLcore 1 xlibmesa-gl | libgl1
+libGL     1 libgl1-mesa-glx | libgl1
+libGLcore 1 nvidia-glx
 libXvMCNVIDIA_dynamic 1 nvidia-glx
 libnvidia-tls 1 nvidia-glx

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.NEWS
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.NEWS?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.NEWS (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.NEWS Sun Jul  5 23:47:29 2009
@@ -1,6 +1,6 @@
 nvidia-graphics-drivers (1.0.8174-1) unstable; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
   Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2
   Pro,  DO NOT INSTALL THIS RELEASE!!! They are no longer supported.
   
@@ -8,7 +8,7 @@
 
 nvidia-graphics-drivers (1.0.7667-2) unstable; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
   Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2
   Pro,  DO NOT INSTALL THIS RELEASE!!!  Use the nvidia-glx-legacy,
   nvidia-glx-legacy-dev, nvidia-kernel-source-legacy packages instead.
@@ -17,12 +17,12 @@
    
 nvidia-graphics-drivers (1.0.7664-1) experimental; urgency=low
 
- * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
- Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
- DO NOT INSTALL THIS RELEASE!!!  NVIDIA will be supporting these cards in a
- special legacy driver (as yet unreleased and not included in this package). 
- So if you have the one of the above listed GPUs, 
- remain with the 1.0.7174-3 release.
+  * LEGACY GPUs: If you have a TNT, TNT2, Vanta, GeForce 256, GeForce DDR,
+  Quadro, GeForce2 Pro, GeForce2 GTS, GeForce2 Ultra, GeForce2 Ti, Quadro2 Pro,
+  DO NOT INSTALL THIS RELEASE!!!  NVIDIA will be supporting these cards in a
+  special legacy driver (as yet unreleased and not included in this package). 
+  So if you have the one of the above listed GPUs, 
+  remain with the 1.0.7174-3 release.
       
  -- Randall Donald <rdonald at debian.org>  Tue, 21 Jun 2005 00:01:32 -0700
 

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-kernel-source.README.Debian.in Sun Jul  5 23:47:29 2009
@@ -15,7 +15,7 @@
 There are TWO ways to build the nvidia-kernel package. Which one depends on
 your situation with your kernel.
 
- METHOD #1: You are running a Debian suppiled kernel or built a 
+ METHOD #1: You are running a Debian supplied kernel or built a 
     linux-headers package along with your own self-built kernel. 
 
  METHOD #2: You are running your own self-built kernel built from kernel

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.dirs Sun Jul  5 23:47:29 2009
@@ -1,1 +1,0 @@
-usr/lib32

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau-ia32.links.in Sun Jul  5 23:47:29 2009
@@ -1,1 +1,0 @@
-usr/lib32/libvdpau.so.#VERSION#		usr/lib32/libvdpau.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.dirs Sun Jul  5 23:47:29 2009
@@ -1,1 +1,0 @@
-usr/lib

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.docs.in Sun Jul  5 23:47:29 2009
@@ -1,2 +1,0 @@
-#DIRNAME#/usr/share/doc/NVIDIA_Changelog
-#DIRNAME#/usr/share/doc/README.txt

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.links.in Sun Jul  5 23:47:29 2009
@@ -1,2 +1,0 @@
-usr/lib/libvdpau.so.#VERSION#   usr/lib/libvdpau.so.1
-usr/lib/libvdpau.so.#VERSION#   usr/lib/libvdpau.so

Modified: packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/nvidia-libvdpau.shlibs Sun Jul  5 23:47:29 2009
@@ -1,1 +1,0 @@
-libvdpau 1 nvidia-libvdpau

Modified: packages/nvidia-graphics-drivers/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-nvidia/packages/nvidia-graphics-drivers/trunk/debian/rules?rev=563&op=diff
==============================================================================
--- packages/nvidia-graphics-drivers/trunk/debian/rules (original)
+++ packages/nvidia-graphics-drivers/trunk/debian/rules Sun Jul  5 23:47:29 2009
@@ -27,15 +27,24 @@
 dirname_x86:=$(shell sh debian/upstream_info DIRNAME_X86)
 dirname_x86_64:=$(shell sh debian/upstream_info DIRNAME_X86_64)
 
-AUTOGEN=debian/nvidia-kernel-source.README.Debian debian/control \
-debian/copyright debian/nvidia-glx.links debian/nvidia-glx-dev.links \
-debian/nvidia-libvdpau.links debian/nvidia-libvdpau-ia32.links \
-debian/nvidia-glx.override debian/nvidia-glx.docs debian/nvidia-glx.examples \
-debian/nvidia-libvdpau.docs \
+AUTOGEN=debian/nvidia-kernel-source.README.Debian \
+debian/copyright debian/nvidia-glx.links \
+debian/nvidia-libvdpau1.links debian/nvidia-libvdpau1-ia32.links \
+debian/nvidia-glx.lintian-overrides.amd64 debian/nvidia-glx.lintian-overrides.i386 \
+debian/nvidia-glx.docs debian/nvidia-glx.examples \
+debian/nvidia-libvdpau1.docs \
 debian/nvidia-glx.postrm debian/nvidia-glx.init \
-debian/nvidia-glx-ia32.override debian/nvidia-glx-ia32.links \
-debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst
-
+debian/nvidia-glx-ia32.lintian-overrides debian/nvidia-glx-ia32.links \
+debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst \
+debian/libcuda1.install debian/libcuda1-ia32.install debian/libcuda1-dev.install \
+debian/libcuda1.links debian/libcuda1-ia32.links \
+debian/libcuda1.lintian-overrides.amd64 debian/libcuda1.lintian-overrides.i386 \
+debian/libcuda1-ia32.lintian-overrides \
+debian/libcuda1-ia32.symbols \
+debian/nvidia-libvdpau1.lintian-overrides.amd64 debian/nvidia-libvdpau1.lintian-overrides.i386 \
+debian/nvidia-libvdpau1-ia32.lintian-overrides \
+debian/nvidia-libvdpau1-ia32.symbols \
+debian.binary/changelog
 
 
 
@@ -51,12 +60,12 @@
 	INSTALL_PROGRAM += -s
 endif
 
-version-change: version-clean $(AUTOGEN) clean
+version-change: version-clean debian/control $(AUTOGEN) clean
 
 configure: configure-stamp
 
 .PHONY: configure-stamp
-configure-stamp: version-clean $(AUTOGEN)
+configure-stamp: version-clean debian/control $(AUTOGEN)
 	dh_testdir
 	# extract both so we can fetch the kernel object code for both arches
 	./${filename_x86} --extract-only
@@ -71,10 +80,8 @@
 #		done; \
 	fi
 
-	sed 's/^nvidia-graphics-drivers/nvidia-kernel/g'  debian/changelog > debian.binary/changelog
-
-
 	touch configure-stamp
+
 
 .PHONY: build
 build: configure-stamp build-stamp
@@ -87,7 +94,7 @@
 build-kernel:
 
 .PHONY: build-kernel-stamp 
-build-kernel-stamp:
+build-kernel-stamp: debian.binary/changelog
 	    dh_testroot
 	    dh_testdir
 
@@ -114,8 +121,9 @@
 		rm $(CURDIR)/debian/temp/modules/nvidia-kernel/makefile
 
 		# We want both 32 and 64 bit versions of nv-kernel.o
-	    cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
-		mv $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
+	cp $(CURDIR)/$(dirname_x86)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.i386
+	cp $(CURDIR)/$(dirname_x86_64)/usr/src/nv/nv-kernel.o $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o.x86_64
+	rm -f $(CURDIR)/debian/temp/modules/nvidia-kernel/nv-kernel.o
 
 		# and then make Makefile.kbuild actually use our names
 		sed -i -e 's/nv-kernel.o$$/nv-kernel.o$$(NVARCH)/' $(CURDIR)/debian/temp/modules/nvidia-kernel/Makefile.kbuild
@@ -133,7 +141,7 @@
 	    touch build-kernel-stamp
 
 .PHONY: clean					
-clean:
+clean: version-clean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp build-kernel-stamp configure-stamp
@@ -141,6 +149,8 @@
 
 	rm -fr $(dirname_x86) $(dirname_x86_64)  nvidia-kernel.tar.bz2
 	rm -fr debian/temp
+
+	$(MAKE) -f debian/rules debian/control
 
 
 .PHONY: install
@@ -169,11 +179,6 @@
 	install -m 0644 $(dirname)/usr/include/GL/glext.h \
 		$(CURDIR)/debian/nvidia-glx-dev/usr/include/GL
 
-	install -m 0644 $(dirname)/usr/include/cuda/cuda.h \
-		$(CURDIR)/debian/nvidia-glx-dev/usr/include/cuda
-	install -m 0644 $(dirname)/usr/include/cuda/cudaGL.h \
-		$(CURDIR)/debian/nvidia-glx-dev/usr/include/cuda
-
 	install -m 0644 $(dirname)/usr/include/vdpau/vdpau.h \
 		$(CURDIR)/debian/nvidia-libvdpau-dev/usr/include/vdpau
 	install -m 0644 $(dirname)/usr/include/vdpau/vdpau_x11.h \
@@ -188,14 +193,12 @@
 			$(CURDIR)/debian/nvidia-glx/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libGLcore.so.${version} \
 		$(CURDIR)/debian/nvidia-glx/usr/lib
-	install -m 0644 $(dirname)/usr/lib/libcuda.so.${version} \
-			$(CURDIR)/debian/nvidia-glx/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau/usr/lib
+			$(CURDIR)/debian/nvidia-libvdpau1/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau/usr/lib
+			$(CURDIR)/debian/nvidia-libvdpau1/usr/lib
 	install -m 0644 $(dirname)/usr/lib/libvdpau_trace.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau/usr/lib
+			$(CURDIR)/debian/nvidia-libvdpau1/usr/lib
 			
 
 
@@ -221,24 +224,18 @@
 
 	install $(dirname)/usr/bin/tls_test $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
 	install $(dirname)/usr/bin/tls_test_dso.so $(CURDIR)/debian/nvidia-glx/usr/lib/nvidia
-
-	install -d $(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides
-	install -m 0644 debian/nvidia-glx.override \
-		$(CURDIR)/debian/nvidia-glx/usr/share/lintian/overrides/nvidia-glx
 
 	if [ "$(DEB_BUILD_ARCH)" = "amd64" ] ; then \
 		install $(dirname)/usr/lib32/libGLcore.so.${version} \
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libGL.so.${version} \
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
-		install $(dirname)/usr/lib32/libcuda.so.${version} \
-			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
+			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_nvidia.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
+			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libvdpau_trace.so.${version} \
-			$(CURDIR)/debian/nvidia-libvdpau-ia32/usr/lib32 ; \
+			$(CURDIR)/debian/nvidia-libvdpau1-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/libnvidia-tls.so.${version} \
 			$(CURDIR)/debian/nvidia-glx-ia32/usr/lib32 ; \
 		install $(dirname)/usr/lib32/tls/libnvidia-tls.so.${version} \
@@ -256,7 +253,8 @@
 
 	install $(CURDIR)/script $(CURDIR)/debian/nvidia-glx/usr/share/bug/nvidia-glx
 
-	dh_install 
+	dh_install -s
+	dh_lintian
 
 
 # Must not depend on anything. This is to be called by
@@ -285,16 +283,15 @@
 	dh_fixperms
 #	dh_perl
 #	dh_python
-	dh_makeshlibs
+	dh_makeshlibs -s
 	dh_installdeb
-	dh_shlibdeps  -Xia32 -Xtls -l$(CURDIR)/debian/nvidia-glx/usr/lib:$(CURDIR)/debian/nvidia-libvdpau/usr/lib
-	# quickhack! remove me :-/
-	perl -pi.bak -e 's/,\s+nvidia-glx-ia32//;' $(CURDIR)/debian/nvidia-glx.substvars
+	dh_shlibdeps
 	dh_gencontrol -s
 	dh_md5sums
 	dh_builddeb -s
 
 
+# Generating control files
 %:	%.in debian/upstream_info
 	perl -p \
 	-e 's{#BASE_VERSION#}{$(base_version)}g;' \
@@ -307,6 +304,21 @@
 	-e 's{#URL#}{$(url)}g' \
 	< $< > $@
 
+debian.binary/changelog: debian/changelog
+	sed 's/^nvidia-graphics-drivers/nvidia-kernel/g' $< > $@
+
+debian/nvidia-libvdpau1-ia32.symbols: debian/nvidia-libvdpau1.symbols.i386
+	sed 's/nvidia-libvdpau1/nvidia-libvdpau1-ia32/g' $< > $@
+
+debian/nvidia-libvdpau1-ia32.lintian-overrides: debian/nvidia-libvdpau1.lintian-overrides.i386
+	sed 's/^nvidia-libvdpau1:/nvidia-libvdpau1-ia32:/; s%usr/lib/%usr/lib32/%g' $< > $@
+
+debian/libcuda1-ia32.symbols: debian/libcuda1.symbols
+	sed 's/libcuda1/libcuda1-ia32/g' $< > $@
+
+debian/libcuda1-ia32.lintian-overrides: debian/libcuda1.lintian-overrides.i386
+	sed 's/^libcuda1:/libcuda1-ia32:/; s%usr/lib/%usr/lib32/%g' $< > $@
+
 
 # Build architecture dependant packages using the common target.
 .PHONY: binary-arch
@@ -318,5 +330,7 @@
 
 .PHONY: version-clean
 version-clean: 
-	       rm -f ${AUTOGEN} || true
-	       
+	rm -f ${AUTOGEN} || true
+
+.PHONY: autogen
+autogen: debian/control ${AUTOGEN}




More information about the Pkg-nvidia-devel mailing list