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

lintian: r1002 - in trunk: checks debian testset testset/debconf/debian



Author: he
Date: 2007-11-30 12:08:17 +0100 (Fri, 30 Nov 2007)
New Revision: 1002

Modified:
   trunk/checks/copyright-file
   trunk/checks/copyright-file.desc
   trunk/debian/changelog
   trunk/testset/debconf/debian/copyright
   trunk/testset/tags.debconf
Log:
  + [HE] Add warning copyright-contains-dh_make-todo-boilerplate
         if the maintainer left the dh_make boilerplate in the
         copyright file. Based on patch by Cyril Brulebois
         <cyril.brulebois@enst-bretagne.fr>. (Closes: #448677)

Modified: trunk/checks/copyright-file
===================================================================
--- trunk/checks/copyright-file	2007-11-30 10:10:06 UTC (rev 1001)
+++ trunk/checks/copyright-file	2007-11-30 11:08:17 UTC (rev 1002)
@@ -212,6 +212,10 @@
     tag "copyright-lists-upstream-authors-with-dh_make-boilerplate", "";
 }
 
+if (m{# Please also look if there are files or directories which have a\n# different copyright/license attached and list them here\.}) {
+    tag "copyright-contains-dh_make-todo-boilerplate", "";
+}
+
 } # </run>
 
 # -----------------------------------

Modified: trunk/checks/copyright-file.desc
===================================================================
--- trunk/checks/copyright-file.desc	2007-11-30 10:10:06 UTC (rev 1001)
+++ trunk/checks/copyright-file.desc	2007-11-30 11:08:17 UTC (rev 1002)
@@ -158,3 +158,11 @@
  .
   $ iconv -f ISO-8859-1 -t UTF-8 copyright > copyright.new
   $ mv copyright.new copyright
+
+Tag: copyright-contains-dh_make-todo-boilerplate
+Type: warning
+Ref: policy 12.5
+Info: The string "Please also look if..." appears in the copyright
+ file, which indicates that you either didn't check the whole source
+ to find additional copyright/license, or that you didn't remove that
+ paragraph after having done so.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-30 10:10:06 UTC (rev 1001)
+++ trunk/debian/changelog	2007-11-30 11:08:17 UTC (rev 1002)
@@ -14,6 +14,10 @@
   * checks/copyright-file:
     + [HE] Check that encoding of copyright file is UTF-8. Patch by
            gregor herrmann <gregor+debian@comodo.priv.at>. (Closes: #451689)
+    + [HE] Add warning copyright-contains-dh_make-todo-boilerplate
+           if the maintainer left the dh_make boilerplate in the
+           copyright file. Based on patch by Cyril Brulebois
+           <cyril.brulebois@enst-bretagne.fr>. (Closes: #448677)
   * checks/deb-format:
     + [HE] Remove, not needed any more. (Closes: #447257)
   * checks/deconf:

Modified: trunk/testset/debconf/debian/copyright
===================================================================
--- trunk/testset/debconf/debian/copyright	2007-11-30 10:10:06 UTC (rev 1001)
+++ trunk/testset/debconf/debian/copyright	2007-11-30 11:08:17 UTC (rev 1002)
@@ -4,3 +4,7 @@
 
 Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
 MA 02139, USA.
+
+Test for a dh-make boilerplate:
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

Modified: trunk/testset/tags.debconf
===================================================================
--- trunk/testset/tags.debconf	2007-11-30 10:10:06 UTC (rev 1001)
+++ trunk/testset/tags.debconf	2007-11-30 11:08:17 UTC (rev 1002)
@@ -20,11 +20,14 @@
 W: debconf source: translated-default-field debconf-test.templates: 67
 W: debconf source: translated-default-field debconf-test.templates: 72
 W: debconf source: unknown-encoding-in-po-file debian/po/fr.po
+W: debconf-test-noscripts: copyright-contains-dh_make-todo-boilerplate
 W: debconf-test-noscripts: no-debconf-config
 W: debconf-test-noscripts: old-fsf-address-in-copyright-file
 W: debconf-test-noscripts: postrm-does-not-purge-debconf
+W: debconf-test-preinst: copyright-contains-dh_make-todo-boilerplate
 W: debconf-test-preinst: missing-debconf-dependency-for-preinst
 W: debconf-test-preinst: old-fsf-address-in-copyright-file
+W: debconf-test: copyright-contains-dh_make-todo-boilerplate
 W: debconf-test: making-assumptions-about-interfaces-in-templates debconf/testboolean
 W: debconf-test: malformed-prompt-in-templates debconf/teststring
 W: debconf-test: malformed-question-in-templates debconf/should-be-no-longer-a-problem



Reply to: