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

[SCM] Debian package checker branch, master, updated. 2.5.6-46-g743b855



The following commit has been merged in the master branch:
commit 743b855de067a379272748c09d7021b5089dbc3d
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Apr 2 22:49:25 2012 +0200

    c/deb-format: Remove Ubuntu specific code
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/deb-format b/checks/deb-format
index 5e946b7..6062381 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -29,14 +29,6 @@ our %ERRORS = ('control-errors'       => 'tar-errors-from-control',
                'index-errors'         => 'tar-errors-from-data',
                'unpacked-errors'      => 'tar-errors-from-data');
 
-# Used to match Ubuntu distribution names in target distributions.
-our $UBUNTU_REGEX;
-{
-    my $dists = Lintian::Data->new('changelog-file/ubuntu-dists');
-    my $string = join ('|', 'ubuntu', $dists->all);
-    $UBUNTU_REGEX = qr/$string/o;
-}
-
 sub run {
 
 my $pkg = shift;
@@ -61,16 +53,7 @@ if ($success) {
             "second member $members[1] not control.tar.gz";
     } elsif ($members[2] eq 'data.tar.lzma') {
         # Ubuntu's archive allows lzma packages.
-        my $distribution = '';
-        if (defined $info->changelog) {
-            my ($entry) = $info->changelog->data;
-            $distribution = $entry->Distribution;
-        }
-        if ($distribution =~ m/$UBUNTU_REGEX/) {
-            $okay = 1;
-        } else {
-            tag 'lzma-deb-archive';
-        }
+        tag 'lzma-deb-archive';
     } elsif ($members[2] !~ /^data\.tar\.(?:gz|bz2|xz)\z/) {
         tag 'malformed-deb-archive',
             "third member $members[2] not data.tar.(gz|bz2|xz)";
diff --git a/debian/changelog b/debian/changelog
index cf73f3f..c634689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,9 @@ lintian (2.5.7) UNRELEASED; urgency=low
   * checks/deb-format{,.desc}:
     + [NT] Replace old udeb compression tag with a more general
       one.  (Closes: #664600)
+    + [NT] Remove logic for checking if a deb is meant for
+      Ubuntu.  Instead unconditionally emit the tag and let the
+      vendor profiles handle it.
   * checks/fields{,.desc}:
     + [NT] Add devref reference.
     + [NT] Remove special handling of the Ubuntu specific field,

-- 
Debian package checker


Reply to: