[SCM] Debian package checker branch, master, updated. 2.1.3-37-gfad5411
The following commit has been merged in the master branch:
commit 2c74bc69a171d24912dd0fca130e802c01b4130c
Author: Russ Allbery <rra@debian.org>
Date: Tue Dec 30 16:21:50 2008 -0800
Move the old copyright test to the new test framework
diff --git a/t/tests/6000_copyright-file-general.desc b/t/tests/6000_copyright-file-general.desc
new file mode 100644
index 0000000..4910824
--- /dev/null
+++ b/t/tests/6000_copyright-file-general.desc
@@ -0,0 +1,21 @@
+Testname: copyright-file-general
+Version: 1.0
+Description: Test checking of copyright files
+Test-For:
+ FSSTND-dir-in-usr
+ copyright-contains-dh-make-perl-boilerplate
+ copyright-file-compressed
+ copyright-file-contains-full-apache-2-license
+ copyright-file-contains-full-gfdl-license
+ copyright-file-contains-full-gpl-license
+ copyright-file-is-symlink
+ copyright-has-url-from-dh_make-boilerplate
+ copyright-lists-upstream-authors-with-dh_make-boilerplate
+ copyright-refers-to-compressed-license
+ copyright-refers-to-incorrect-directory
+ copyright-refers-to-old-directory
+ copyright-should-refer-to-common-license-file-for-gfdl
+ copyright-should-refer-to-common-license-file-for-gpl
+ copyright-without-copyright-notice
+ debian-copyright-file-uses-obsolete-national-encoding
+ old-style-copyright-file
diff --git a/testset/copyright/debian/control b/t/tests/copyright-file-general/debian/debian/control.in
similarity index 65%
rename from testset/copyright/debian/control
rename to t/tests/copyright-file-general/debian/debian/control.in
index 2fb5ee2..1eac65d 100644
--- a/testset/copyright/debian/control
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -1,76 +1,93 @@
-Source: copyright
-Section: text
-Priority: optional
-Maintainer: Lintian Maintainers <lintian-maint@debian.org>
-Uploaders: Tobias Toedter <t.toedter@GMX.NET>
-Build-Depends-Indep: debhelper (>5)
+Source: {$srcpkg}
+Priority: extra
+Section: {$section}
+Maintainer: {$author}
Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 7)
-Package: copyright.iso-8859-1
+Package: copyright-iso-8859-1
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks for non-utf-8-encodings
+ Tests non-UTF-8 encodings.
+ .
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: copyright.full-gpl
+Package: copyright-full-gpl
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks inclusion of GPL in full text
+ Tests the tag for including all of the GPL.
+ .
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: copyright.full-gfdl
+Package: copyright-full-gfdl
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks inclusion of GFDL in full text
+ Tests the tag for including all of the GFDL.
+ .
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: copyright.full-apache-2
+Package: copyright-full-apache-2
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks inclusion of Apache 2.0 in full text
+ Tests the tag for including all of the Apache 2.0 license.
+ .
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: copyright.misc-errors
+Package: copyright-misc-errors
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks various errors in copyright files
+ Tests various random errors in copyright files.
+ .
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: copyright.no-errors
-Architecture: all
-Description: this should not emit any error
- 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: copyright.symlink
+Package: copyright-symlink
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: just use a symlink for the copyright file
+ Tests the check for a symlinked copyright file.
+ .
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: copyright.compressed
+Package: copyright-compressed
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: include a valid copyright file and compress it
+ Tests the check for a compressed copyright file.
+ .
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: copyright.old-style
+Package: copyright-old-style
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: use an old-style directory structure
+ Tests a copyright file using an old-style directory structure.
+ .
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: copyright.full-gpl-1
+Package: copyright-full-gpl-1
Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks inclusion of GPL1
This should not trigger any errors as the common license
files only cover GPL >= 2
@@ -79,9 +96,23 @@ Description: checks inclusion of GPL1
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: copyright.w3c
+Package: copyright-w3c
Architecture: all
-Description: the w3c license claims to be "gpl compatible"
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks inclusion of the W3C license
+ The W3C license text claims to be "GPL compatible", which shouldn't
+ trigger warnings.
+ .
+ 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: copyright-no-errors
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: this should not emit any error
+ This copyright file should be fine.
+ .
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/testset/copyright/debian/copyright.full-apache-2 b/t/tests/copyright-file-general/debian/debian/copyright-full-apache-2.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.full-apache-2
rename to t/tests/copyright-file-general/debian/debian/copyright-full-apache-2.copyright
diff --git a/testset/copyright/debian/copyright.full-gfdl b/t/tests/copyright-file-general/debian/debian/copyright-full-gfdl.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.full-gfdl
rename to t/tests/copyright-file-general/debian/debian/copyright-full-gfdl.copyright
diff --git a/testset/copyright/debian/copyright.full-gpl-1 b/t/tests/copyright-file-general/debian/debian/copyright-full-gpl-1.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.full-gpl-1
rename to t/tests/copyright-file-general/debian/debian/copyright-full-gpl-1.copyright
diff --git a/testset/copyright/debian/copyright.full-gpl b/t/tests/copyright-file-general/debian/debian/copyright-full-gpl.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.full-gpl
rename to t/tests/copyright-file-general/debian/debian/copyright-full-gpl.copyright
diff --git a/t/tests/copyright-file-general/debian/debian/copyright-iso-8859-1.copyright b/t/tests/copyright-file-general/debian/debian/copyright-iso-8859-1.copyright
new file mode 100644
index 0000000..78a493a
--- /dev/null
+++ b/t/tests/copyright-file-general/debian/debian/copyright-iso-8859-1.copyright
@@ -0,0 +1,3 @@
+Copyright (C) 2008 Author
+
+��rst �erlich, falls nicht UTF-8 benutzt w�diff --git a/testset/copyright/debian/copyright.misc-errors b/t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.misc-errors
rename to t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright
diff --git a/testset/copyright/debian/copyright.no-errors b/t/tests/copyright-file-general/debian/debian/copyright-no-errors.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.no-errors
rename to t/tests/copyright-file-general/debian/debian/copyright-no-errors.copyright
diff --git a/testset/copyright/debian/copyright.w3c b/t/tests/copyright-file-general/debian/debian/copyright-w3c.copyright
similarity index 100%
rename from testset/copyright/debian/copyright.w3c
rename to t/tests/copyright-file-general/debian/debian/copyright-w3c.copyright
diff --git a/t/tests/copyright-file-general/debian/debian/rules b/t/tests/copyright-file-general/debian/debian/rules
new file mode 100755
index 0000000..882cf02
--- /dev/null
+++ b/t/tests/copyright-file-general/debian/debian/rules
@@ -0,0 +1,15 @@
+#!/usr/bin/make -f
+%:
+ dh $@
+
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep:
+ dh binary-indep --until dh_installdocs
+ install -m 644 debian/copyright-no-errors.copyright debian/copyright-symlink/usr/share/doc/copyright-symlink/symlink
+ rm debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
+ ln -s symlink debian/copyright-symlink/usr/share/doc/copyright-symlink/copyright
+ gzip -9 debian/copyright-compressed/usr/share/doc/copyright-compressed/copyright
+ mkdir -p debian/copyright-old-style/usr/doc/copyright
+ mv debian/copyright-old-style/usr/share/doc/copyright-old-style/copyright debian/copyright-old-style/usr/doc/copyright/copyright-old-style
+ dh binary-indep --remaining
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
new file mode 100644
index 0000000..abd931f
--- /dev/null
+++ b/t/tests/copyright-file-general/tags
@@ -0,0 +1,19 @@
+E: copyright-compressed: copyright-file-compressed
+E: copyright-full-apache-2: copyright-file-contains-full-apache-2-license
+E: copyright-full-gfdl: copyright-file-contains-full-gfdl-license
+E: copyright-full-gfdl: copyright-should-refer-to-common-license-file-for-gfdl
+E: copyright-full-gpl: copyright-file-contains-full-gpl-license
+E: copyright-full-gpl: copyright-should-refer-to-common-license-file-for-gpl
+E: copyright-misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
+E: copyright-misc-errors: copyright-refers-to-incorrect-directory usr/share/common-licences
+E: copyright-misc-errors: copyright-refers-to-old-directory
+E: copyright-old-style: FSSTND-dir-in-usr usr/doc/
+E: copyright-old-style: old-style-copyright-file
+E: copyright-symlink: copyright-file-is-symlink
+W: copyright-compressed: copyright-without-copyright-notice
+W: copyright-full-apache-2: copyright-without-copyright-notice
+W: copyright-iso-8859-1: debian-copyright-file-uses-obsolete-national-encoding at line 3
+W: copyright-misc-errors: copyright-contains-dh-make-perl-boilerplate
+W: copyright-misc-errors: copyright-has-url-from-dh_make-boilerplate
+W: copyright-misc-errors: copyright-lists-upstream-authors-with-dh_make-boilerplate
+W: copyright-old-style: copyright-without-copyright-notice
diff --git a/testset/copyright/debian/changelog b/testset/copyright/debian/changelog
deleted file mode 100644
index 47c178e..0000000
--- a/testset/copyright/debian/changelog
+++ /dev/null
@@ -1,17 +0,0 @@
-copyright (1) unstable; urgency=emergency
-
- * Initial release.
- * Add the following tests of tags never seen:
- - debian-copyright-file-uses-obsolete-national-encoding
- - copyright-file-contains-full-gpl-license
- - copyright-file-contains-full-gfdl-license
- - copyright-lists-upstream-authors-with-dh_make-boilerplate
- - copyright-refers-to-incorrect-directory
- - copyright-refers-to-compressed-license
- - copyright-refers-to-old-directory
- - copyright-file-is-symlink
- - copyright-file-compressed
- - old-style-copyright-file
- - FSSTND-dir-in-usr
-
- -- Tobias Toedter <t.toedter@gmx.net> Sun, 13 Jul 2008 16:32:25 -0700
diff --git a/testset/copyright/debian/compat b/testset/copyright/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/testset/copyright/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/testset/copyright/debian/copyright.iso-8859-1 b/testset/copyright/debian/copyright.iso-8859-1
deleted file mode 100644
index 819b3d7..0000000
--- a/testset/copyright/debian/copyright.iso-8859-1
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (C) 2008 Author
-
-��rst �erlich, falls nicht UTF-8 benutzt w�-
-This directory is obsolete: /usr/share/doc/copyright/copyright
diff --git a/testset/copyright/debian/rules b/testset/copyright/debian/rules
deleted file mode 100755
index cd3d7bb..0000000
--- a/testset/copyright/debian/rules
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/make -f
-
-tmp=debian/tmp
-
-build:
-
-binary-arch:
-
-binary-indep:
- # Create several copyright packages
- for copyright in debian/copyright* ; do \
- install -d $(tmp) ;\
- install -d $(tmp)/DEBIAN ;\
- install -d $(tmp)/usr/share/doc/`basename $$copyright` ;\
- install -m 644 debian/changelog \
- $(tmp)/usr/share/doc/`basename $$copyright`/changelog ;\
- gzip -9 $(tmp)/usr/share/doc/`basename $$copyright`/changelog ;\
- install -m 644 $$copyright \
- $(tmp)/usr/share/doc/`basename $$copyright`/copyright ; \
- dh_md5sums -p`basename $$copyright` -P$(tmp) ; \
- dpkg-gencontrol -p`basename $$copyright` -P$(tmp) ; \
- dpkg --build $(tmp) .. ; \
- rm -rf $(tmp) ; \
- done
-
- # Create package with symlink
- install -d $(tmp)
- install -d $(tmp)/DEBIAN
- install -d $(tmp)/usr/share/doc/copyright.symlink
- install -m 644 debian/changelog \
- $(tmp)/usr/share/doc/copyright.symlink/changelog
- gzip -9 $(tmp)/usr/share/doc/copyright.symlink/changelog
- cp debian/copyright.no-errors $(tmp)/usr/share/doc/copyright.symlink
- ln -s $(tmp)/usr/share/doc/copyright.symlink/copyright.no-errors \
- $(tmp)/usr/share/doc/copyright.symlink/copyright
- dh_md5sums -pcopyright.symlink -P$(tmp)
- dpkg-gencontrol -pcopyright.symlink -P$(tmp)
- dpkg --build $(tmp) ..
- rm -rf $(tmp)
-
- # Create package with compressed file
- install -d $(tmp)
- install -d $(tmp)/DEBIAN
- install -d $(tmp)/usr/share/doc/copyright.compressed
- install -m 644 debian/changelog \
- $(tmp)/usr/share/doc/copyright.compressed/changelog
- gzip -9 $(tmp)/usr/share/doc/copyright.compressed/changelog
- cp debian/copyright.no-errors \
- $(tmp)/usr/share/doc/copyright.compressed/copyright
- gzip -9 $(tmp)/usr/share/doc/copyright.compressed/copyright
- dh_md5sums -pcopyright.compressed -P$(tmp)
- dpkg-gencontrol -pcopyright.compressed -P$(tmp)
- dpkg --build $(tmp) ..
- rm -rf $(tmp)
-
- # Create package with old directory
- install -d $(tmp)
- install -d $(tmp)/DEBIAN
- install -d $(tmp)/usr/share/doc/copyright.old-style
- install -d $(tmp)/usr/doc/copyright
- install -m 644 debian/changelog \
- $(tmp)/usr/share/doc/copyright.old-style/changelog
- gzip -9 $(tmp)/usr/share/doc/copyright.old-style/changelog
- cp debian/copyright.no-errors \
- $(tmp)/usr/doc/copyright/copyright.old-style
- dh_md5sums -pcopyright.old-style -P$(tmp)
- dpkg-gencontrol -pcopyright.old-style -P$(tmp)
- dpkg --build $(tmp) ..
- #rm -rf $(tmp)
-
-binary: binary-arch binary-indep
-
-clean:
- rm -rf debian/files $(tmp) debian/substvars
-
-.PHONY: build binary-arch binary-indep binary clean
diff --git a/testset/tags.copyright b/testset/tags.copyright
deleted file mode 100644
index c78fa16..0000000
--- a/testset/tags.copyright
+++ /dev/null
@@ -1,21 +0,0 @@
-E: copyright.compressed: copyright-file-compressed
-E: copyright.full-apache-2: copyright-file-contains-full-apache-2-license
-E: copyright.full-gfdl: copyright-file-contains-full-gfdl-license
-E: copyright.full-gfdl: copyright-should-refer-to-common-license-file-for-gfdl
-E: copyright.full-gpl: copyright-file-contains-full-gpl-license
-E: copyright.full-gpl: copyright-should-refer-to-common-license-file-for-gpl
-E: copyright.iso-8859-1: copyright-refers-to-old-directory
-E: copyright.misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
-E: copyright.misc-errors: copyright-refers-to-incorrect-directory usr/share/common-licences
-E: copyright.misc-errors: copyright-refers-to-old-directory
-E: copyright.old-style: FSSTND-dir-in-usr usr/doc/
-E: copyright.old-style: old-style-copyright-file
-E: copyright.symlink: copyright-file-is-symlink
-W: copyright.compressed: copyright-without-copyright-notice
-W: copyright.full-apache-2: copyright-without-copyright-notice
-W: copyright.iso-8859-1: debian-copyright-file-uses-obsolete-national-encoding at line 3
-W: copyright.misc-errors: copyright-contains-dh-make-perl-boilerplate
-W: copyright.misc-errors: copyright-has-url-from-dh_make-boilerplate
-W: copyright.misc-errors: copyright-lists-upstream-authors-with-dh_make-boilerplate
-W: copyright.old-style: copyright-without-copyright-notice
-W: copyright.symlink: copyright-without-copyright-notice
--
Debian package checker
Reply to: