[SCM] Debian package checker branch, master, updated. 2.5.11-180-g11eb576
The following commit has been merged in the master branch:
commit 11eb5764c89fc38d8d49b556e9c4e3a532f1b36b
Author: Niels Thykier <niels@thykier.net>
Date: Thu Feb 21 18:53:45 2013 +0100
c/fields: Warn on font packages without a M-A field
Warn on font packages without a Multi-Arch field or if its value
is not foreign (or "allowed").
[nthykier: merge two conditions and remove a level of indentation]
Signed-off-by: Vasudev Kamath <kamathvasudev@gmail.com>
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/fields b/checks/fields
index 184bf51..3536bf5 100644
--- a/checks/fields
+++ b/checks/fields
@@ -317,6 +317,13 @@ if (defined $info->field('multi-arch')){
}
}
+if ($type eq 'binary'){
+ if ($pkg =~ /^fonts-/) {
+ tag 'font-package-not-multi-arch-foreign'
+ unless $info->field ('multi-arch', 'no') =~ m/^foreign|allowed$/o;
+ }
+}
+
#---- Architecture
if (not defined $info->field('architecture')) {
diff --git a/checks/fields.desc b/checks/fields.desc
index cdce7c1..41b2119 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -130,6 +130,17 @@ Info: The package is architecture all and has the Multi-Arch same value.
This combination is not allowed by the Multi-Arch specification.
Ref: https://wiki.ubuntu.com/MultiarchSpec
+Tag: font-package-not-multi-arch-foreign
+Severity: normal
+Certainty: certain
+Info: This package is architecture all and hence requires a Multi-Arch
+ foreign value.
+ .
+ An Architecture: all package to satisfy the dependencies of a
+ foreign-architecture package, it must be marked Multi-Arch: foreign
+ or Multi-Arch: allowed.
+Ref: https://wiki.ubuntu.com/MultiarchSpec#Dependencies_involving_Architecture:_all_packages/
+
Tag: aspell-package-not-arch-all
Severity: normal
Certainty: certain
diff --git a/debian/changelog b/debian/changelog
index f698d92..9ced827 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ lintian (2.5.12) UNRELEASED; urgency=low
- dir-or-file-in-build-tree
- dir-or-file-in-etc-opt
- dir-or-file-in-home
+ - font-package-not-multi-arch-foreign
- illegal-runtime-test-name
- inconsistent-testsuite-field
- license-problem-gfdl-invariants
@@ -62,6 +63,9 @@ lintian (2.5.12) UNRELEASED; urgency=low
+ [NT] Skip "depends-on-packaging-dev" for metapackages.
+ [NT] Apply patch from Gregor Herrmann to catch metacpan
homepage links with versions. (Closes: #700110)
+ + [NT] Apply patch from Vasudev Kamath to detect fonts
+ packages without a Multi-Arch foreign (or allowed) field.
+ (Closes: #701061)
* checks/files{,.desc}:
+ [NT] Apply patch from Bastien Roucariès to catch paths
in (common) build dirs. (Closes: #678857)
diff --git a/t/tests/files-adobe-font/debian/debian/control.in b/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
similarity index 71%
copy from t/tests/files-adobe-font/debian/debian/control.in
copy to t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
index 09fae11..0c21d0f 100644
--- a/t/tests/files-adobe-font/debian/debian/control.in
+++ b/t/tests/fields-font-not-multiarch-foreign/debian/debian/control.in
@@ -1,6 +1,6 @@
Source: {$srcpkg}
Priority: extra
-Section: fonts
+Section: {$section}
Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 9)
@@ -9,9 +9,9 @@ Homepage: http://lintian.debian.org/
Package: fonts-{$srcpkg}
Architecture: {$architecture}
Depends: $\{misc:Depends\}
-Description: {$description}
+Description: {$description} (okay)
+ Font package containing fonts.
+ .
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.
-
+ things. It should not be installed like a regular package.
diff --git a/t/tests/fields-font-not-multiarch-foreign/debian/debian/fonts-fields-font-not-multiarch-foreign.install b/t/tests/fields-font-not-multiarch-foreign/debian/debian/fonts-fields-font-not-multiarch-foreign.install
new file mode 100644
index 0000000..19a2037
--- /dev/null
+++ b/t/tests/fields-font-not-multiarch-foreign/debian/debian/fonts-fields-font-not-multiarch-foreign.install
@@ -0,0 +1,2 @@
+font-multiarch-test.ttf usr/share/fonts/truetype
+font.ttf usr/share/fonts/truetype
diff --git a/t/tests/files-fonts/debian/4shadow.ttf b/t/tests/fields-font-not-multiarch-foreign/debian/font-multiarch-test.ttf
similarity index 100%
copy from t/tests/files-fonts/debian/4shadow.ttf
copy to t/tests/fields-font-not-multiarch-foreign/debian/font-multiarch-test.ttf
diff --git a/t/tests/files-fonts/debian/font.ttf b/t/tests/fields-font-not-multiarch-foreign/debian/font.ttf
similarity index 100%
copy from t/tests/files-fonts/debian/font.ttf
copy to t/tests/fields-font-not-multiarch-foreign/debian/font.ttf
diff --git a/t/tests/fields-font-not-multiarch-foreign/desc b/t/tests/fields-font-not-multiarch-foreign/desc
new file mode 100644
index 0000000..5167607
--- /dev/null
+++ b/t/tests/fields-font-not-multiarch-foreign/desc
@@ -0,0 +1,6 @@
+Testname: fields-font-not-multiarch-foreign
+Sequence: 6000
+Version: 1.0
+Description: Font package Multi-Arch checks
+Test-For:
+ font-package-not-multi-arch-foreign
diff --git a/t/tests/fields-font-not-multiarch-foreign/tags b/t/tests/fields-font-not-multiarch-foreign/tags
new file mode 100644
index 0000000..b0d696b
--- /dev/null
+++ b/t/tests/fields-font-not-multiarch-foreign/tags
@@ -0,0 +1 @@
+W: fonts-fields-font-not-multiarch-foreign: font-package-not-multi-arch-foreign
diff --git a/t/tests/files-adobe-font/debian/debian/control.in b/t/tests/files-adobe-font/debian/debian/control.in
index 09fae11..141f232 100644
--- a/t/tests/files-adobe-font/debian/debian/control.in
+++ b/t/tests/files-adobe-font/debian/debian/control.in
@@ -9,6 +9,7 @@ Homepage: http://lintian.debian.org/
Package: fonts-{$srcpkg}
Architecture: {$architecture}
Depends: $\{misc:Depends\}
+Multi-Arch: foreign
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
--
Debian package checker
Reply to: