[SCM] Debian package checker branch, master, updated. 2.2.5-57-g6bf7673
The following commit has been merged in the master branch:
commit 496abf59820a6c99a253ffc46ab2f9634faef342
Author: Russ Allbery <rra@debian.org>
Date: Sat Feb 21 21:45:54 2009 -0800
Retire the old description test case
Add new tests in the new test suite for the remaining tags from the
old description test case that weren't already tested.
diff --git a/t/COVERAGE b/t/COVERAGE
index 6589cd6..f5aaafa 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -13,7 +13,6 @@ binaries library-not-linked-against-libc
binaries program-not-linked-against-libc
changelog-file html-changelog-without-text-version
-changelog-file improbable-bug-number-in-closes
changelog-file no-upstream-changelog
changelog-file spelling-error-in-changelog
changelog-file wrong-name-for-changelog-of-native-package
@@ -73,7 +72,6 @@ fields magic-arch-in-arch-list
fields maintainer-address-is-on-localhost
fields maintainer-address-looks-weird
fields maintainer-address-malformed
-fields maintainer-name-missing
fields malformed-python-version
fields missing-build-dependency
fields multiline-field
@@ -273,10 +271,8 @@ binaries unstripped-binary-or-object
changelog-file changelog-file-missing-in-native-package
changelog-file changelog-file-not-compressed
changelog-file changelog-news-debian-mismatch
-changelog-file changelog-not-compressed-with-max-compression
changelog-file debian-changelog-file-contains-debmake-default-email-address
changelog-file debian-changelog-file-contains-invalid-email-address
-changelog-file debian-changelog-file-contains-obsolete-user-emacs-settings
changelog-file debian-changelog-file-is-a-symlink
changelog-file debian-changelog-file-missing
changelog-file debian-changelog-file-missing-or-wrong-name
@@ -369,10 +365,8 @@ fields depends-on-obsolete-package
fields depends-on-old-emacs
fields depends-on-python-minimal
fields depends-on-x-metapackage
-fields duplicate-uploader
fields essential-no-not-needed
fields invalid-arch-string-in-source-relation
-fields maintainer-also-in-uploaders
fields malformed-dm-upload-allowed
fields missing-dh_python-build-dependency
fields missing-python-build-dependency
@@ -396,7 +390,6 @@ fields uploader-address-is-on-localhost
fields uploader-address-looks-weird
fields uploader-address-malformed
fields uploader-address-missing
-fields uploader-name-missing
fields uploader-not-full-name
fields versioned-dependency-satisfied-by-perl
fields virtual-package-depends-without-real-package-depends
diff --git a/t/tests/changelog-file-general/debian/debian/changelog.in b/t/tests/changelog-file-general/debian/debian/changelog.in
new file mode 100644
index 0000000..7c8bfd6
--- /dev/null
+++ b/t/tests/changelog-file-general/debian/debian/changelog.in
@@ -0,0 +1,10 @@
+{$srcpkg} ({$version}) unstable; urgency=low
+
+ * Test: {$testname}
+ * improbable-bug-number-in-closes (Closes: #12)
+
+ -- {$author} {$date}
+
+Local variables:
+add-log-mailing-address: "rra@debian.org"
+End:
diff --git a/t/tests/changelog-file-general/debian/debian/rules b/t/tests/changelog-file-general/debian/debian/rules
new file mode 100755
index 0000000..a212c6a
--- /dev/null
+++ b/t/tests/changelog-file-general/debian/debian/rules
@@ -0,0 +1,12 @@
+#!/usr/bin/make -f
+pkg = $(shell dh_listpackages)
+
+%:
+ dh $@
+
+binary:
+ dh binary --before dh_installchangelogs
+ install -c -m 644 debian/changelog \
+ debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
+ gzip -1 debian/$(pkg)/usr/share/doc/$(pkg)/changelog.Debian
+ dh binary --after dh_installchangelogs
diff --git a/t/tests/changelog-file-general/desc b/t/tests/changelog-file-general/desc
new file mode 100644
index 0000000..3d381c6
--- /dev/null
+++ b/t/tests/changelog-file-general/desc
@@ -0,0 +1,9 @@
+Testname: changelog-file-general
+Sequence: 6000
+Type: non-native
+Version: 1.0-1
+Description: General tests for changelog-file tags
+Test-For:
+ changelog-not-compressed-with-max-compression
+ debian-changelog-file-contains-obsolete-user-emacs-settings
+ improbable-bug-number-in-closes
diff --git a/t/tests/changelog-file-general/tags b/t/tests/changelog-file-general/tags
new file mode 100644
index 0000000..ac98d3a
--- /dev/null
+++ b/t/tests/changelog-file-general/tags
@@ -0,0 +1,3 @@
+W: changelog-file-general: changelog-not-compressed-with-max-compression changelog.Debian.gz
+W: changelog-file-general: debian-changelog-file-contains-obsolete-user-emacs-settings
+W: changelog-file-general: improbable-bug-number-in-closes 12
diff --git a/t/tests/basic-non-native-with-epoch/upstream/README b/t/tests/changelog-file-general/upstream/README
similarity index 100%
copy from t/tests/basic-non-native-with-epoch/upstream/README
copy to t/tests/changelog-file-general/upstream/README
diff --git a/t/tests/cruft-general-quilt/debian/debian/control.in b/t/tests/fields-maintainer-general/debian/debian/control.in
similarity index 75%
copy from t/tests/cruft-general-quilt/debian/debian/control.in
copy to t/tests/fields-maintainer-general/debian/debian/control.in
index c9c7406..f2baf40 100644
--- a/t/tests/cruft-general-quilt/debian/debian/control.in
+++ b/t/tests/fields-maintainer-general/debian/debian/control.in
@@ -1,8 +1,9 @@
Source: {$srcpkg}
-Format: 3.0 (quilt)
Priority: extra
Section: {$section}
-Maintainer: {$author}
+Maintainer: <lintian-maint@debian.org>
+Uploaders: <lintian-maint@debian.org>, Russ Allbery <rra@debian.org>,
+ Russ Allbery <rra@debian.org>
Standards-Version: 3.8.0
Build-Depends: debhelper (>= 7)
diff --git a/t/tests/fields-maintainer-general/desc b/t/tests/fields-maintainer-general/desc
new file mode 100644
index 0000000..2ff1c0d
--- /dev/null
+++ b/t/tests/fields-maintainer-general/desc
@@ -0,0 +1,9 @@
+Testname: fields-maintainer-general
+Sequence: 6000
+Version: 1.0
+Description: Tests of various maintainer and uploader tags
+Test-For:
+ duplicate-uploader
+ maintainer-also-in-uploaders
+ maintainer-name-missing
+ uploader-name-missing
diff --git a/t/tests/fields-maintainer-general/tags b/t/tests/fields-maintainer-general/tags
new file mode 100644
index 0000000..673b7fa
--- /dev/null
+++ b/t/tests/fields-maintainer-general/tags
@@ -0,0 +1,7 @@
+E: fields-maintainer-general source: maintainer-name-missing <lintian-maint@debian.org>
+E: fields-maintainer-general source: uploader-name-missing <lintian-maint@debian.org>
+E: fields-maintainer-general: maintainer-name-missing <lintian-maint@debian.org>
+W: fields-maintainer-general source: changelog-should-mention-nmu
+W: fields-maintainer-general source: duplicate-uploader Russ Allbery <rra@debian.org>
+W: fields-maintainer-general source: maintainer-also-in-uploaders
+W: fields-maintainer-general source: source-nmu-has-incorrect-version-number 1.0
diff --git a/testset/description/debian/changelog b/testset/description/debian/changelog
deleted file mode 100644
index d191d84..0000000
--- a/testset/description/debian/changelog
+++ /dev/null
@@ -1,31 +0,0 @@
-description (1.1-1) unstable; urgency=low
-
- * Add the following tests of tags never seen:
- - description-synopsis-has-leading-spaces
- This is not yet recognized by Lintian, so the testset currently
- fails.
-
- -- Tobias Toedter <toddy@debian.org> Sun, 13 Jul 2008 16:30:36 -0700
-
-description (1.0-1) unstable; urgency=low
-
- * Initial release.
- * Add the following tests of tags never seen:
- - changelog-not-compressed-with-max-compression
- - debian-changelog-file-contains-obsolete-user-emacs-settings
- - description-starts-with-package-name
- - description-starts-with-leading-spaces
- - description-contains-tabs
- - description-is-debmake-template
- - description-synopsis-is-empty
- - description-contains-invalid-control-statement
- - description-too-long
- - extended-description-line-too-long
- - possible-unindented-list-in-extended-description
-
- -- Tobias Toedter <t.toedter@gmx.net> Wed, 19 Mar 2008 17:01:51 +0100
-
-# Local Variables:
-# cperl-indent-level: 4
-# add-log-mailing-address: Lintian Maintainers <lintian-maint@debian.org>
-# indent-tabs-mode: t
diff --git a/testset/description/debian/control b/testset/description/debian/control
deleted file mode 100644
index 15b4abd..0000000
--- a/testset/description/debian/control
+++ /dev/null
@@ -1,55 +0,0 @@
-Source: description
-Section: text
-Priority: extra
-Maintainer: Tobias Toedter <toddy@debian.org>
-Uploaders: Tobias Toedter <toddy@debian.org>, Foo Bar Moo <foo@debian.org>,
- Tobias Toedter <toddy@debian.org>
-Standards-Version: 3.8.0
-
-Package: description
-Architecture: all
-Description: description is a package which tests lintian's description checks.
- missing
- The the synopsis should not start with the package's name. Moreover,
- the long description
- should
- not
- contain tabs.
- .control statements are not allowed as well.
- .
- All all all of of these these should be matched matched matched
- .
- This description was automagically extracted from the module by dh-make-perl
- .
- No, not really...
-
-Package: description-foo
-Architecture: all
-Description: Don't use tabs in the synopsis and restrict yourself to less than 80 characters, otherwise Lintian will complain
- Oh, and don't start the long description with spaces.
- Now here comes a list:
- - which is
- - unfortunately
- - not correctly indented.
-
-Package: description-bar
-Architecture: all
-Description:
- There should really be a synopsis.
- . and please avoid control statements in the long description.
- The line in an extended description should be less than 80 characters, otherwise you'll get
- a Lintian warning.
- .
- And the old man said "he he is the one!"
- "No, I am am not", he replied
-
-Package: description-baz
-Architecture: all
-Description: the synopsis starts with spaces
- This is a real Lintian bug which has been discovered with this testset.
-
-Package: description-qux
-Architecture: all
-Description: This description ends, etc.
- This is another real Lintian bug which has been discovered with this
- testset.
diff --git a/testset/description/debian/rules b/testset/description/debian/rules
deleted file mode 100755
index 0392a92..0000000
--- a/testset/description/debian/rules
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/make -f
-
-description=debian/description
-description-foo=debian/description-foo
-description-bar=debian/description-bar
-description-baz=debian/description-baz
-description-qux=debian/description-qux
-
-build:
-
-binary-indep:
- # Create package description
- install -d $(description)
- install -d $(description)/DEBIAN
- install -d $(description)/usr/share/doc/description
- install -m 644 debian/changelog \
- $(description)/usr/share/doc/description/changelog.Debian
- gzip -1 $(description)/usr/share/doc/description/changelog.Debian
- dpkg-gencontrol -pdescription -P$(description)
- dpkg --build $(description) ..
-
- # Create package description-foo
- install -d $(description-foo)
- install -d $(description-foo)/DEBIAN
- install -d $(description-foo)/usr/share/doc/description
- install -m 644 debian/changelog \
- $(description-foo)/usr/share/doc/description/changelog.Debian
- gzip -9 $(description-foo)/usr/share/doc/description/changelog.Debian
- dpkg-gencontrol -pdescription-foo -P$(description-foo)
- dpkg --build $(description-foo) ..
-
- # Create package description-bar
- install -d $(description-bar)
- install -d $(description-bar)/DEBIAN
- install -d $(description-bar)/usr/share/doc/description
- install -m 644 debian/changelog \
- $(description-bar)/usr/share/doc/description/changelog.Debian
- gzip -9 $(description-bar)/usr/share/doc/description/changelog.Debian
- dpkg-gencontrol -pdescription-bar -P$(description-bar)
- dpkg --build $(description-bar) ..
-
- # Create package description-baz
- install -d $(description-baz)
- install -d $(description-baz)/DEBIAN
- install -d $(description-baz)/usr/share/doc/description
- install -m 644 debian/changelog \
- $(description-baz)/usr/share/doc/description/changelog.Debian
- gzip -9 $(description-baz)/usr/share/doc/description/changelog.Debian
- dpkg-gencontrol -pdescription-baz -P$(description-baz)
- dpkg --build $(description-baz) ..
-
- # Create package description-qux
- install -d $(description-qux)
- install -d $(description-qux)/DEBIAN
- install -d $(description-qux)/usr/share/doc/description
- install -m 644 debian/changelog \
- $(description-qux)/usr/share/doc/description/changelog.Debian
- gzip -9 $(description-qux)/usr/share/doc/description/changelog.Debian
- dpkg-gencontrol -pdescription-qux -P$(description-qux)
- dpkg --build $(description-qux) ..
-binary: binary-indep
-
-clean:
- rm -rf debian/files $(description) $(description-foo) \
- $(description-bar) $(description-baz) $(description-qux) debian/substvars
-
-.PHONY: build binary-indep binary clean
diff --git a/testset/tags.description b/testset/tags.description
deleted file mode 100644
index 5bee350..0000000
--- a/testset/tags.description
+++ /dev/null
@@ -1,37 +0,0 @@
-E: description source: debian-rules-missing-required-target binary-arch
-E: description-bar: description-contains-invalid-control-statement
-E: description-bar: description-synopsis-is-empty
-E: description-bar: no-copyright-file
-E: description-baz: no-copyright-file
-E: description-foo: description-contains-tabs
-E: description-foo: description-too-long
-E: description-foo: no-copyright-file
-E: description-qux: no-copyright-file
-E: description: description-contains-invalid-control-statement
-E: description: description-contains-tabs
-E: description: description-is-debmake-template
-E: description: description-starts-with-package-name
-E: description: no-copyright-file
-I: description-bar: no-md5sums-control-file
-I: description-bar: using-first-person-in-description line 6: I
-I: description-baz: extended-description-is-probably-too-short
-I: description-baz: no-md5sums-control-file
-I: description-foo: no-md5sums-control-file
-I: description-qux: extended-description-is-probably-too-short
-I: description-qux: no-md5sums-control-file
-I: description: no-md5sums-control-file
-W: description source: duplicate-uploader Tobias Toedter <toddy@debian.org>
-W: description source: maintainer-also-in-uploaders
-W: description source: native-package-with-dash-version
-W: description-bar: extended-description-line-too-long
-W: description-foo: description-starts-with-leading-spaces
-W: description-foo: possible-unindented-list-in-extended-description
-W: description: changelog-not-compressed-with-max-compression changelog.Debian.gz
-W: description: debian-changelog-file-contains-obsolete-user-emacs-settings
-W: description: description-contains-dh-make-perl-template
-W: description: description-contains-duplicated-word All all all
-W: description: description-contains-duplicated-word The the
-W: description: description-contains-duplicated-word matched matched matched
-W: description: description-contains-duplicated-word of of
-W: description: description-contains-duplicated-word these these
-W: description: description-synopsis-might-not-be-phrased-properly
--
Debian package checker
Reply to: