Index: debian/nvidia-kernel-dkms.lintian-overrides.in
===================================================================
--- debian/nvidia-kernel-dkms.lintian-overrides.in	(.../anbe-325-conditional-overrides)	(revision 2436)
+++ debian/nvidia-kernel-dkms.lintian-overrides.in	(.../anbe-330-conditionalize-overrides-1)	(revision 2436)
@@ -1,5 +1,5 @@
 # This is the upstream binary module, which we're not allowed (by the
 # NVIDIA license) to change in any way.  Both architectures are included
 # so that (on i386) we can build the kernel module for the amd64 kernel.
-nvidia-kernel#LEGACY#-dkms: binary-from-other-architecture
+#!amd64#nvidia-kernel#LEGACY#-dkms: binary-from-other-architecture
 nvidia-kernel#LEGACY#-dkms: unstripped-binary-or-object
Index: debian/nvidia-glx.lintian-overrides.in
===================================================================
--- debian/nvidia-glx.lintian-overrides.in	(.../anbe-325-conditional-overrides)	(revision 2436)
+++ debian/nvidia-glx.lintian-overrides.in	(.../anbe-330-conditionalize-overrides-1)	(revision 2436)
@@ -2,9 +2,9 @@
 nvidia-glx#LEGACY#: binary-has-unneeded-section
 nvidia-glx#LEGACY#: embedded-libpng
 nvidia-glx#LEGACY#: shared-lib-without-dependency-information
-nvidia-glx#LEGACY#: shlib-with-executable-stack
-nvidia-glx#LEGACY#: shlib-with-non-pic-code
-nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
+#!i386#nvidia-glx#LEGACY#: shlib-with-executable-stack
+#!amd64#nvidia-glx#LEGACY#: shlib-with-non-pic-code
+#!amd64#nvidia-glx#LEGACY#: shlib-without-PT_GNU_STACK-section
 nvidia-glx#LEGACY#: spelling-error-in-binary
 
 # We divert a bunch of files not provided by this package to ensure that
Index: debian/changelog
===================================================================
--- debian/changelog	(.../anbe-325-conditional-overrides)	(revision 2436)
+++ debian/changelog	(.../anbe-330-conditionalize-overrides-1)	(revision 2436)
@@ -146,6 +146,7 @@
     packages
   * debian/rules: add new substitution placeholders #!i386#, #!amd64# that are
     substituted with '#' on the respective architecture and '' elsewhere
+  * update/conditionalize lintian overrides
 
  -- Russ Allbery <rra@debian.org>  Sat, 24 Apr 2010 20:35:20 -0700
 
Index: debian/nvidia-glx-ia32.lintian-overrides.in
===================================================================
--- debian/nvidia-glx-ia32.lintian-overrides.in	(.../anbe-325-conditional-overrides)	(revision 2436)
+++ debian/nvidia-glx-ia32.lintian-overrides.in	(.../anbe-330-conditionalize-overrides-1)	(revision 2436)
@@ -1,6 +1,5 @@
 # The NVIDIA license does not allow any form of modification.
 nvidia-glx#LEGACY#-ia32: binary-has-unneeded-section
-nvidia-glx#LEGACY#-ia32: embedded-libpng
 nvidia-glx#LEGACY#-ia32: shared-lib-without-dependency-information
 nvidia-glx#LEGACY#-ia32: shlib-with-non-pic-code
 nvidia-glx#LEGACY#-ia32: shlib-without-PT_GNU_STACK-section