[lintian] 01/02: Merge branch 'master' into ppt-lc-mover

[Axel Beckert <abe@deuxchevaux.org>]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch ppt-lc-mover
in repository lintian.

commit 352c1d1c4ffd0488801697ed556a19c7d308a133
Merge: a54aca4 0ac33e1
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Thu Aug 13 17:40:49 2015 +0200

    Merge branch 'master' into ppt-lc-mover
    
    Manually solved conflicts: debian/changelog

 checks/fields.pm                                        | 4 +++-
 debian/changelog                                        | 6 ++++++
 t/tests/fields-depends-general/debian/debian/control.in | 5 +++--
 t/tests/fields-depends-general/tags                     | 5 +++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index afb15fe,3505cef..61a4641
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,9 -10,12 +12,15 @@@ lintian (2.5.36) UNRELEASED; urgency=me
        Remove line number before running the detection.
      + [BR] Avoid another gfdl false positive in oidentd, sdlbasic,
        smbc package.
 +  * checks/description.*:
 +    + [AB] Add new tag perl-module-name-not-mentioned-in-description based
 +      on pkg-perl-tools' no-module-name-in-description by Damyan Ivanov.
+   * checks/fields.pm:
+     + [AB] Add emacs23 to list of obsolete Emacs package names.
+     + [AB] Also check for obsolete emacs package names with common
+       suffixes (-gtk, -el, -nox, lucid)
+     + [AB] Add an imaginary future emacs222 package to the test suite's
+       dummy package to check for depends-on-old-emacs false positives.
    * checks/files.desc:
      + [BR] Correct a few typos.  (Closes: #794953)
      + [BR] Rename files-privacybreach-may-use-debian-package

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git