[SCM] Debian package checker branch, master, updated. 2.4.1-2-g0962067
The following commit has been merged in the master branch:
commit 09620678c41742d948fa0100a6a8f3fe6f18a0a8
Author: Russ Allbery <rra@debian.org>
Date: Thu May 6 21:40:57 2010 -0700
Allow Breaks without version for virtual packages
* checks/fields:
+ [RA] Allow Breaks without a version if the broken package is a
virtual package.
* data/fields/virtual-packages:
+ [RA] Update to current unstable and add the old xserver-xorg video
and input virtual packages.
* private/refresh-virtual-packages-data:
+ [RA] Fix handling of # Keep: lines to work correctly now that
virtual packages mentioned only once are excluded.
diff --git a/checks/fields b/checks/fields
index 9a97dfe..6801746 100644
--- a/checks/fields
+++ b/checks/fields
@@ -554,7 +554,7 @@ if (($type eq "binary") || ($type eq 'udeb')) {
if ($field eq "provides" && $d_version->[0]);
tag "breaks-without-version", "$part_d_orig"
- if ($field eq "breaks" && !$d_version->[0]);
+ if ($field eq "breaks" && !$d_version->[0] && !$VIRTUAL_PACKAGES->known($d_pkg));
tag "obsolete-relation-form", "$field: $part_d_orig"
if ($d_version && grep { $d_version->[0] eq $_ } ("<", ">"));
diff --git a/data/fields/virtual-packages b/data/fields/virtual-packages
index 294a5ac..ba2af61 100644
--- a/data/fields/virtual-packages
+++ b/data/fields/virtual-packages
@@ -8,8 +8,12 @@
# separated by comma and/or white space. Multiple "Keep: " lines can be used
# as well.
#
-# Last updated: 2010-04-13
+# Last updated: 2010-05-07
+# Keep: xserver-xorg-input, xserver-xorg-input-2, xserver-xorg-input-2.1
+# Keep: xserver-xorg-input-4
+# Keep: xserver-xorg-video, xserver-xorg-video-1.0, xserver-xorg-video-1.9
+# Keep: xserver-xorg-video-2, xserver-xorg-video-4, xserver-xorg-video-5
aide-binary
alsaplayer-interface
@@ -115,7 +119,6 @@ java-compiler
java-runtime
java-runtime-headless
java-sdk
-java-virtual-machine
java1-runtime
java1-runtime-headless
java2-runtime
@@ -128,6 +131,9 @@ java6-runtime
java6-runtime-headless
java6-sdk
kde-l10n
+kde-minimal
+kdevelop-l10n
+kdevplatform-l10n
kernel-manual-2.6
kfreebsd-source
kfreebsd-source-7
@@ -181,22 +187,22 @@ libstlport-dev
libyaz-dev
libzip-ruby
licq-plugin
-linux-doc-2.6
linux-headers
linux-headers-2.6
linux-image
linux-image-2.6
linux-initramfs-tool
linux-kernel-log-daemon
-linux-latest-modules-2.6.32-3-486
-linux-latest-modules-2.6.32-3-686
-linux-latest-modules-2.6.32-3-686-bigmem
-linux-latest-modules-2.6.32-3-amd64
-linux-latest-modules-2.6.32-3-vserver-686
-linux-latest-modules-2.6.32-3-vserver-686-bigmem
+linux-latest-modules-2.6.32-5-486
+linux-latest-modules-2.6.32-5-686
+linux-latest-modules-2.6.32-5-686-bigmem
+linux-latest-modules-2.6.32-5-amd64
+linux-latest-modules-2.6.32-5-openvz-686
+linux-latest-modules-2.6.32-5-vserver-686
+linux-latest-modules-2.6.32-5-vserver-686-bigmem
+linux-latest-modules-2.6.32-5-xen-686
linux-manual
linux-source
-linux-source-2.6
lisp-compiler
lsb-qt4-ia32
lsb-qt4-noarch
@@ -331,8 +337,18 @@ x-window-manager
xen-hypervisor
xen-hypervisor-3.4
xmp-player
+xorg-driver-video
xserver
+xserver-xorg-input
+xserver-xorg-input-2
+xserver-xorg-input-2.1
xserver-xorg-input-4
xserver-xorg-input-7
+xserver-xorg-video
+xserver-xorg-video-1.0
+xserver-xorg-video-1.9
+xserver-xorg-video-2
+xserver-xorg-video-4
+xserver-xorg-video-5
xserver-xorg-video-6
zcode-interpreter
diff --git a/debian/changelog b/debian/changelog
index b653670..1855a56 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,21 @@
lintian (2.4.2) UNRELEASED; urgency=low
+ * checks/fields:
+ + [RA] Allow Breaks without a version if the broken package is a
+ virtual package.
* checks/huge-usr-share{,.desc}:
+ [RA] Count file size from the tar listing rather than using du. The
results of du vary based on file system and other factors and make
the tag difficult to test.
+ * data/fields/virtual-packages:
+ + [RA] Update to current unstable and add the old xserver-xorg video
+ and input virtual packages.
+
+ * private/refresh-virtual-packages-data:
+ + [RA] Fix handling of # Keep: lines to work correctly now that
+ virtual packages mentioned only once are excluded.
+
-- Russ Allbery <rra@debian.org> Thu, 06 May 2010 20:59:04 -0700
lintian (2.4.1) unstable; urgency=low
diff --git a/private/refresh-virtual-packages-data b/private/refresh-virtual-packages-data
index 9c3e033..fa6d867 100755
--- a/private/refresh-virtual-packages-data
+++ b/private/refresh-virtual-packages-data
@@ -102,9 +102,13 @@ if [ -z "$packages" ] ; then
packages="$workdir/Packages.gz"
fi
+# We have to repeat all the Keep packages twice, since we filter out any
+# virtual packages that are only used once in the archive.
{ zcat "$packages"
sed -rn 's/^#\s*Keep:\s*/Provides: /;T;s/([^,:])\s+([^,])/\1, \2/g;p' \
"$workdir/virtual-packages"
+ sed -rn 's/^#\s*Keep:\s*/Provides: /;T;s/([^,:])\s+([^,])/\1, \2/g;p' \
+ "$workdir/virtual-packages"
} |
perl -w -E 'my (%seen, %pkgs);
while (<>) {
diff --git a/t/COVERAGE b/t/COVERAGE
index 7e28ee5..dcba76b 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-04-03
+Last generated 2010-05-07
The following tags are not tested by the test suite:
@@ -18,8 +18,6 @@ changelog-file wrong-name-for-upstream-changelog
changes-file bad-section-in-changes-file
changes-file checksum-mismatch-in-changes-file
changes-file file-size-mismatch-in-changes-file
-changes-file no-description-in-changes-file
-changes-file no-urgency-in-changes-file
control-file debian-control-file-is-a-symlink
control-file debian-control-with-duplicate-fields
@@ -225,8 +223,6 @@ changelog-file debian-changelog-file-uses-obsolete-national-encoding
changelog-file debian-news-file-not-compressed
changelog-file wrong-name-for-debian-news-file
-changes-file bad-ubuntu-distribution-in-changes-file
-
control-file debian-control-file-uses-obsolete-national-encoding
control-file section-area-mismatch
control-file xs-vcs-header-in-debian-control
@@ -234,7 +230,6 @@ control-file xs-vcs-header-in-debian-control
control-files control-file-has-bad-permissions
control-files control-file-is-empty
-copyright-file copyright-file-lacks-pointer-to-perl-license
copyright-file old-fsf-address-in-copyright-file
copyright-file usr-share-doc-symlink-without-dependency
@@ -273,7 +268,6 @@ debhelper uses-dh-python-with-no-pycompat
etcfiles file-in-etc-not-marked-as-conffile
fields bad-version-in-relation
-fields breaks-without-version
fields build-conflicts-with-build-dependency
fields build-depends-indep-without-arch-indep
fields build-depends-on-1-revision
@@ -727,7 +721,6 @@ maintainer-scripts
relations
bad-version-in-relation
- breaks-without-version
build-conflicts-with-build-dependency
build-depends-on-1-revision
build-depends-on-build-essential
@@ -757,9 +750,7 @@ relations
virtual-package-depends-without-real-package-depends
scripts
- bad-ubuntu-distribution-in-changes-file
calls-suidperl-directly
- copyright-file-lacks-pointer-to-perl-license
debian-watch-file-specifies-old-upstream-version
duplicate-updaterc.d-calls-in-postrm
executable-is-not-world-readable
diff --git a/t/tests/fields-depends-general/debian/debian/control.in b/t/tests/fields-depends-general/debian/debian/control.in
index b6eacaa..c057dc6 100644
--- a/t/tests/fields-depends-general/debian/debian/control.in
+++ b/t/tests/fields-depends-general/debian/debian/control.in
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~), xorg-dev, java-propose-classpath,
Package: {$srcpkg}
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, xorg
+Breaks: package-without-version
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
@@ -21,6 +22,7 @@ Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Recommends: debconf-doc
Section: libs
+Breaks: xserver-xorg-video-6
Description: {$description} -- fake library
This is a fake library 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/fields-depends-general/desc b/t/tests/fields-depends-general/desc
index b96304f..910bc12 100644
--- a/t/tests/fields-depends-general/desc
+++ b/t/tests/fields-depends-general/desc
@@ -3,6 +3,7 @@ Sequence: 6000
Version: 1.0
Description: General tests for package dependencies
Test-For:
+ breaks-without-version
build-depends-on-metapackage
build-depends-on-non-build-package
build-depends-on-python-dev-with-no-arch-any
diff --git a/t/tests/fields-depends-general/tags b/t/tests/fields-depends-general/tags
index 8d0162a..1da2cc1 100644
--- a/t/tests/fields-depends-general/tags
+++ b/t/tests/fields-depends-general/tags
@@ -7,4 +7,5 @@ E: fields-depends-general source: invalid-arch-string-in-source-relation i3!86 [
E: fields-depends-general source: invalid-arch-string-in-source-relation source [build-depends: baz [source i3!86]]
E: fields-depends-general: depends-on-metapackage depends: xorg
W: fields-depends-general source: build-depends-on-python-dev-with-no-arch-any
+W: fields-depends-general: breaks-without-version package-without-version
W: libfields-depends-general: lib-recommends-documentation recommends: debconf-doc
--
Debian package checker
Reply to: