[SCM] Debian package checker branch, master, updated. 2.5.7-14-ga6b636d

["Niels Thykier" <niels@thykier.net>]

The following commit has been merged in the master branch:
commit a6b636d0a5052097fc7e902e195abcb65a592ea6
Author: Niels Thykier <niels@thykier.net>
Date:   Wed May 23 15:42:24 2012 +0200

    c/scripts: Move data parsers to the bottom
    
    Also check for "unknown magic" values in scripts/interpreters
    (currently only @NO_DEPS@ are allowed).
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/scripts b/checks/scripts
index 15471d5..545992e 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -32,29 +32,6 @@ use Lintian::Relation;
 use Lintian::Tags qw(tag);
 use Lintian::Util qw(fail);
 
-sub _parse_interpreters {
-    my ($interpreter, $value) = @_;
-    my ($path, $dep) = split m/\s*,\s*/, $value, 2;
-    $dep = $interpreter if not $dep;
-    $dep = '' if $dep eq '@NODEPS@';
-    return [$path, $dep];
-}
-
-sub _parse_versioned_interpreters {
-    my ($interpreter, $value) = @_;
-    my ($path, $regex, $deptmp, $vers, $deprel) = split m/\s*,\s*/, $value, 5;
-    my @versions = split m/\s++/, $vers;
-    $deprel = $interpreter if not $deprel;
-    if ($deprel eq '@NO_DEFAULT_DEPS@') {
-        $deprel = '';
-    } elsif ($deprel eq '@SKIP_UNVERSIONED@') {
-        $deprel = undef;
-    } elsif ($deprel =~ m/@/) {
-        fail "Unknown magic value $deprel for versioned interpreter $interpreter";
-    }
-    return [$path, $deprel, qr/^$regex$/, $deptmp, \@versions];
-}
-
 # This is a map of all known interpreters.  The key is the interpreter
 # name (the binary invoked on the #! line).  The value is an anonymous
 # array of two elements.  The first argument is the path on a Debian
@@ -1132,6 +1109,34 @@ sub unquote($$) {
     return $string;
 }
 
+sub _parse_interpreters {
+    my ($interpreter, $value) = @_;
+    my ($path, $dep) = split m/\s*,\s*/, $value, 2;
+    $dep = $interpreter if not $dep;
+    if ($dep eq '@NODEPS@') {
+        $dep = '';
+    } elsif ($dep =~ m/@/) {
+        fail "Unknown magic value $dep for versioned interpreter $interpreter";
+    }
+    return [$path, $dep];
+}
+
+sub _parse_versioned_interpreters {
+    my ($interpreter, $value) = @_;
+    my ($path, $regex, $deptmp, $vers, $deprel) = split m/\s*,\s*/, $value, 5;
+    my @versions = split m/\s++/, $vers;
+    $deprel = $interpreter if not $deprel;
+    if ($deprel eq '@NO_DEFAULT_DEPS@') {
+        $deprel = '';
+    } elsif ($deprel eq '@SKIP_UNVERSIONED@') {
+        $deprel = undef;
+    } elsif ($deprel =~ m/@/) {
+        fail "Unknown magic value $deprel for versioned interpreter $interpreter";
+    }
+    return [$path, $deprel, qr/^$regex$/, $deptmp, \@versions];
+}
+
+
 1;
 
 # Local Variables:

-- 
Debian package checker