Bug#922534: lintian: Typo fixes

[Guillem Jover <guillem@debian.org>]

Package: lintian
Version: 2.7.0
Severity: minor

Hi!

Here's a couple of patches I had sitting on my local lintian tree.

Thanks,
Guillem

From af1af30e9973e7da6f59fec405611392d1bf2aaf Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 17 Feb 2019 20:28:53 +0100
Subject: [PATCH 1/2] c/deb-format: Improve malformed-deb-archive tag extra
 information

Remove the .gz extension for control.tar, given that .xz is now also
accepted. Print the compressed data.tar member extensions matching the
ones being tested.
---
 checks/deb-format.pm                    | 4 ++--
 t/tags/debs/deb-format-wrong-order/tags | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/checks/deb-format.pm b/checks/deb-format.pm
index b1298282d..6d3bb0cee 100644
--- a/checks/deb-format.pm
+++ b/checks/deb-format.pm
@@ -116,7 +116,7 @@ sub run {
         if (not defined($ctrl_member)) {
             # Somehow I doubt we will ever get this far without a control
             # file... :)
-            tag 'malformed-deb-archive', 'Missing control.tar.gz member';
+            tag 'malformed-deb-archive', 'Missing control.tar member';
             $failed = 1;
         } else {
             if (
@@ -150,7 +150,7 @@ sub run {
                 tag 'malformed-deb-archive',
                   join(' ',
                     "third (official) member $data_member",
-                    'not data.tar.(gz|bz2|xz)');
+                    'not data.tar.(gz|xz|bz2|lzma)');
                 $failed = 1;
             } elsif ($type eq 'udeb'
                 && $data_member !~ m/^data\.tar\.[gx]z$/) {
diff --git a/t/tags/debs/deb-format-wrong-order/tags b/t/tags/debs/deb-format-wrong-order/tags
index d5a22fae3..183f24f02 100644
--- a/t/tags/debs/deb-format-wrong-order/tags
+++ b/t/tags/debs/deb-format-wrong-order/tags
@@ -1,2 +1,2 @@
 E: deb-format-wrong-order: malformed-deb-archive second (official) member data.tar.gz not control.tar.(gz|xz)
-E: deb-format-wrong-order: malformed-deb-archive third (official) member control.tar.gz not data.tar.(gz|bz2|xz)
+E: deb-format-wrong-order: malformed-deb-archive third (official) member control.tar.gz not data.tar.((gz|xz|bz2|lzma)
-- 
2.20.1.791.gb4d0f1c61a

From 329303c24f727d3ef1a311400eb83fb9e7af946b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 17 Feb 2019 20:38:20 +0100
Subject: [PATCH 2/2] t: Remove duplicate word across newline boundary

---
 t/scripts/Lintian/Lab/data/changes/lintian_2.5.11_amd64.changes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/t/scripts/Lintian/Lab/data/changes/lintian_2.5.11_amd64.changes b/t/scripts/Lintian/Lab/data/changes/lintian_2.5.11_amd64.changes
index b366feddb..23e21f8b9 100644
--- a/t/scripts/Lintian/Lab/data/changes/lintian_2.5.11_amd64.changes
+++ b/t/scripts/Lintian/Lab/data/changes/lintian_2.5.11_amd64.changes
@@ -34,7 +34,7 @@ Changes:
  .
    * checks/*:
      + [NT] Remove assumption that lintian will chdir into the
-       the lab before calling the check.
+       lab before calling the check.
      + [NT] Be better at avoiding false-positive spelling errors
        for references to packages that also happen to be common
        spelling mistake.  Thanks to Paul Tagliamonte for the
-- 
2.20.1.791.gb4d0f1c61a