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

[SCM] Debian package checker branch, master, updated. 2.4.2-27-g78aea41



The following commit has been merged in the master branch:
commit 78aea41eec7429df019c51eb406b908957aeaf13
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 25 17:34:39 2010 -0700

    Fix copyright examples and add a changelog entry

diff --git a/checks/copyright-file.desc b/checks/copyright-file.desc
index f1aa88d..cd8ae2e 100644
--- a/checks/copyright-file.desc
+++ b/checks/copyright-file.desc
@@ -293,12 +293,11 @@ Info: The copyright file for this package does not appear to contain a
  followed by the years and the copyright holder.  A copyright notice is
  not required for a work to be copyrighted, but Debian requires the
  copyright file include the authors and years of copyright, and including
- a valid copyright notice is the best way to do that. Exmaples:
- .
-   Copyright (C) YYYY Firstname Lastname <address@example.com>
-   Copyright (C) YYYY-YYYY Firstname Lastname <address@example.com>
-   Copyright © YYYY,YYYY Firstname Lastname <address@example.com>
+ a valid copyright notice is the best way to do that.  Examples:
  .
+   Copyright YYYY Firstname Lastname <address@example.com>
+   Copr. YYYY-YYYY Firstname Lastname <address@example.com>
+   © YYYY,YYYY Firstname Lastname <address@example.com>
  .
  If the package is in the public domain rather than copyrighted, be sure
  to mention "public domain" in the copyright file.  Please be aware that
diff --git a/debian/changelog b/debian/changelog
index 31faa25..0e25865 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ lintian (2.4.3) UNRELEASED; urgency=low
   * checks/changelog-file{,.desc}:
     + [RA] apt-listchanges has been fixed, so drop the check for NEWS
       files ending in a trailing blank line.  (Closes: #586816)
+  * checks/copyright-file.desc:
+    + [RA] Add examples for copyright-without-copyright-notice.  Based on
+      a patch by Jari Aalto.  (Closes: #580767)
   * checks/debhelper{,.desc}:
     + [RA] package-lacks-versioned-build-depends-on-debhelper can also
       trigger if the dependency is present but not tight enough.  Thanks,

-- 
Debian package checker


Reply to: