[lintian] 01/01: Improve support for "3.0 (git)" packages. They are still marked as unsupported-source-format as they are not accepted by the Debian archive. (Closes: #605999)

[Chris Lamb <chris@chris-lamb.co.uk>]

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

lamby pushed a commit to branch master
in repository lintian.

commit 9af508378ac610de9eb5c0c0a329ddd14c40a376
Author: Chris Lamb <lamby@debian.org>
Date:   Tue Jul 18 23:08:36 2017 +0100

    Improve support for "3.0 (git)" packages. They are still marked as unsupported-source-format as they are not accepted by the Debian archive.  (Closes: #605999)
---
 checks/cruft.pm               | 2 +-
 debian/changelog              | 4 ++++
 lib/Lintian/Collect/Source.pm | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/checks/cruft.pm b/checks/cruft.pm
index 05d8901..db829fd 100644
--- a/checks/cruft.pm
+++ b/checks/cruft.pm
@@ -356,7 +356,7 @@ sub run {
     #   that may not be present.
     my $format = $info->field('format', '3.0 (quilt)');
 
-    if ($format =~ /^\s*2\.0\s*\z/ or $format =~ /^\s*3\.0\s*\(quilt\)/) {
+    if ($format =~ /^\s*2\.0\s*\z/ or $format =~ /^\s*3\.0\s*\(quilt|git\)/) {
         check_debian_dir($info, \%warned);
     }elsif (not $info->native) {
         check_diffstat($info->diffstat, \%warned);
diff --git a/debian/changelog b/debian/changelog
index c61f0db..fa9c979 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -113,6 +113,10 @@ lintian (2.5.52) UNRELEASED; urgency=medium
     + [NT] Override dh_autoreconf tools as they are not used (but need to
       scan over all files in the source package).
 
+  * lib/Lintian/Collect/Source.pm:
+    + [CL] Improve support for "3.0 (git)" packages. They are still marked
+      as unsupported-source-format as they are not accepted by the Debian
+      archive.  (Closes: #605999)
   * lib/Lintian/Util.pm:
     + [NT] Fix uninitialized warning if a fork call fails.
 
diff --git a/lib/Lintian/Collect/Source.pm b/lib/Lintian/Collect/Source.pm
index 5d262bf..518eae2 100644
--- a/lib/Lintian/Collect/Source.pm
+++ b/lib/Lintian/Collect/Source.pm
@@ -164,8 +164,8 @@ sub native {
     return $self->{native} if exists $self->{native};
     my $format = $self->field('format');
     $format = '1.0' unless defined $format;
-    if ($format =~ m/^\s*2\.0\s*$/o or $format =~ m/^\s*3\.0\s+\(quilt\)\s*$/o)
-    {
+    if (   $format =~ m/^\s*2\.0\s*$/o
+        or $format =~ m/^\s*3\.0\s+\(quilt|git\)\s*$/o){
         $self->{native} = 0;
     } elsif ($format =~ m/^\s*3\.0\s+\(native\)\s*$/o) {
         $self->{native} = 1;

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