[SCM] Debian package checker branch, master, updated. 2.5.10-34-g22fda95
The following commit has been merged in the master branch:
commit 22fda9519eafc7dfbc0ea7648ec5cc37a94aac86
Author: Niels Thykier <niels@thykier.net>
Date: Fri Jul 13 15:53:12 2012 +0200
t: Extend copyright-file-general to check for old FSF address
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index 234fcf8..fae4554 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
Last generated 2012-07-13
-Coverage: 829/964 (86.00%), w. legacy tests: 930/964 (96.47%)
+Coverage: 830/964 (86.10%), w. legacy tests: 930/964 (96.47%)
The following tags are not tested by the test suite:
@@ -57,8 +57,6 @@ binaries unstripped-binary-or-object
changelog-file changelog-file-missing-in-native-package
changelog-file wrong-name-for-debian-news-file
-copyright-file old-fsf-address-in-copyright-file
-
debconf config-does-not-load-confmodule
debconf debconf-config-not-executable
debconf loads-obsolete-confmodule
@@ -188,7 +186,6 @@ binary
menu-item-needs-tag-has-unknown-value
menu-method-should-include-menu-h
non-wm-module-in-wm-modules-menu-section
- old-fsf-address-in-copyright-file
package-contains-upstream-install-documentation
postinst-does-not-call-updatemenus
postrm-does-not-call-updatemenus
diff --git a/t/tests/copyright-file-general/debian/debian/control.in b/t/tests/copyright-file-general/debian/debian/control.in
index 423b9cb..3277846 100644
--- a/t/tests/copyright-file-general/debian/debian/control.in
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -218,3 +218,14 @@ Description: checks inclusion of AGPL-3 in full text
things. It should not be installed like a regular package. It may
be an empty package.
+Package: copyright-old-fsf
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks use of old FSF address
+ This should trigger a tag for using old FSF address.
+ .
+ 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.
+
diff --git a/t/templates/debs/skel/copyright b/t/tests/copyright-file-general/debian/debian/copyright-old-fsf.copyright
similarity index 71%
copy from t/templates/debs/skel/copyright
copy to t/tests/copyright-file-general/debian/debian/copyright-old-fsf.copyright
index 98298fd..00946fc 100644
--- a/t/templates/debs/skel/copyright
+++ b/t/tests/copyright-file-general/debian/debian/copyright-old-fsf.copyright
@@ -1,8 +1,5 @@
-This is part of the testsuite of lintian. See the file debian/copyright
-in the lintian source directory for more details.
-
-So far as it is copyrightable at all, this test case is
- Copyright © 2009 Russ Allbery <rra@debian.org>
+To the extend this is copyrightable (if at all), it is:
+ Copyright 2012 Niels Thykier <niels@thykier.net>.
This program is free software; you may redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -18,4 +15,5 @@ A copy of the GNU General Public License version 2 is available as
/usr/share/common-licenses/GPL-2 in the Debian GNU/Linux distribution
or at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
You can also obtain it by writing to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index afc8369..1d72ac4 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -30,3 +30,4 @@ Test-For:
debian-copyright-file-uses-obsolete-national-encoding
helper-templates-in-copyright
no-copyright-file
+ old-fsf-address-in-copyright-file
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 44996c1..a0b78ad 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -26,4 +26,5 @@ 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-refers-to-deprecated-bsd-license-file
W: copyright-misc-errors: copyright-refers-to-nonexistent-license-file usr/share/common-licenses/GPL2
+W: copyright-old-fsf: old-fsf-address-in-copyright-file
W: copyright-poor-common-licenses: copyright-does-not-refer-to-common-license-file /GPL-3
--
Debian package checker
Reply to: