Rename edos-builddebcheck

To avoid problems with the unmodified binary in the PATH

diff --git a/bin/edos-builddebcheck b/bin/edos-builddebcheck
deleted file mode 100755 (executable)
index 6941fd5..0000000
--- a/bin/edos-builddebcheck
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/perl -w
-
-# Copyright (C) 2008 Ralf Treinen <treinen@debian.org>
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the GNU General Public License as published by the Free Software
-# Foundation, version 2 of the License.
-
-$debug=0;
-
-# the prefix used to encode source packages
-$sourceprefix="source---";
-
-$architecture="";
-$binexplain=0;
-$edosoptions = "-failures -explain";
-while ( $arg = shift @ARGV ) {
-    if ( $arg eq '-a' || $arg eq '--architecture' ) {
-       if ($#ARGV == -1) {
-           die "-a option needs a value";
-       } else {
-           $architecture = shift @ARGV;
-       }
-    } elsif ( $arg =~ "--binexplain" || $arg =~ "-be" ) {
-       $binexplain = 1;
-    } elsif ( $arg =~ /^-.*/ ) {
-       die "unrecognized option: $arg";
-    } else {
-       last;
-    }
-}
-
-if ($#ARGV != 0) {
-    die "Usage: edos-debbuildcheck [options] Packages Sources"
-} else {
-    $packagefile = $arg;
-    $sourcesfile = shift(@ARGV);
-}
-
-if ($debug) {
-    print "Arch: $architecture\n";
-    print "Packages: $packagefile\n";
-    print "Sources:  $sourcesfile\n";
-    print "Edos options: $edosoptions\n";
-}
-
-$packagearch="";
-open(P,$packagefile);
-while (<P>) {
-    next unless /^Architecture/;
-    next if /^Architecture:\s*all/;
-    /Architecture:\s*([^\s]*)/;
-    if ($packagearch eq "") {
-       $packagearch = $1;
-    } elsif ( $packagearch ne $1) {
-       die "Package file contains different architectures: $packagearch, $1";
-    }
-}
-close P;
-
-if ( $architecture eq "" ) {
-    if ( $packagearch eq "" ) {
-       die "No architecture option given, " .
-           "and no non-all architecture found in the Packages file";
-    } else {
-       $architecture = $packagearch;
-    }
-} else {
-    if ( $packagearch ne "" & $architecture ne $packagearch) {
-       die "Architecture option is $architecture ".
-           "but the package file contains architecture $packagearch";
-    }
-}
-
-open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
-     "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
-     "| edos-debcheck $edosoptions|");
-
-$sourcestanza=0;
-$explanation="";
-$binpackage="";
-
-while (<RESULT>) {
-    if (/^\s+/) {
-       if ($sourcestanza) {
-           s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
-           print;
-           if (/depends on ([^\s]*) .*\{.*\}/) {
-               push(@binqueue,$1);
-           }
-       } else {
-           $explanation .= $_;
-       }
-    } else {
-       if ($binpackage ne ""){
-           $binfailures{$binpackage} = $explanation;
-           $binpackage="";
-       }
-       if (/^$sourceprefix.*: FAILED/o) {
-           s/^$sourceprefix//o;
-           print;
-           
-           $_=<RESULT>;
-           print;
-           
-           $sourcestanza=1;
-       } elsif (/^([^\s]*) .*: FAILED/) {
-           $binpackage=$1;
-           $explanation=$_;
-           $explanation.=<RESULT>;
-           $sourcestanza=0;
-       } else {
-           # we have someting strange here
-           $sourcestanza=0;
-       }
-    }
-}
-
-close RESULT;
-
-if ($binexplain) {
-    while (@binqueue) {
-       $p=pop(@binqueue);
-       $v=$binfailures{$p};
-       next unless defined $v;
-       $binfailures{$p}="";
-       print "$v" if $v ne "";
-       if ($v=~/depends on ([^\s]*) .*\{.*\}/) {
-           push(@binqueue,$1);
-       }
-    }
-}
-

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
new file mode 100755 (executable)
index 0000000..6941fd5
--- /dev/null
+++ b/bin/wb-edos-builddebcheck
@@ -0,0 +1,132 @@
+#!/usr/bin/perl -w
+
+# Copyright (C) 2008 Ralf Treinen <treinen@debian.org>
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 2 of the License.
+
+$debug=0;
+
+# the prefix used to encode source packages
+$sourceprefix="source---";
+
+$architecture="";
+$binexplain=0;
+$edosoptions = "-failures -explain";
+while ( $arg = shift @ARGV ) {
+    if ( $arg eq '-a' || $arg eq '--architecture' ) {
+       if ($#ARGV == -1) {
+           die "-a option needs a value";
+       } else {
+           $architecture = shift @ARGV;
+       }
+    } elsif ( $arg =~ "--binexplain" || $arg =~ "-be" ) {
+       $binexplain = 1;
+    } elsif ( $arg =~ /^-.*/ ) {
+       die "unrecognized option: $arg";
+    } else {
+       last;
+    }
+}
+
+if ($#ARGV != 0) {
+    die "Usage: edos-debbuildcheck [options] Packages Sources"
+} else {
+    $packagefile = $arg;
+    $sourcesfile = shift(@ARGV);
+}
+
+if ($debug) {
+    print "Arch: $architecture\n";
+    print "Packages: $packagefile\n";
+    print "Sources:  $sourcesfile\n";
+    print "Edos options: $edosoptions\n";
+}
+
+$packagearch="";
+open(P,$packagefile);
+while (<P>) {
+    next unless /^Architecture/;
+    next if /^Architecture:\s*all/;
+    /Architecture:\s*([^\s]*)/;
+    if ($packagearch eq "") {
+       $packagearch = $1;
+    } elsif ( $packagearch ne $1) {
+       die "Package file contains different architectures: $packagearch, $1";
+    }
+}
+close P;
+
+if ( $architecture eq "" ) {
+    if ( $packagearch eq "" ) {
+       die "No architecture option given, " .
+           "and no non-all architecture found in the Packages file";
+    } else {
+       $architecture = $packagearch;
+    }
+} else {
+    if ( $packagearch ne "" & $architecture ne $packagearch) {
+       die "Architecture option is $architecture ".
+           "but the package file contains architecture $packagearch";
+    }
+}
+
+open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
+     "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
+     "| edos-debcheck $edosoptions|");
+
+$sourcestanza=0;
+$explanation="";
+$binpackage="";
+
+while (<RESULT>) {
+    if (/^\s+/) {
+       if ($sourcestanza) {
+           s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
+           print;
+           if (/depends on ([^\s]*) .*\{.*\}/) {
+               push(@binqueue,$1);
+           }
+       } else {
+           $explanation .= $_;
+       }
+    } else {
+       if ($binpackage ne ""){
+           $binfailures{$binpackage} = $explanation;
+           $binpackage="";
+       }
+       if (/^$sourceprefix.*: FAILED/o) {
+           s/^$sourceprefix//o;
+           print;
+           
+           $_=<RESULT>;
+           print;
+           
+           $sourcestanza=1;
+       } elsif (/^([^\s]*) .*: FAILED/) {
+           $binpackage=$1;
+           $explanation=$_;
+           $explanation.=<RESULT>;
+           $sourcestanza=0;
+       } else {
+           # we have someting strange here
+           $sourcestanza=0;
+       }
+    }
+}
+
+close RESULT;
+
+if ($binexplain) {
+    while (@binqueue) {
+       $p=pop(@binqueue);
+       $v=$binfailures{$p};
+       next unless defined $v;
+       $binfailures{$p}="";
+       print "$v" if $v ne "";
+       if ($v=~/depends on ([^\s]*) .*\{.*\}/) {
+           push(@binqueue,$1);
+       }
+    }
+}
+