[SCM] Debian package checker branch, master, updated. 2.2.10-60-g30cb1ee
The following commit has been merged in the master branch:
commit 30cb1ee24d9430e4256ee90b21efc52757e9859b
Author: Adam D. Barratt <adam@adam-barratt.org.uk>
Date: Wed May 27 21:09:48 2009 +0100
Update magic-arch-in-arch-list in line with recent dpkg-source changes
* checks/fields{,.desc}:
+ [ADB] Accept Architecture fields in .dsc files which contain both
"all" and one or more binary architectures. (Closes: #530565)
diff --git a/checks/fields b/checks/fields
index a46e97c..3acb4c4 100644
--- a/checks/fields
+++ b/checks/fields
@@ -341,7 +341,7 @@ if (not defined $info->field('architecture')) {
my @archs = split / /, $archs;
- if (@archs > 1 && grep { $_ eq "any" || $_ eq "all" } @archs) {
+ if (@archs > 1 && grep { $_ eq "any" || ($type ne "source" && $_ eq "all") } @archs) {
tag "magic-arch-in-arch-list", "";
}
diff --git a/checks/fields.desc b/checks/fields.desc
index 49a3ecb..48dca29 100644
--- a/checks/fields.desc
+++ b/checks/fields.desc
@@ -80,8 +80,9 @@ Ref: policy 5.3
Tag: magic-arch-in-arch-list
Severity: serious
Certainty: certain
-Info: The special architecture values "all" and "any" only make sense if
- they occur alone.
+Info: The special architecture value "any" only make sense if it occurs
+ alone. The value "all" may appear together with other architectures
+ in a *.dsc file but must occur alone if used in a binary package.
Ref: policy 5.6.8
Tag: unknown-architecture
diff --git a/debian/changelog b/debian/changelog
index 07d7435..519ce33 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ lintian (2.2.11) UNRELEASED; urgency=low
to python-central. Thanks, Bernd Zeimetz. (Closes: #525997)
+ [ADB] Refer to contrib and non-free as "archive areas" rather than
distributions.
+ + [ADB] Accept Architecture fields in .dsc files which contain both
+ "all" and one or more binary architectures. (Closes: #530565)
* checks/files.desc:
+ [RA] Downgrade symlink-has-double-slash and symlink-ends-with-slash
to minor. These are violations of a Policy should, but are unlikely
diff --git a/t/source/cruft-ancient-file/Makefile b/t/source/magic-architecture-srcpkg-ok/Makefile
similarity index 82%
copy from t/source/cruft-ancient-file/Makefile
copy to t/source/magic-architecture-srcpkg-ok/Makefile
index 3af9fb3..b3d7eea 100644
--- a/t/source/cruft-ancient-file/Makefile
+++ b/t/source/magic-architecture-srcpkg-ok/Makefile
@@ -1,10 +1,9 @@
-name = cruft-ancient-file
+name = magic-architecture-srcpkg-ok
dir = $(name)-1.0
all:
mkdir $(dir)
echo 'Some upstream README' > $(dir)/README
- env TZ=GMT touch -t 197001010000 $(dir)/README
tar -c -f $(name)_1.0.orig.tar.gz -z $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
diff --git a/t/source/magic-architecture-srcpkg-ok/changelog b/t/source/magic-architecture-srcpkg-ok/changelog
new file mode 100644
index 0000000..60deb05
--- /dev/null
+++ b/t/source/magic-architecture-srcpkg-ok/changelog
@@ -0,0 +1,9 @@
+magic-architecture-srcpkg-ok (1.0-1) unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: magic-architecture-srcpkg-ok
+
+ * Suppress "should close ITP bug" messages. (Closes: #123456)
+
+ -- Debian Lintian Maintainers <lintian-maint@debian.org> Wed, 27 May 2009 19:46:03 +0100
+
diff --git a/t/source/magic-architecture-srcpkg-ok/control b/t/source/magic-architecture-srcpkg-ok/control
new file mode 100644
index 0000000..fadf8de
--- /dev/null
+++ b/t/source/magic-architecture-srcpkg-ok/control
@@ -0,0 +1,22 @@
+Source: magic-architecture-srcpkg-ok
+Section: devel
+Priority: optional
+Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.8.1
+
+Package: magic-architecture-srcpkg-ok-data
+Architecture: all
+Depends: ${misc:Depends}
+Description: Test package for "all" plus specific architectures in .dscs
+ 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.
+
+Package: magic-architecture-srcpkg-ok
+Architecture: amd64
+Depends: ${misc:Depends}
+Description: Test package for "all" plus specific architectures in .dscs
+ 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.
diff --git a/t/debs/deb-format-ancient-file/copyright b/t/source/magic-architecture-srcpkg-ok/copyright
similarity index 100%
copy from t/debs/deb-format-ancient-file/copyright
copy to t/source/magic-architecture-srcpkg-ok/copyright
diff --git a/t/source/cruft-ancient-file/rules b/t/source/magic-architecture-srcpkg-ok/rules
similarity index 100%
copy from t/source/cruft-ancient-file/rules
copy to t/source/magic-architecture-srcpkg-ok/rules
diff --git a/t/source/magic-architecture-srcpkg-ok/tags b/t/source/magic-architecture-srcpkg-ok/tags
new file mode 100644
index 0000000..3babbaf
--- /dev/null
+++ b/t/source/magic-architecture-srcpkg-ok/tags
@@ -0,0 +1,2 @@
+I: magic-architecture-srcpkg-ok source: duplicate-long-description magic-architecture-srcpkg-ok-data magic-architecture-srcpkg-ok
+I: magic-architecture-srcpkg-ok source: duplicate-short-description magic-architecture-srcpkg-ok-data magic-architecture-srcpkg-ok
diff --git a/t/source/cruft-ancient-file/Makefile b/t/source/magic-architecture-srcpkg-wrong/Makefile
similarity index 75%
copy from t/source/cruft-ancient-file/Makefile
copy to t/source/magic-architecture-srcpkg-wrong/Makefile
index 3af9fb3..20f75a1 100644
--- a/t/source/cruft-ancient-file/Makefile
+++ b/t/source/magic-architecture-srcpkg-wrong/Makefile
@@ -1,16 +1,15 @@
-name = cruft-ancient-file
+name = magic-architecture-srcpkg-wrong
dir = $(name)-1.0
all:
mkdir $(dir)
echo 'Some upstream README' > $(dir)/README
- env TZ=GMT touch -t 197001010000 $(dir)/README
tar -c -f $(name)_1.0.orig.tar.gz -z $(dir)
mkdir $(dir)/debian
cp changelog copyright control rules $(dir)/debian/
echo 7 > $(dir)/debian/compat
echo '# foo' > $(dir)/debian/watch
- dpkg-source -sp -b $(dir)
+ dpkg-source -DArchitecture="amd64 any" -sp -b $(dir)
clean:
rm -rf $(dir)
diff --git a/t/source/magic-architecture-srcpkg-wrong/changelog b/t/source/magic-architecture-srcpkg-wrong/changelog
new file mode 100644
index 0000000..9652187
--- /dev/null
+++ b/t/source/magic-architecture-srcpkg-wrong/changelog
@@ -0,0 +1,9 @@
+magic-architecture-srcpkg-wrong (1.0-1) unstable; urgency=low
+
+ * Lintian Test Suite.
+ * Test: magic-architecture-srcpkg-wrong
+
+ * Suppress "should close ITP bug" messages. (Closes: #123456)
+
+ -- Debian Lintian Maintainers <lintian-maint@debian.org> Wed, 27 May 2009 19:46:03 +0100
+
diff --git a/t/source/cruft-ancient-file/control b/t/source/magic-architecture-srcpkg-wrong/control
similarity index 67%
copy from t/source/cruft-ancient-file/control
copy to t/source/magic-architecture-srcpkg-wrong/control
index f1cfc89..cd8c10a 100644
--- a/t/source/cruft-ancient-file/control
+++ b/t/source/magic-architecture-srcpkg-wrong/control
@@ -1,14 +1,14 @@
-Source: cruft-ancient-file
+Source: magic-architecture-srcpkg-wrong
Section: devel
Priority: optional
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
Build-Depends: debhelper (>= 7)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
-Package: cruft-ancient-file
+Package: magic-architecture-srcpkg-wrong
Architecture: all
Depends: ${misc:Depends}
-Description: Test package for ancient files producing tar errors
+Description: Test package for "any" plus specific architectures in .dscs
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.
diff --git a/t/debs/deb-format-ancient-file/copyright b/t/source/magic-architecture-srcpkg-wrong/copyright
similarity index 100%
copy from t/debs/deb-format-ancient-file/copyright
copy to t/source/magic-architecture-srcpkg-wrong/copyright
diff --git a/t/source/cruft-ancient-file/rules b/t/source/magic-architecture-srcpkg-wrong/rules
similarity index 100%
copy from t/source/cruft-ancient-file/rules
copy to t/source/magic-architecture-srcpkg-wrong/rules
diff --git a/t/source/magic-architecture-srcpkg-wrong/tags b/t/source/magic-architecture-srcpkg-wrong/tags
new file mode 100644
index 0000000..f282ad1
--- /dev/null
+++ b/t/source/magic-architecture-srcpkg-wrong/tags
@@ -0,0 +1 @@
+E: magic-architecture-srcpkg-wrong source: magic-arch-in-arch-list
--
Debian package checker
Reply to: