[SCM] Debian package checker branch, master, updated. 2.5.10-2-g3eb5fc7

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

The following commit has been merged in the master branch:
commit 602ce7b05f617edabcea5d089bb542d6fa9e0df1
Author: Niels Thykier <niels@thykier.net>
Date:   Tue Jul 10 13:36:13 2012 +0200

    Retire data.tar.xz-member-without-dpkg-pre-depends
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/deb-format b/checks/deb-format
index 9b498e8..97ce811 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -60,10 +60,6 @@ if ($success) {
     } else {
         if ($type eq 'udeb' && $members[2] !~ m/^data\.tar\.[gx]z$/) {
             tag 'udeb-uses-unsupported-compression-for-data-tarball';
-        } elsif ($type ne 'udeb' && $members[2] eq 'data.tar.xz') {
-            my $rel = $info->relation('pre-depends');
-            tag 'data.tar.xz-member-without-dpkg-pre-depends'
-                unless $rel->implies('dpkg (>= 1.15.6~)');
         }
         $okay = 1;
     }
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index f070cef..a3de854 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -49,11 +49,3 @@ Info: The data tarball of this udeb package is not compressed in format
  .
  Currently, udpkg supports .gz and .xz compressed tarballs.
 
-Tag: data.tar.xz-member-without-dpkg-pre-depends
-Severity: pedantic
-Certainty: certain
-Info: The deb uses xz compression for the data member, which requires
- a Pre-Depends on dpkg (&gt;= 1.15.6~).  This is trivially satisfied in
- Debian, but it can complicate upgrades from Ubuntu Lucid where dpkg
- 1.15.6 is not currently available.
-
diff --git a/debian/changelog b/debian/changelog
index 817fcab..4e3f2b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lintian (2.5.11) UNRELEASED; urgency=low
+
+  * Summary of tag changes:
+    + Removed:
+      - data.tar.xz-member-without-dpkg-pre-depends
+
+  * checks/deb-format{,.desc}:
+    + [NT] Retire data.tar.xz tag.  (Closes: #680391)
+
+ -- Niels Thykier <niels@thykier.net>  Tue, 10 Jul 2012 13:21:56 +0200
+
 lintian (2.5.10) unstable; urgency=low
 
   * Summary of tag changes:
diff --git a/profiles/ubuntu/main.profile b/profiles/ubuntu/main.profile
index 25c35a4..8df51be 100644
--- a/profiles/ubuntu/main.profile
+++ b/profiles/ubuntu/main.profile
@@ -12,7 +12,6 @@ Disable-Tags: changelog-should-mention-nmu,
  upstart-job-in-etc-init.d-not-registered-via-update-rc.d
 
 # Serious as it may break Lucid upgrade path
-Tags: data.tar.xz-member-without-dpkg-pre-depends,
- preinst-uses-dpkg-maintscript-helper-without-predepends
+Tags: preinst-uses-dpkg-maintscript-helper-without-predepends
 Severity: serious
 
diff --git a/t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules b/t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules
deleted file mode 100644
index 3e46a11..0000000
--- a/t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/make -f
-
-%:
-	dh $@
-
-override_dh_builddeb:
-	dh_builddeb -- -Zxz
-
diff --git a/t/tests/deb-format-xz-compression-ubuntu/desc b/t/tests/deb-format-xz-compression-ubuntu/desc
deleted file mode 100644
index fa60813..0000000
--- a/t/tests/deb-format-xz-compression-ubuntu/desc
+++ /dev/null
@@ -1,7 +0,0 @@
-Testname: deb-format-xz-compression-ubuntu
-Sequence: 6000
-Version: 1.0
-Profile: ubuntu/main
-Distribution: precise
-Description: Test of xz compression without dpkg pre-dep
-Test-For: data.tar.xz-member-without-dpkg-pre-depends
diff --git a/t/tests/deb-format-xz-compression-ubuntu/tags b/t/tests/deb-format-xz-compression-ubuntu/tags
deleted file mode 100644
index 1b359ef..0000000
--- a/t/tests/deb-format-xz-compression-ubuntu/tags
+++ /dev/null
@@ -1 +0,0 @@
-E: deb-format-xz-compression-ubuntu: data.tar.xz-member-without-dpkg-pre-depends

-- 
Debian package checker