Hi, here is an updated version of my previous patch to update the lintian override files. Overrides for libvdpau and libcuda will come in separate patches.
Andreas Beckmann wrote: > Short summary: > * use dh_lintian, updated overrides > > Detailed list of changes: > * 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/rules > - use dh_lintian > - some files were renamed Andreas
Index: debian/nvidia-glx-ia32.override.in =================================================================== --- debian/nvidia-glx-ia32.override.in (.../anbe-30-0-shlibs-cleanup) (revision 819) +++ debian/nvidia-glx-ia32.override.in (.../anbe-35-0-override-cleanup) (revision 820) @@ -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 Index: debian/nvidia-glx.override.in =================================================================== --- debian/nvidia-glx.override.in (.../anbe-30-0-shlibs-cleanup) (revision 819) +++ debian/nvidia-glx.override.in (.../anbe-35-0-override-cleanup) (revision 820) @@ -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 Index: debian/nvidia-glx.lintian-overrides.i386.in =================================================================== --- debian/nvidia-glx.lintian-overrides.i386.in (.../anbe-30-0-shlibs-cleanup) (revision 0) +++ debian/nvidia-glx.lintian-overrides.i386.in (.../anbe-35-0-override-cleanup) (revision 820) @@ -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 + Index: debian/nvidia-glx.lintian-overrides.amd64.in =================================================================== --- debian/nvidia-glx.lintian-overrides.amd64.in (.../anbe-30-0-shlibs-cleanup) (revision 0) +++ debian/nvidia-glx.lintian-overrides.amd64.in (.../anbe-35-0-override-cleanup) (revision 820) @@ -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 + Index: debian/changelog =================================================================== --- debian/changelog (.../anbe-30-0-shlibs-cleanup) (revision 819) +++ debian/changelog (.../anbe-35-0-override-cleanup) (revision 820) @@ -7,6 +7,8 @@ - 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* -- Andreas Beckmann <deb...@abeckmann.de> Thu, 02 Jul 2009 04:03:14 +0200 Index: debian/rules =================================================================== --- debian/rules (.../anbe-30-0-shlibs-cleanup) (revision 819) +++ debian/rules (.../anbe-35-0-override-cleanup) (revision 820) @@ -30,10 +30,11 @@ AUTOGEN=debian/nvidia-kernel-source.README.Debian \ 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 \ debian.binary/changelog @@ -225,10 +226,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/usr/lib32 ; \ @@ -260,6 +257,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 Index: debian/nvidia-glx-ia32.lintian-overrides.in =================================================================== --- debian/nvidia-glx-ia32.lintian-overrides.in (.../anbe-30-0-shlibs-cleanup) (revision 0) +++ debian/nvidia-glx-ia32.lintian-overrides.in (.../anbe-35-0-override-cleanup) (revision 820) @@ -0,0 +1,22 @@ +# the diversions are placed there +nvidia-glx-ia32: package-contains-empty-directory usr/lib32/nvidia/ + +nvidia-glx-ia32: shared-lib-without-dependency-information ./usr/lib32/libnvidia-tls.so.#VERSION# +nvidia-glx-ia32: shared-lib-without-dependency-information ./usr/lib32/tls/libnvidia-tls.so.#VERSION# + +nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.#VERSION# +nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libGLcore.so.#VERSION# +nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/libnvidia-tls.so.#VERSION# +nvidia-glx-ia32: shlib-with-non-pic-code usr/lib32/tls/libnvidia-tls.so.#VERSION# + +nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libGL.so.#VERSION# +nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libGLcore.so.#VERSION# +nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/libnvidia-tls.so.#VERSION# +nvidia-glx-ia32: shlib-without-PT_GNU_STACK-section usr/lib32/tls/libnvidia-tls.so.#VERSION# + +nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGL.so.#VERSION# .comment +nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGLcore.so.#VERSION# .note +nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libGLcore.so.#VERSION# .comment +nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/libnvidia-tls.so.#VERSION# .comment +nvidia-glx-ia32: binary-has-unneeded-section ./usr/lib32/tls/libnvidia-tls.so.#VERSION# .comment + Index: debian/nvidia-glx-dev.lintian-overrides =================================================================== --- debian/nvidia-glx-dev.lintian-overrides (.../anbe-30-0-shlibs-cleanup) (revision 0) +++ debian/nvidia-glx-dev.lintian-overrides (.../anbe-35-0-override-cleanup) (revision 820) @@ -0,0 +1,2 @@ +# the diversions are placed there +nvidia-glx-dev: package-contains-empty-directory usr/lib/nvidia/ Index: debian.binary/override.template =================================================================== --- debian.binary/override.template (.../anbe-30-0-shlibs-cleanup) (revision 819) +++ debian.binary/override.template (.../anbe-35-0-override-cleanup) (revision 820) @@ -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