[SCM] Debian package checker branch, master, updated. 2.5.1-31-g301227a

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit cca38f10c0f67f1cbb7b4db7563a699740f216d3
Author: Ansgar Burchardt <ansgar@debian.org>
Date:   Sun Jul 3 21:31:20 2011 +0200

    checks/deb-format: allow data.tar.xz
    
    Signed-off-by: Ansgar Burchardt <ansgar@debian.org>
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/deb-format b/checks/deb-format
index ec688d2..cae19b2 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -71,9 +71,9 @@ if ($success) {
         } else {
             tag 'lzma-deb-archive';
         }
-    } elsif ($members[2] !~ /^data\.tar\.(?:gz|bz2)\z/) {
+    } elsif ($members[2] !~ /^data\.tar\.(?:gz|bz2|xz)\z/) {
         tag 'malformed-deb-archive',
-            "third member $members[2] not data.tar.(gz|bz2)";
+            "third member $members[2] not data.tar.(gz|bz2|xz)";
     } else {
         $okay = 1;
     }
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index 9d921e8..56e2e5f 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -10,10 +10,11 @@ Severity: serious
 Certainty: certain
 Info: The binary package is not a correctly constructed archive.  A binary
  Debian package must be an ar archive with exactly three members:
- <tt>debian-binary</tt>, <tt>control.tar.gz</tt>, and
- <tt>data.tar.gz</tt> or <tt>data.tar.bz2</tt> in exactly that order.  The
- <tt>debian-binary</tt> member must start with a single line containing
- the version number, with a major revision of 2.
+ <tt>debian-binary</tt>, <tt>control.tar.gz</tt>, and one of
+ <tt>data.tar.gz</tt>, <tt>data.tar.bz2</tt> or <tt>data.tar.xz</tt>
+ in exactly that order.  The <tt>debian-binary</tt> member must start
+ with a single line containing the version number, with a major revision
+ of 2.
 Ref: deb(5)
 
 Tag: lzma-deb-archive
diff --git a/debian/changelog b/debian/changelog
index d2c4d3b..973b2b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ lintian (2.5.2) UNRELEASED; urgency=low
       helper templates.  This should prevent false-positives for
       some license texts.  Thanks to Charles Plessy for the
       report.  (Closes: #631674)
+  * checks/deb-format{,.desc}:
+    + [NT] Allow data.tar.xz as the second member.  Thanks to
+      Ansgar Burchardt for the report and patch.
+      (Closes: #632556)
   * checks/debhelper:
     + [NT] Do not trigger deprecation warning for dh_python if it
       is followed by a "$".  This prevents false-positives when

-- 
Debian package checker