[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.1-14-gef8cb01

The following commit has been merged in the master branch:
commit ef8cb01426c0e98d9eff43ca5d9db4774966d7f5
Author: Russ Allbery <rra@debian.org>
Date:   Sat Jun 12 15:34:06 2010 -0700

    Deprecate references to /usr/share/common-licenses/BSD
    
    * checks/copyright-file{,.desc}:
      + [RA] Deprecate references to /usr/share/common-licenses/BSD in
        debian/copyright following the change in Policy 3.8.5.

diff --git a/checks/copyright-file b/checks/copyright-file
index 2735bdd..0d3aedd 100644
--- a/checks/copyright-file
+++ b/checks/copyright-file
@@ -143,6 +143,7 @@ if ($line) {
 
 # check contents of copyright file
 $_ = slurp_entire_file('copyright');
+study $_;
 
 my $wrong_directory_detected = 0;
 
@@ -181,6 +182,12 @@ if (m,(usr/share/common-licenses/(L?GPL|GFDL))([^-]),i && !m,as Perl itself,i
     }
 }
 
+# References to /usr/share/common-licenses/BSD are deprecated as of Policy
+# 3.8.5.
+if (m,/usr/share/common-licenses/BSD,) {
+    tag 'copyright-refers-to-deprecated-bsd-license-file';
+}
+
 if (m,(usr/share/common-licences),) {
     tag "copyright-refers-to-incorrect-directory", $1;
     $wrong_directory_detected = 1;
diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index 589ffa3..5e31ce4 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -369,3 +369,17 @@ Info: The copyright file refers to a license in
  <tt>/usr/share/common-licenses</tt> that doesn't exist.  Usually this is
  a typo, such as accidentally omitting the <tt>-</tt> between the license
  name and the version number.
+
+Tag: copyright-refers-to-deprecated-bsd-license-file
+Severity: minor
+Certainty: certain
+Ref: Policy 12.5
+Info: The copyright file refers to
+ <tt>/usr/share/common-licenses/BSD</tt>.  Due to the brevity of this
+ license, the specificity of this copy to code whose copyright is held by
+ the Regents of the University of California, and the frequency of minor
+ wording changes in the license, its text should be included in the
+ coypright file directly rather than referencing this file.
+ .
+ This file may be removed from a future version of base-files if
+ references to it drop sufficiently.
diff --git a/debian/changelog b/debian/changelog
index 6992778..617a066 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ lintian (2.4.2) UNRELEASED; urgency=low
 
   * Summary of tag changes:
     + Added:
+      - copyright-refers-to-deprecated-bsd-license-file
       - init.d-script-depends-on-unknown-virtual-facility
       - xc-package-type-in-debian-control (pedantic)
     + Removed:
@@ -12,6 +13,9 @@ lintian (2.4.2) UNRELEASED; urgency=low
       it as desired by the d-i team.  xc-package-type-in-debian-control
       replaces it as a pedantic check to encourage switching to the
       official name.  Thanks, Raphael Hertzog.
+  * checks/copyright-file{,.desc}:
+    + [RA] Deprecate references to /usr/share/common-licenses/BSD in
+      debian/copyright following the change in Policy 3.8.5.
   * checks/fields:
     + [RA] Allow Breaks without a version if the broken package is a
       virtual package.
diff --git a/t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright b/t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright
index a39846e..dceee0e 100644
--- a/t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright
+++ b/t/tests/copyright-file-general/debian/debian/copyright-misc-errors.copyright
@@ -18,3 +18,5 @@ The path /usr/share/common-licenses/GPL2 is missing a hyphen.
 This copyright info was automatically extracted from the perl module.
 It may not be accurate, so you better check the module sources
 if you don't want to get into legal troubles.
+
+References to /usr/share/common-licenses/BSD are deprecated.
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index 9e8e74e..e904659 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -14,6 +14,7 @@ Test-For:
  copyright-has-url-from-dh_make-boilerplate
  copyright-refers-to-bad-php-license
  copyright-refers-to-compressed-license
+ copyright-refers-to-deprecated-bsd-license-file
  copyright-refers-to-incorrect-directory
  copyright-refers-to-nonexistent-license-file
  copyright-refers-to-old-directory
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 0e5e5e4..0a43f11 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -18,5 +18,6 @@ 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-refers-to-deprecated-bsd-license-file
 W: copyright-misc-errors: copyright-refers-to-nonexistent-license-file usr/share/common-licenses/GPL2
 W: copyright-old-style: copyright-without-copyright-notice

-- 
Debian package checker
Reply to: