[SCM] Debian package checker branch, master, updated. 2.5.1-131-gacc1563

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

The following commit has been merged in the master branch:
commit acc156307c2da94ca9881152d4824f60e9ed095b
Author: Niels Thykier <niels@thykier.net>
Date:   Wed Jul 20 23:15:51 2011 +0200

    Added test for udeb using non-gzip for its data member

diff --git a/checks/deb-format b/checks/deb-format
index cae19b2..e71a7ee 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -75,6 +75,9 @@ if ($success) {
         tag 'malformed-deb-archive',
             "third member $members[2] not data.tar.(gz|bz2|xz)";
     } else {
+        if ($type eq 'udeb' && $members[2] ne 'data.tar.gz') {
+            tag 'udeb-uses-non-gzip-data-tarball';
+        }
         $okay = 1;
     }
 } else {
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index 56e2e5f..dfcfa2b 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -38,3 +38,12 @@ Certainty: possible
 Info: tar produced an error while listing the contents of the data
  member of this package.  This probably means there's something broken or
  at least strange about the way the package was constructed.
+
+Tag: udeb-uses-non-gzip-data-tarball
+Severity: serious
+Certainty: certain
+Info: This udeb contains non-gzip data tarballs.  udpkg,
+ debian-installer's dpkg equivalent, does not support non-gzip
+ tarballs which means udebs that contain them will not be
+ installable. This can also break the daily or weekly d-i images.
+
diff --git a/debian/changelog b/debian/changelog
index c7bcd81..2493585 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lintian (2.5.2) UNRELEASED; urgency=low
       - source-package-component-has-long-file-name
       - upstart-job-in-etc-init.d-not-registered-via-update-rc.d
       - debian-rules-uses-deprecated-makefile
+      - udeb-uses-non-gzip-data-tarball
     + Removed:
       - calls-suidperl-directly
       - suid-perl-script-but-no-perl-suid-dep
@@ -48,6 +49,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
     + [NT] Allow data.tar.xz as the third member.  Thanks to
       Ansgar Burchardt for the report and patch.
       (Closes: #632556)
+    + [NT] Added test for udebs having non-gzip data members,
+      since the debian-installer does not support them.  Thanks
+      to Luk Claes.  (Closes: #634874)
   * checks/debhelper:
     + [NT] Do not trigger deprecation warning for dh_python if it
       is followed by a "$".  This prevents false-positives when
diff --git a/debian/control b/debian/control
index 2ffa6fa..71413f6 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Uploaders: Josip Rodin <joy-packages@debian.org>,
            Raphael Geissert <geissert@debian.org>,
            Niels Thykier <niels@thykier.net>
 Build-Depends: binutils,
+               bzip2,
                cdbs,
                debhelper (>= 8.1.0~),
                default-jdk,
diff --git a/t/COVERAGE b/t/COVERAGE
index 6df30a0..c7dbc48 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2011-07-20
-Coverage: 657/912 (72.04%), w. legacy tests: 802/912 (87.94%)
+Coverage: 658/913 (72.07%), w. legacy tests: 803/913 (87.95%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/fields-section-udeb/debian/debian/control.in b/t/tests/deb-format-udeb-compression/debian/debian/control.in
similarity index 85%
copy from t/tests/fields-section-udeb/debian/debian/control.in
copy to t/tests/deb-format-udeb-compression/debian/debian/control.in
index 928116b..37dc7d7 100644
--- a/t/tests/fields-section-udeb/debian/debian/control.in
+++ b/t/tests/deb-format-udeb-compression/debian/debian/control.in
@@ -1,14 +1,14 @@
 Source: {$srcpkg}
 Priority: extra
-Section: devel
+Section: debian-installer
 Maintainer: {$author}
 Standards-Version: {$standards_version}
 Build-Depends: debhelper (>= 7.0.50~)
 
-Package: {$srcpkg}
+Package: some-udeb
 Architecture: all
+Depends: $\{misc:Depends\}
 Package-Type: udeb
-Depends: $\{misc:Depends\},
 Description: {$description}
  This is a test package designed to exercise some feature or tag of
  Lintian.  It is part of the Lintian test suite and may do very odd
diff --git a/t/tests/deb-format-udeb-compression/debian/debian/rules b/t/tests/deb-format-udeb-compression/debian/debian/rules
new file mode 100644
index 0000000..68da07d
--- /dev/null
+++ b/t/tests/deb-format-udeb-compression/debian/debian/rules
@@ -0,0 +1,8 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
+
+override_dh_builddeb:
+	dh_builddeb -- -Zbzip2
+
diff --git a/t/tests/deb-format-udeb-compression/desc b/t/tests/deb-format-udeb-compression/desc
new file mode 100644
index 0000000..d220987
--- /dev/null
+++ b/t/tests/deb-format-udeb-compression/desc
@@ -0,0 +1,5 @@
+Testname: deb-format-udeb-compression
+Sequence: 0000
+Version: 1.0
+Description: Test of compression of udeb data member
+Test-For: udeb-uses-non-gzip-data-tarball
\ No newline at end of file
diff --git a/t/tests/deb-format-udeb-compression/tags b/t/tests/deb-format-udeb-compression/tags
new file mode 100644
index 0000000..52e036a
--- /dev/null
+++ b/t/tests/deb-format-udeb-compression/tags
@@ -0,0 +1 @@
+E: some-udeb udeb: udeb-uses-non-gzip-data-tarball

-- 
Debian package checker