[SCM] Debian package checker branch, master, updated. 2.4.1-12-g45e5964
The following commit has been merged in the master branch:
commit 45e596445c4806bfb64390a1a6dc4ff0bd7d2538
Author: Russ Allbery <rra@debian.org>
Date: Sat May 15 15:42:55 2010 -0700
Replace package-type-in-debian-control with xc-package-type...
* checks/control-file{,.desc}:
+ [RA] Remove package-type-in-debian-control now that dpkg-dev handles
it as desired by the d-i team. xc-package-type-in-debian-control
replaces it as a pedantic check to encourage switching to the
official name. Thanks, Raphael Hertzog.
diff --git a/checks/control-file b/checks/control-file
index 93a9bd6..ff3762c 100644
--- a/checks/control-file
+++ b/checks/control-file
@@ -71,8 +71,8 @@ while (<CONTROL>) {
tag "xs-vcs-header-in-debian-control", "$field"
if $known_source_fields{$base};
}
- if ($field eq 'package-type') {
- tag "package-type-in-debian-control", "line $.";
+ if ($field eq 'xc-package-type') {
+ tag 'xc-package-type-in-debian-control', "line $.";
}
unless (/^\S+: \S/ || /^\S+:$/) {
tag 'debian-control-has-unusual-field-spacing', "line $.";
diff --git a/checks/control-file.desc b/checks/control-file.desc
index 839c421..205af60 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -87,13 +87,15 @@ Info: There is an XS-Vcs-* field in the <tt>debian/control</tt> file. As
recognizes these headers and handles them correctly. Consider removing
the XS- prefix for this field.
-Tag: package-type-in-debian-control
-Severity: minor
+Tag: xc-package-type-in-debian-control
+Severity: pedantic
Certainty: certain
-Info: The <tt>debian/control</tt> file contains a Package-Type field.
- This field is only relevant to the build process and should
- not be embedded in the resulting binary package, so XC-Package-Type
- should be used instead.
+Info: The <tt>debian/control</tt> file contains an XC-Package-Type field.
+ As of dpkg-dev 1.15.7, the dpkg development utilities recognize
+ Package-Type as an official field name and do not add it to binary
+ packages (the previous concern with the dpkg-dev-supported Package-Type
+ field). XC-Package-Type should generally now be replaced with
+ Package-Type.
Tag: stronger-dependency-implies-weaker
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index dd57e71..a2c1843 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,15 @@ lintian (2.4.2) UNRELEASED; urgency=low
* Summary of tag changes:
+ Added:
- init.d-script-depends-on-unknown-virtual-facility
+ - xc-package-type-in-debian-control (pedantic)
+ + Removed:
+ - package-type-in-debian-control
+ * checks/control-file{,.desc}:
+ + [RA] Remove package-type-in-debian-control now that dpkg-dev handles
+ it as desired by the d-i team. xc-package-type-in-debian-control
+ replaces it as a pedantic check to encourage switching to the
+ official name. Thanks, Raphael Hertzog.
* checks/fields:
+ [RA] Allow Breaks without a version if the broken package is a
virtual package.
diff --git a/t/COVERAGE b/t/COVERAGE
index dcba76b..4ee85e9 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-05-07
+Last generated 2010-05-15
The following tags are not tested by the test suite:
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index 269007c..0e1df26 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -64,9 +64,21 @@ Section: {$section}
Architecture: {$architecture}
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}, foo |
bar (>= 1), baz
-Package-Type: deb
Description: {$description} (four)
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
things. It should not be installed like a regular package. It may
be an empty package.
+
+Package: {$srcpkg}-udeb
+Section: debian-installer
+Package-Type: udeb
+Architecture: {$architecture}
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: {$description} (udeb)
+ udeb tests.
+ .
+ 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
+ things. It should not be installed like a regular package. It may
+ be an empty package.
diff --git a/t/tests/control-file-general/desc b/t/tests/control-file-general/desc
index e191cb3..479b4e2 100644
--- a/t/tests/control-file-general/desc
+++ b/t/tests/control-file-general/desc
@@ -11,7 +11,6 @@ Test-For:
no-section-field-for-source
obsolete-relation-form-in-source
package-depends-on-itself
- package-type-in-debian-control
stronger-dependency-implies-weaker
References: Debian Bug#30020, Debian Bug#409099, Debian Bug#516706,
Debian Bug#533202, Debian Bug#557971, Debian Bug#573399
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index b256cf3..3d277d4 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -3,12 +3,10 @@ E: control-file-general source: missing-separator-between-items in control-file-
I: control-file-general source: binary-control-field-duplicates-source field "maintainer" in package control-file-general
I: control-file-general source: duplicate-long-description control-file-general control-file-general-1 control-file-general-2 control-file-general-3 control-file-general-4
I: control-file-general source: duplicate-short-description control-file-general control-file-general-1
-I: control-file-general-4: unknown-field-in-control package-type
W: control-file-general source: no-section-field-for-source
W: control-file-general source: obsolete-relation-form-in-source in control-file-general-1 conflicts: libsqlite3-0 (< 3.6.12)
W: control-file-general source: obsolete-relation-form-in-source in source build-depends-indep: perl (> 5.8)
W: control-file-general source: package-depends-on-itself control-file-general depends
-W: control-file-general source: package-type-in-debian-control line 67
W: control-file-general source: stronger-dependency-implies-weaker control-file-general depends -> recommends foo
W: control-file-general source: stronger-dependency-implies-weaker control-file-general depends -> suggests bar | baz
W: control-file-general source: stronger-dependency-implies-weaker control-file-general recommends -> suggests bar | baz
diff --git a/t/templates/pedantic/debian/control.in b/t/tests/control-file-pedantic/debian/debian/control.in
similarity index 81%
copy from t/templates/pedantic/debian/control.in
copy to t/tests/control-file-pedantic/debian/debian/control.in
index 838998b..405b4e5 100644
--- a/t/templates/pedantic/debian/control.in
+++ b/t/tests/control-file-pedantic/debian/debian/control.in
@@ -3,12 +3,14 @@ Priority: extra
Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
-Build-Depends: debhelper (>= 7.0.50~)
+Build-Depends: debhelper (>= 7)
Homepage: http://lintian.debian.org/
-Package: {$srcpkg}
+Package: {$srcpkg}-udeb
+Section: debian-installer
Architecture: {$architecture}
Depends: $\{misc:Depends\}
+XC-Package-Type: udeb
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/control-file-pedantic/desc b/t/tests/control-file-pedantic/desc
new file mode 100644
index 0000000..1a5a75f
--- /dev/null
+++ b/t/tests/control-file-pedantic/desc
@@ -0,0 +1,7 @@
+Testname: control-file-pedantic
+Sequence: 6000
+Version: 1.0
+Skeleton: pedantic
+Options: --pedantic -I -E
+Description: Pedantic tests for control file issues
+Test-For: xc-package-type-in-debian-control
diff --git a/t/tests/control-file-pedantic/tags b/t/tests/control-file-pedantic/tags
new file mode 100644
index 0000000..3e9e413
--- /dev/null
+++ b/t/tests/control-file-pedantic/tags
@@ -0,0 +1 @@
+P: control-file-pedantic source: xc-package-type-in-debian-control line 13
--
Debian package checker
Reply to: