Merge remote branch 'tolimar2/lintian-2.5.0' into merge

* tolimar2/lintian-2.5.0:
  Add missing-pre-dependency-on-multiarch-support to the lintian autorjects as requested by Steve Langasek
  Adding install-info-used-in-maintainer-script to the non-fatal lintian-reject-tags; closes #607293
  Some lintian tags got renamed with 2.5.0
  Fix typo in templated reported by Mohammed Adnène Trojette

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/lintian.tags b/config/debian/lintian.tags
index c8e668a2bc5e4a6f8be41a2548f26b009aaca846..e341c8a3b4d841b5259adf3543d06db1b03c5537 100644 (file)
--- a/config/debian/lintian.tags
+++ b/config/debian/lintian.tags
@@ -11,13 +11,15 @@ lintian:
     - package-contains-info-dir-file
     - binary-or-shlib-defines-rpath
     - non-etc-file-marked-as-conffile
-    - embedded-zlib
+    - embedded-library
     - no-shlibs-control-file
     - copyright-contains-dh_make-todo-boilerplate
     - preinst-interpreter-without-predepends
     - control-interpreter-without-depends
     - dir-or-file-in-var-www
     - wrong-file-owner-uid-or-gid
+    - install-info-used-in-maintainer-script
+    - missing-pre-dependency-on-multiarch-support
   fatal:
     - debian-control-file-uses-obsolete-national-encoding
     - malformed-deb-archive
@@ -33,7 +35,7 @@ lintian:
     - binary-in-etc
     - missing-dependency-on-perlapi
     - section-is-dh_make-template
-    - package-installs-python-pyc
+    - package-installs-python-bytecode
     - library-in-debug-or-profile-should-not-be-stripped
     - binary-file-compressed-with-upx
     - file-in-usr-marked-as-conffile