[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 6b71e462692788464f850467a93f556218673f6b
Merge: d511af2 b56e0af
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Fri Aug 14 19:51:06 2015 +0200

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

 checks/cruft.desc                   |  2 +-
 checks/systemd.desc                 |  2 +-
 data/files/privacy-breaker-websites | 23 ++++++++++++-----------
 debian/changelog                    | 15 ++++++++++++++-
 lib/Lintian/Collect.pm              |  8 --------
 5 files changed, 28 insertions(+), 22 deletions(-)

diff --cc debian/changelog
index 96f57fa,d5c3b6a..d40adfe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -12,11 -10,7 +12,12 @@@ 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.
 +    + [AB] Add new tag mentions-deprecated-usr-lib-perl5-directory based
 +      on pkg-perl-tools' usr-lib-perl5-mentioned (multiple authors).
+     + [NT] Replace "funny" dash with regular ASCII dash.
 +  * 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

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