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

lintian: r1252 - in trunk: checks debian



Author: rra
Date: 2008-03-07 09:30:06 +0100 (Fri, 07 Mar 2008)
New Revision: 1252

Modified:
   trunk/checks/cruft
   trunk/debian/changelog
Log:
* checks/cruft:
  + [RA] Subversion conflicts generate three files, two with revision
    numbers and one with .mine.  Only warn about the revision numbers;
    .mine probably won't occur alone and may be a false positive.

Modified: trunk/checks/cruft
===================================================================
--- trunk/checks/cruft	2008-03-07 08:24:46 UTC (rev 1251)
+++ trunk/checks/cruft	2008-03-07 08:30:06 UTC (rev 1252)
@@ -65,7 +65,7 @@
      [ qr,^(.+/)?svk-commit.+\.tmp$,      => 'svk-commit-file'        ],
      [ qr,^(.+/)?\.arch-inventory$,       => 'arch-inventory-file'    ],
      [ qr,^(.+/)?\.\#(.+?)\.\d+(\.\d+)*$, => 'cvs-conflict-copy'      ],
-     [ qr,^(.+/)?(.+?)\.(r\d+|mine)$,     => 'svn-conflict-file'      ],
+     [ qr,^(.+/)?(.+?)\.(r\d+)$,          => 'svn-conflict-file'      ],
      [ qr,\.(orig|rej)$,                  => 'patch-failure-file',  1 ],
      [ qr,((^|/)\.[^/]+\.swp|~)$,         => 'editor-backup-file',  1 ],
     );

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-03-07 08:24:46 UTC (rev 1251)
+++ trunk/debian/changelog	2008-03-07 08:30:06 UTC (rev 1252)
@@ -8,6 +8,10 @@
   * checks/copyright-file{.desc,}:
     + [RA] Document handling of false positives for GPL, GFDL, and LGPL
       license references and catch the GFDL 1.1 false positive.
+  * checks/cruft:
+    + [RA] Subversion conflicts generate three files, two with revision
+      numbers and one with .mine.  Only warn about the revision numbers;
+      .mine probably won't occur alone and may be a false positive.
   * checks/scripts:
     + [RA] Attempt to quash some Perl warnings.
   * checks/shared-libs:


Reply to: