Package: nvidia-graphics-drivers
Version: 185.18.14-1
Severity: normal
Tags: patch
Hi,
here comes a patch that does some cleanup on the
nvidia-graphics-drivers shlibs handling and some related changes.
There are some changes I already mentioned in other bug reports, but the
overlap should be fairly small.
Short summary:
* use dh_lintian, updated overrides
* no more hardcoded library dependencies, everything is generated
* more consistency between all packages
Detailed list of changes:
* debian/control.in[source]
Build-Depends: debhelper (>= 6.0.7~)
bumped, for dh_lintian
Build-Depends: libc6-dev-i386 [amd64], ia32-libs [amd64]
added, these were missing
* debian/control.in[some packages]
- add Section: non-free/libs, Section: non-free/libdevel
- drop hardcoded library dependencies
- add ${misc:Depends}
* debian/control.in[nvidia-glx]
Provides: libgl1
added, since we provide an alternative version of this library
theoretically libgl1-mesa-glx should be uninstallable if nvidia-glx
is installed
Provides: xserver-xorg-video-2
added, this was removed in 177.80-2 and never restored
* debian/control.in[nvidia-libvdpau{,-ia32}]
Depends: x11-common
removed, not needed
Suggests: nvidia-settings
removed, not needed
Recommends: nvidia-kernel-#VERSION#
added (and only recommend it, so the package is installable in
chroots that don't have a kernel installed)
Suggests: nvidia-kernel-source (>= #VERSION#)
added (for consistency)
* debian/control.in[nvidia-kernel-source]
Recommends: kernel-package (>= 8.082)
replaced with ...
Recommends: module-assistant
... this (see #533217)
* debian/nvidia-glx-dev.links.in
- removed comment which resulted in invalid symlink being packged
* debian/nvidia-glx-ia32.links.in
- add a libGLcore.so.1 symlink, drop *.so symlinks
* debian/nvidia-glx.shlibs
- xlibmesa-gl is now libgl1-mesa-glx
- nothing but our libGL.so.x.y depends on libGLcore,
so no libgl1-mesa-glx | libgl1 is needed there
* debian/nvidia-glx-ia32.shlibs
- added (based on debian/nvidia-glx.shlibs), there was none before
- eventually this would be a theoretically better entry for libGL:
libGL 1 ia32-libs | libgl1-ia32
* debian/nvidia-glx-ia32.lintian-overrides.in,
debian/nvidia-glx.lintian-overrides.amd64.in,
debian/nvidia-glx.lintian-overrides.i386.in,
debian/nvidia-glx.override.in, debian/nvidia-glx-ia32.override.in
- renamed for dh_lintian usage, split because different overrides are
needed for i386 and amd64, updated
* debian/nvidia-libvdpau-dev.links,
debian/nvidia-libvdpau-ia32.links.in, debian/nvidia-libvdpau.links.in
- see #519792
- eventually some more Replaces entries are still needed for
nvidia-libvdpau-dev
* debian/rules
- use dh_lintian
- some files were renamed
- drop dh_shlibdeps hacks, options, workarounds -- this now works
out-of-the-box :-)
Andreas
-- System Information:
Debian Release: squeeze/sid
APT prefers testing
APT policy: (800, 'testing'), (800, 'stable'), (600, 'unstable'), (130,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.28-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
diff -Naur orig/debian/control.in mine/debian/control.in
--- orig/debian/control.in 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/control.in 2009-06-18 11:10:59.540580642 +0200
@@ -5,13 +5,12 @@
Uploaders: Randall Donald <[email protected]>
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
+Build-Depends: debhelper (>= 6.0.7~), sed (>> 3.0), libxext6, bzip2, libc6-dev-i386 [amd64], ia32-libs [amd64]
Standards-Version: 3.6.2
-
Package: nvidia-glx-ia32
Architecture: amd64
-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
@@ -29,9 +28,10 @@
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)
+Provides: libgl1, xserver-xorg-video-2
Replaces: nvidia-glx-src
Description: NVIDIA binary Xorg driver
These binary drivers provide optimized hardware
@@ -47,10 +47,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,9 +62,11 @@
at http://www.nvidia.com/ .
Package: nvidia-libvdpau-ia32
+Section: non-free/libs
Architecture: amd64
-Depends: ia32-libs, ${shlibs:Depends}
-Suggests: nvidia-settings, nvidia-kernel-source (>= #VERSION#)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
Replaces: nvidia-glx-ia32 (< 180.51)
Conflicts: nvidia-glx-ia32 (< 180.51)
Description: NVIDIA vdpau 32bit libraries
@@ -74,8 +76,11 @@
for more information.
Package: nvidia-libvdpau
+Section: non-free/libs
Architecture: i386 amd64
-Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: nvidia-kernel-#VERSION#
+Suggests: nvidia-kernel-source (>= #VERSION#)
Replaces: nvidia-glx (< 180.51)
Conflicts: nvidia-glx (< 180.51)
Description: NVIDIA vdpau libraries
@@ -83,10 +88,11 @@
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-libvdpau (>= #VERSION#), ${misc:Depends}
Replaces: nvidia-glx-dev (< 180.51)
Conflicts: nvidia-glx-dev (< 180.51), nvidia-libvdpau (>= #NEXTVER#)
Description: NVIDIA vdpau development files
@@ -94,8 +100,8 @@
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#), module-assistant, devscripts
Conflicts: nvidia-kernel-src
Replaces: nvidia-kernel-src
Description: NVIDIA binary kernel module source
@@ -107,3 +113,4 @@
PLEASE read /usr/share/doc/nvidia-kernel-source/README.Debian for building
information.
.
+
diff -Naur orig/debian/nvidia-glx-dev.links.in mine/debian/nvidia-glx-dev.links.in
--- orig/debian/nvidia-glx-dev.links.in 2006-10-13 19:53:12.363092000 +0200
+++ mine/debian/nvidia-glx-dev.links.in 2009-06-18 11:10:59.540580642 +0200
@@ -1,2 +1 @@
-#usr/lib/libGL.so.#VERSION# usr/lib/libGL.so
usr/share/nvidia/include /usr/share/doc/nvidia-glx-dev/include
diff -Naur orig/debian/nvidia-glx-ia32.links.in mine/debian/nvidia-glx-ia32.links.in
--- orig/debian/nvidia-glx-ia32.links.in 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/nvidia-glx-ia32.links.in 2009-06-18 11:10:59.540580642 +0200
@@ -1,5 +1,4 @@
emul/ia32-linux/usr/lib/libGL.so.#VERSION# emul/ia32-linux/usr/lib/libGL.so.1
-emul/ia32-linux/usr/lib/libGL.so.#VERSION# emul/ia32-linux/usr/lib/libGL.so
-emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# emul/ia32-linux/usr/lib/libGLcore.so
+emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# emul/ia32-linux/usr/lib/libGLcore.so.1
emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION# emul/ia32-linux/usr/lib/libnvidia-tls.so.1
emul/ia32-linux/usr/lib/libcuda.so.#VERSION# emul/ia32-linux/usr/lib/libcuda.so
diff -Naur orig/debian/nvidia-glx-ia32.lintian-overrides.in mine/debian/nvidia-glx-ia32.lintian-overrides.in
--- orig/debian/nvidia-glx-ia32.lintian-overrides.in 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/nvidia-glx-ia32.lintian-overrides.in 2009-06-18 11:10:59.540580642 +0200
@@ -0,0 +1,19 @@
+nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx-ia32: shared-lib-without-dependency-information ./emul/ia32-linux/usr/lib/tls/libnvidia-tls.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: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx-ia32: shlib-with-non-pic-code emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.#VERSION#
+
+nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section emul/ia32-linux/usr/lib/libGL.so.#VERSION#
+nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section emul/ia32-linux/usr/lib/libGLcore.so.#VERSION#
+nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.#VERSION#
+
+nvidia-glx-ia32: binary-has-unneeded-section ./emul/ia32-linux/usr/lib/libGL.so.#VERSION# .comment
+nvidia-glx-ia32: binary-has-unneeded-section ./emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# .note
+nvidia-glx-ia32: binary-has-unneeded-section ./emul/ia32-linux/usr/lib/libGLcore.so.#VERSION# .comment
+nvidia-glx-ia32: binary-has-unneeded-section ./emul/ia32-linux/usr/lib/libnvidia-tls.so.#VERSION# .comment
+nvidia-glx-ia32: binary-has-unneeded-section ./emul/ia32-linux/usr/lib/tls/libnvidia-tls.so.#VERSION# .comment
+
diff -Naur orig/debian/nvidia-glx-ia32.override.in mine/debian/nvidia-glx-ia32.override.in
--- orig/debian/nvidia-glx-ia32.override.in 2006-06-06 01:38:09.860573000 +0200
+++ mine/debian/nvidia-glx-ia32.override.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,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
diff -Naur orig/debian/nvidia-glx-ia32.shlibs mine/debian/nvidia-glx-ia32.shlibs
--- orig/debian/nvidia-glx-ia32.shlibs 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/nvidia-glx-ia32.shlibs 2009-06-18 11:10:59.540580642 +0200
@@ -0,0 +1,4 @@
+#libGL 1 libgl1-mesa-glx | libgl1
+libGL 1 nvidia-glx-ia32
+libGLcore 1 nvidia-glx-ia32
+libnvidia-tls 1 nvidia-glx-ia32
diff -Naur orig/debian/nvidia-glx.lintian-overrides.amd64.in mine/debian/nvidia-glx.lintian-overrides.amd64.in
--- orig/debian/nvidia-glx.lintian-overrides.amd64.in 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/nvidia-glx.lintian-overrides.amd64.in 2009-06-18 11:10:59.540580642 +0200
@@ -0,0 +1,22 @@
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.so.#VERSION#
+
+nvidia-glx: shlib-with-executable-stack usr/lib/libGL.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/libGLcore.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/libXvMCNVIDIA.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/nvidia/libnvidia-cfg.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/tls/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-with-executable-stack usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
+
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libGL.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libGLcore.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libXvMCNVIDIA.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libnvidia-tls.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/libnvidia-cfg.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test_dso.so .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/tls/libnvidia-tls.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/drivers/nvidia_drv.so .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION# .comment
+
diff -Naur orig/debian/nvidia-glx.lintian-overrides.i386.in mine/debian/nvidia-glx.lintian-overrides.i386.in
--- orig/debian/nvidia-glx.lintian-overrides.i386.in 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/nvidia-glx.lintian-overrides.i386.in 2009-06-18 11:10:59.540580642 +0200
@@ -0,0 +1,35 @@
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx: shared-lib-without-dependency-information ./usr/lib/tls/libnvidia-tls.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/libXvMCNVIDIA.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/nvidia/libnvidia-cfg.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/tls/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-with-non-pic-code usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
+
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/libGL.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/libGLcore.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/libXvMCNVIDIA.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/nvidia/libnvidia-cfg.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/tls/libnvidia-tls.so.#VERSION#
+nvidia-glx: shlib-without-PT_GNU_STACK-section usr/lib/xorg/modules/extensions/libglx.so.#VERSION#
+
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libGL.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libGLcore.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libXvMCNVIDIA.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libnvidia-tls.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/libnvidia-cfg.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/tls_test_dso.so .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/tls/libnvidia-tls.so.#VERSION# .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/drivers/nvidia_drv.so .comment
+nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/extensions/libglx.so.#VERSION# .comment
+
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libGLcore.so.#VERSION# .note
+nvidia-glx: binary-has-unneeded-section ./usr/lib/libXvMCNVIDIA.so.#VERSION# .note
+nvidia-glx: binary-has-unneeded-section ./usr/lib/nvidia/libnvidia-cfg.so.#VERSION# .note
+nvidia-glx: binary-has-unneeded-section ./usr/lib/xorg/modules/drivers/nvidia_drv.so .note
+
diff -Naur orig/debian/nvidia-glx.override.in mine/debian/nvidia-glx.override.in
--- orig/debian/nvidia-glx.override.in 2006-06-06 01:38:09.860573000 +0200
+++ mine/debian/nvidia-glx.override.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,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
diff -Naur orig/debian/nvidia-glx.shlibs mine/debian/nvidia-glx.shlibs
--- orig/debian/nvidia-glx.shlibs 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/nvidia-glx.shlibs 2009-06-18 11:10:59.540580642 +0200
@@ -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
diff -Naur orig/debian/nvidia-libvdpau-dev.links mine/debian/nvidia-libvdpau-dev.links
--- orig/debian/nvidia-libvdpau-dev.links 1970-01-01 01:00:00.000000000 +0100
+++ mine/debian/nvidia-libvdpau-dev.links 2009-06-18 11:10:59.540580642 +0200
@@ -0,0 +1 @@
+usr/lib/libvdpau.so.1 usr/lib/libvdpau.so
diff -Naur orig/debian/nvidia-libvdpau-ia32.links.in mine/debian/nvidia-libvdpau-ia32.links.in
--- orig/debian/nvidia-libvdpau-ia32.links.in 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/nvidia-libvdpau-ia32.links.in 2009-06-18 11:10:59.544579823 +0200
@@ -1 +1,3 @@
-emul/ia32-linux/usr/lib/libvdpau.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau.so
+emul/ia32-linux/usr/lib/libvdpau.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau.so.1
+emul/ia32-linux/usr/lib/libvdpau_nvidia.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau_nvidia.so
+emul/ia32-linux/usr/lib/libvdpau_trace.so.#VERSION# emul/ia32-linux/usr/lib/libvdpau_trace.so
diff -Naur orig/debian/nvidia-libvdpau.links.in mine/debian/nvidia-libvdpau.links.in
--- orig/debian/nvidia-libvdpau.links.in 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/nvidia-libvdpau.links.in 2009-06-18 11:10:59.544579823 +0200
@@ -1,2 +1,3 @@
-usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1
-usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so
+usr/lib/libvdpau.so.#VERSION# usr/lib/libvdpau.so.1
+usr/lib/libvdpau_nvidia.so.#VERSION# usr/lib/libvdpau_nvidia.so
+usr/lib/libvdpau_trace.so.#VERSION# usr/lib/libvdpau_trace.so
diff -Naur orig/debian/rules mine/debian/rules
--- orig/debian/rules 2009-06-11 22:40:00.575038000 +0200
+++ mine/debian/rules 2009-06-18 11:23:40.252580629 +0200
@@ -30,10 +30,11 @@
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-glx.lintian-overrides.amd64 debian/nvidia-glx.lintian-overrides.i386 \
+debian/nvidia-glx.docs debian/nvidia-glx.examples \
debian/nvidia-libvdpau.docs \
debian/nvidia-glx.postrm debian/nvidia-glx.init \
-debian/nvidia-glx-ia32.override debian/nvidia-glx-ia32.links \
+debian/nvidia-glx-ia32.lintian-overrides debian/nvidia-glx-ia32.links \
debian/nvidia-kernel-source.docs debian/nvidia-glx-dev.preinst
@@ -222,10 +223,6 @@
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/emul/ia32-linux/usr/lib ; \
@@ -257,6 +254,7 @@
install $(CURDIR)/script $(CURDIR)/debian/nvidia-glx/usr/share/bug/nvidia-glx
dh_install
+ dh_lintian
# Must not depend on anything. This is to be called by
@@ -287,9 +285,7 @@
# dh_python
dh_makeshlibs
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
