[SCM] Debian package checker branch, master, updated. 2.3.3-74-g317d91d
The following commit has been merged in the master branch:
commit 317d91d162feee7133e64bdd64f65281897b4539
Author: Russ Allbery <rra@debian.org>
Date: Sun Mar 21 20:50:03 2010 -0700
Tweak package-type-in-debian-control and add test and changelog
Add test suite and changelog for package-type-in-debian-control, reduce
the severity, and improve the long description.
* checks/control-file:
+ [RA] Warn about Package-Type instead of XC-Package-Type in
debian/control. Patch from Cyril Brulebois. (Closes: #573399)
diff --git a/checks/control-file.desc b/checks/control-file.desc
index b9abdee..839c421 100644
--- a/checks/control-file.desc
+++ b/checks/control-file.desc
@@ -88,12 +88,12 @@ Info: There is an XS-Vcs-* field in the <tt>debian/control</tt> file. As
the XS- prefix for this field.
Tag: package-type-in-debian-control
-Severity: important
+Severity: minor
Certainty: certain
-Info: There is a Package-Type field in the <tt>debian/control</tt>
- file. This field is only relevant to the build process and should
- not be embedded in the resulting binary package. As a consequence,
- XC-Package-Type should be used instead.
+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.
Tag: stronger-dependency-implies-weaker
Severity: normal
diff --git a/debian/changelog b/debian/changelog
index 41a49a1..3ad5d49 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ lintian (2.3.4) UNRELEASED; urgency=low
- empty-binary-package
- incorrect-locale-code
- missing-debian-source-format
+ - package-type-in-debian-control
- possible-new-upstream-release-without-new-version
- star-file
- unknown-file-in-debian-source
@@ -31,6 +32,8 @@ lintian (2.3.4) UNRELEASED; urgency=low
contain substvars other than *:Depends substvars, since substvars
may be used to assemble the components of a dependency. Thanks,
Matthias Klose. (Closes: #573815)
+ + [RA] Warn about Package-Type instead of XC-Package-Type in
+ debian/control. Patch from Cyril Brulebois. (Closes: #573399)
* checks/cruft{,.desc}:
+ [RA] Provide more information in native-package-with-dash-version
long description about how native packages can be created by
diff --git a/t/tests/control-file-general/debian/debian/control.in b/t/tests/control-file-general/debian/debian/control.in
index 8848925..fd5ff1e 100644
--- a/t/tests/control-file-general/debian/debian/control.in
+++ b/t/tests/control-file-general/debian/debian/control.in
@@ -64,6 +64,7 @@ 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
diff --git a/t/tests/control-file-general/desc b/t/tests/control-file-general/desc
index 40ab23e..e191cb3 100644
--- a/t/tests/control-file-general/desc
+++ b/t/tests/control-file-general/desc
@@ -11,6 +11,7 @@ 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#533202, Debian Bug#557971, Debian Bug#573399
diff --git a/t/tests/control-file-general/tags b/t/tests/control-file-general/tags
index 425b88f..cc22ce3 100644
--- a/t/tests/control-file-general/tags
+++ b/t/tests/control-file-general/tags
@@ -3,10 +3,12 @@ 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
--
Debian package checker
Reply to: