[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

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



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 a54aca40a133b6669ad55240e679916bbdf14a47
Merge: e8cbac3 d68850b
Author: Axel Beckert <abe@deuxchevaux.org>
Date:   Thu Aug 13 15:41:28 2015 +0200

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

 checks/changelog-file.pm                        |  2 +-
 checks/fields.pm                                |  2 +-
 debian/changelog                                |  5 +-
 doc/tutorial/Lintian/Tutorial/TestSuite.pod     | 18 +++----
 doc/tutorial/Lintian/Tutorial/WritingChecks.pod | 68 ++++++++++++-------------
 doc/tutorial/Lintian/Tutorial/WritingTests.pod  | 42 +++++++--------
 t/COVERAGE                                      |  6 +--
 t/runtests                                      | 10 ++--
 t/tests/files-wrong-owner/debian/debian/rules   |  6 +--
 t/tests/files-wrong-owner/desc                  |  1 +
 t/tests/files-wrong-owner/tags                  |  4 --
 11 files changed, 82 insertions(+), 82 deletions(-)

diff --cc debian/changelog
index ce51a4e,e8dc9c9..afb15fe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -2,18 -2,16 +2,21 @@@ lintian (2.5.36) UNRELEASED; urgency=me
  
    XXX: generate tag summary with private/generate-tag-summary
  
 +  * checks/application-not-library.*, t/tests/application-not-library/:
 +    + [AB] New experimental checks imported from pkg-perl-tools.
+   * checks/changelog-file.pm:
+     + [JW] Fix invalid comparison leading to false positive
+       non-consecutive-debian-revision tags.  (Closes: #794995)
    * checks/cruft.pm:
      + [BR] Avoid a false positive for gfdl detection in krusader.
        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/files.desc:
-     + [BR] Correct a few typos.  (Closes: #794953).
+     + [BR] Correct a few typos.  (Closes: #794953)
      + [BR] Rename files-privacybreach-may-use-debian-package
        to  privacy-breach-uses-embedded-file.  Thanks to
        Guillem Jover for the report.

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


Reply to: