lintian: r1377 - in trunk: checks debian

[djpig@debian.org]

Author: djpig
Date: 2008-06-12 17:24:24 +0200 (Thu, 12 Jun 2008)
New Revision: 1377

Modified:
   trunk/checks/watch-file
   trunk/debian/changelog
Log:
* checks/watch-file:
  + Fix the order of two regular expression to use
    the more specific one first.  Patch by Raphael Geissert.
    (Closes: #485884)


Modified: trunk/checks/watch-file
===================================================================
--- trunk/checks/watch-file	2008-06-12 15:20:45 UTC (rev 1376)
+++ trunk/checks/watch-file	2008-06-12 15:24:24 UTC (rev 1377)
@@ -63,7 +63,7 @@
             }
             chomp;
             my ($opts, @opts);
-            if (s/^opts=(\S+)\s*// || s/^opts=\"([^\"]+)\"//) {
+            if (s/^opts=\"([^\"]+)\"// || s/^opts=(\S+)\s*//) {
                 $opts = $1;
                 @opts = split(',', $opts);
                 $mangle = 1 if grep { /^[ud]versionmangle/ } @opts;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-12 15:20:45 UTC (rev 1376)
+++ trunk/debian/changelog	2008-06-12 15:24:24 UTC (rev 1377)
@@ -8,6 +8,11 @@
       (i.e. not on harness -i runs) it only got noticed now.
       Use urgency=medium for this fix.
   
+  * checks/watch-file:
+    + [FL] Fix the order of two regular expression to use
+      the more specific one first.  Patch by Raphael Geissert.
+      (Closes: #485884)
+  
   * unpack/unpack-binpkg-l1:
     + [FL] Don't include version number from Source: field in
       the source symlink.  Noted by RA.  (Closes: #485474)