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

[SCM] Debian package checker branch, master, updated. 2.5.3-218-g22da417

The following commit has been merged in the master branch:
commit 22da417a96382a2531bd8da85fc136adb77aeefd
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Nov 17 14:09:03 2011 +0100

    Added check for xz compression without dpkg Pre-Depends
    
    The severity is pedantic for Debian, where dpkg in Squeeze is able to
    handle it.  For Ubuntu it is serious because dpkg in Lucid cannot
    handle them and it may break the upgrade path.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/deb-format b/checks/deb-format
index 82ae5f1..e021aff 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -77,6 +77,10 @@ if ($success) {
     } else {
         if ($type eq 'udeb' && $members[2] ne 'data.tar.gz') {
             tag 'udeb-uses-non-gzip-data-tarball';
+        } elsif ($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 dfcfa2b..d4d8270 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -47,3 +47,11 @@ Info: This udeb contains non-gzip data tarballs.  udpkg,
  tarballs which means udebs that contain them will not be
  installable. This can also break the daily or weekly d-i images.
 
+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 cc0401b..cbb2977 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lintian (2.5.4) UNRELEASED; urgency=low
       - missing-build-dependency-for-dh-addon
       - python-depends-but-no-python-helper
       - python3-depends-but-no-python3-helper
+      - data.tar.xz-member-without-dpkg-pre-depends
 
   * checks/*:
     + [JW] Replace common_data.pm with Lintian::Check.
@@ -27,6 +28,11 @@ lintian (2.5.4) UNRELEASED; urgency=low
     + [NT] Extended the description of the tag for non-native packages
       with native versions.  Thanks to Jari Aalto for the report.
       (Closes: #580048)
+  * checks/deb-format{,.desc}:
+    + [NT] Added check for using .xz compression in deb files without
+      versioned Pre-Depends on dpkg.  The severity is pedantic for
+      Debian and serious for Ubuntu.  Thanks to Aaron M. Ucko for the
+      rapport.  (Closes: #648350)
   * checks/dehelper{,.desc}:
     + [JW,NT] Check for versioned dependencies for some dh_commands.
       (Closes: #641035)
diff --git a/profiles/ubuntu/main.profile b/profiles/ubuntu/main.profile
index 9bf6f62..8000d00 100644
--- a/profiles/ubuntu/main.profile
+++ b/profiles/ubuntu/main.profile
@@ -5,4 +5,7 @@ Disable-Tags: debian-changelog-file-is-a-symlink,
  lzma-deb-archive, no-upstream-changelog,
  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
+Severity: serious
 
diff --git a/t/COVERAGE b/t/COVERAGE
index 8a6f4b1..b6baffd 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
-Last generated 2011-10-13
-Coverage: 762/940 (81.06%), w. legacy tests: 871/940 (92.66%)
+Last generated 2011-11-17
+Coverage: 764/942 (81.10%), w. legacy tests: 873/942 (92.68%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/deb-format-udeb-compression/debian/debian/rules b/t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules
similarity index 69%
copy from t/tests/deb-format-udeb-compression/debian/debian/rules
copy to t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules
index 68da07d..3e46a11 100644
--- a/t/tests/deb-format-udeb-compression/debian/debian/rules
+++ b/t/tests/deb-format-xz-compression-ubuntu/debian/debian/rules
@@ -4,5 +4,5 @@
 	dh $@
 
 override_dh_builddeb:
-	dh_builddeb -- -Zbzip2
+	dh_builddeb -- -Zxz
 
diff --git a/t/tests/deb-format-xz-compression-ubuntu/desc b/t/tests/deb-format-xz-compression-ubuntu/desc
new file mode 100644
index 0000000..17123e3
--- /dev/null
+++ b/t/tests/deb-format-xz-compression-ubuntu/desc
@@ -0,0 +1,6 @@
+Testname: deb-format-xz-compression-ubuntu
+Sequence: 6000
+Version: 1.0
+Profile: ubuntu/main
+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
new file mode 100644
index 0000000..1b359ef
--- /dev/null
+++ b/t/tests/deb-format-xz-compression-ubuntu/tags
@@ -0,0 +1 @@
+E: deb-format-xz-compression-ubuntu: data.tar.xz-member-without-dpkg-pre-depends

-- 
Debian package checker
Reply to: