[SCM] Debian package checker branch, master, updated. 2.5.1-23-g87368cb
The following commit has been merged in the master branch:
commit 87368cb1f5e8bdffcb7d106f23d4eb3c9017abe8
Author: Niels Thykier <niels@thykier.net>
Date: Mon Jun 27 20:46:07 2011 +0200
Refactored the multi-arch test for the future
Future versions of dpkg are expected to reject generating debs
with an invalid Multi-Arch field, so this test has been moved
from fields-multi-arch into its own separate test.
diff --git a/t/debs/fields-multi-arch-illegal/Makefile b/t/debs/fields-multi-arch-illegal/Makefile
index 787ed5d..9a36520 100644
--- a/t/debs/fields-multi-arch-illegal/Makefile
+++ b/t/debs/fields-multi-arch-illegal/Makefile
@@ -1,14 +1,16 @@
+name = fields-multi-arch-illegal
+
all:
echo '2.0' > debian-binary
- mkdir -p usr/share/doc/fields-multi-arch-illegal
- cp copyright changelog usr/share/doc/fields-multi-arch-illegal
- gzip -9 usr/share/doc/fields-multi-arch-illegal/changelog
+ mkdir -p usr/share/doc/$(name)
+ cp copyright changelog usr/share/doc/$(name)
+ gzip -9 usr/share/doc/$(name)/changelog
tar czf data.tar.gz usr
chown 0:0 control
chmod 644 control
- md5sum usr/share/doc/fields-multi-arch-illegal/* > md5sums
+ md5sum usr/share/doc/$(name)/* > md5sums
tar cfz control.tar.gz control md5sums
- ar rc fields-multi-arch-illegal.deb \
+ ar rc $(name).deb \
debian-binary control.tar.gz data.tar.gz
clean:
diff --git a/t/debs/fields-obsolete-relation/Makefile b/t/debs/fields-multi-arch-unknown/Makefile
similarity index 87%
copy from t/debs/fields-obsolete-relation/Makefile
copy to t/debs/fields-multi-arch-unknown/Makefile
index 9fcd420..35de369 100644
--- a/t/debs/fields-obsolete-relation/Makefile
+++ b/t/debs/fields-multi-arch-unknown/Makefile
@@ -1,11 +1,11 @@
-name = fields-obsolete-relation
+name = fields-multi-arch-unknown
all:
echo '2.0' > debian-binary
mkdir -p usr/share/doc/$(name)
cp copyright changelog usr/share/doc/$(name)
gzip -9 usr/share/doc/$(name)/changelog
- tar cfz data.tar.gz usr
+ tar czf data.tar.gz usr
chown 0:0 control
chmod 644 control
md5sum usr/share/doc/$(name)/* > md5sums
diff --git a/t/debs/deb-format-lzma/changelog b/t/debs/fields-multi-arch-unknown/changelog
similarity index 68%
copy from t/debs/deb-format-lzma/changelog
copy to t/debs/fields-multi-arch-unknown/changelog
index 2fbdc04..c8bfe34 100644
--- a/t/debs/deb-format-lzma/changelog
+++ b/t/debs/fields-multi-arch-unknown/changelog
@@ -1,4 +1,4 @@
-deb-format-lzma (1.0) unstable; urgency=low
+fields-multi-arch-unknown (1.0) unstable; urgency=low
* A Lintian test case.
diff --git a/t/debs/deb-format-extra-member/control b/t/debs/fields-multi-arch-unknown/control
similarity index 75%
copy from t/debs/deb-format-extra-member/control
copy to t/debs/fields-multi-arch-unknown/control
index 4dc22ed..df7773e 100644
--- a/t/debs/deb-format-extra-member/control
+++ b/t/debs/fields-multi-arch-unknown/control
@@ -1,10 +1,11 @@
-Package: deb-format-extra-member
+Package: fields-multi-arch-unknown
Version: 1.0
Architecture: all
+Multi-arch: cheese
Maintainer: Debian Lintian Maintainers <lintian-maint@debian.org>
Section: devel
Priority: extra
-Description: Test package for an ar archive in the wrong order
+Description: Test package with an unknown Multi-arch value
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
diff --git a/t/debs/control-field-traversal-4/copyright b/t/debs/fields-multi-arch-unknown/copyright
similarity index 100%
copy from t/debs/control-field-traversal-4/copyright
copy to t/debs/fields-multi-arch-unknown/copyright
diff --git a/t/debs/fields-multi-arch-unknown/tags b/t/debs/fields-multi-arch-unknown/tags
new file mode 100644
index 0000000..bc8bbb8
--- /dev/null
+++ b/t/debs/fields-multi-arch-unknown/tags
@@ -0,0 +1 @@
+E: fields-multi-arch-unknown: unknown-multi-arch-value fields-multi-arch-unknown cheese
diff --git a/t/tests/fields-multi-arch/debian/debian/control.in b/t/tests/fields-multi-arch/debian/debian/control.in
index 2635b44..3bea942 100644
--- a/t/tests/fields-multi-arch/debian/debian/control.in
+++ b/t/tests/fields-multi-arch/debian/debian/control.in
@@ -5,18 +5,6 @@ Maintainer: {$author}
Standards-Version: {$standards_version}
Build-Depends: debhelper (>= 7.0.50~)
-Package: {$srcpkg}-some
-Architecture: any
-Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
-Multi-Arch: bad
-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
- things. It should not be installed like a regular package. It may
- be an empty package.
- .
- This is a test with an invalid Multi-Arch field.
-
Package: {$srcpkg}-same
Architecture: any
Depends: $\{misc:Depends\}, $\{shlibs:Depends\}
diff --git a/t/tests/fields-multi-arch/desc b/t/tests/fields-multi-arch/desc
index 0be0fd2..cbecbab 100644
--- a/t/tests/fields-multi-arch/desc
+++ b/t/tests/fields-multi-arch/desc
@@ -2,4 +2,6 @@ Testname: fields-multi-arch
Sequence: 6000
Version: 1.0
Description: Tests for the Multi-Arch field
-Test-For: unknown-multi-arch-value
+Test-Against:
+ illegal-multi-arch-value
+ unknown-multi-arch-value
diff --git a/t/tests/fields-multi-arch/tags b/t/tests/fields-multi-arch/tags
index 873bd92..e69de29 100644
--- a/t/tests/fields-multi-arch/tags
+++ b/t/tests/fields-multi-arch/tags
@@ -1 +0,0 @@
-E: fields-multi-arch-some: unknown-multi-arch-value fields-multi-arch-some bad
--
Debian package checker
Reply to: