Stop using silly names, and migrate to a saner directory structure.

contrib/signature_checking_optional-doogie.diff

-Index: katie
-===================================================================
-RCS file: /cvs/dak/dak/katie,v
-retrieving revision 1.28
-diff -u -r1.28 katie
---- katie	2001/02/06 00:39:44	1.28
-+++ katie	2001/02/09 18:14:49
-@@ -102,7 +102,13 @@
- def check_signature (filename):
-     global reject_message
- 
--    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust --keyring=%s --keyring=%s < %s >/dev/null" % (Cnf["Dinstall::PGPKeyring"], Cnf["Dinstall::GPGKeyring"], filename))
-+    if Cnf.FindB("Dinstall::NoSigCheck"):
-+	return 1
-+    keyrings = ""
-+    for keyring in Cnf.ValueList("Dinstall::Keyrings"):
-+	keyrings = keyrings + " --keyring " + keyring;
-+
-+    (result, output) = commands.getstatusoutput("gpg --emulate-md-encode-bug --batch --no-options --no-default-keyring --always-trust %s < %s >/dev/null" % (keyrings, filename))
-     if (result != 0):
-         reject_message = "Rejected: GPG signature check failed on `%s'.\n%s\n" % (os.path.basename(filename), output)
-         return 0

direport

-#!/usr/bin/perl
-
-@t = ('BYHAND', 'CONFIRM', 'NEW', 'REJECT', 'INSTALL', 'SKIP');
-
-$/="";
-IR: while (<>) {
-  for $i (1..$#t) {
-    if (/^$t[$i]/m) {
-      $data[$i] .= "$_\n";
-      $cnt[$i]++;
-      
-      if ($t[$i] eq "NEW") {
-	($dist) = (/^NEW to (.*)/m);
-	while (/^\(new\) ([^_]*)_\S* (\S*) (\S*)$/mg) {
-	  ($n,$p,$s) = ($1,$2,$3);
-	  $p = "?" if (!$p);
-	  $s = "?" if (!$s);
-	  $s = "non-free/$p" if ($dist=~'non-free' && $s!~'non-free');
-	  $s = "contrib/$p" if ($dist=~'contrib' && $s!~'contrib');
-	  $l = length($n)>15 ? 30-length($n) : 15;
-	  for $d (split(/, /,$dist)) {
-	    $d.='-contrib' if ($s =~ 'contrib' && $d!~'contrib');
-	    $d.='-non-free' if ($s =~ 'non-free' && $d!~'non-free');
-	    $override{$d} .= sprintf("%-15s %-${l}s %s\n", $n, $p, $s)
-	      if (!$over{$n});
-	    $over{$n} = 1;
-	  }
-	}
-      }
-	
-      next IR;
-    }
-  }
-  $data[0] .= "$_\n";
-  $cnt[$i]++;
-}
-
-for $i (0..$#t) {
-  print "-"x40, "\n$cnt[$i] $t[$i]\n", "-"x40, "\n$data[$i]" if $cnt[$i];
-}
-print "-"x40, "\nOVERRIDE ADDITIONS\n", "-"x40,"\n";
-for $d (sort keys %override) {
-  print "-"x5," $d\n$override{$d}\n\n";
-}