silly typo + thinkos

diff --git a/debian/control b/debian/control
index ab30399ef7248275f22babdbb3ddc91f567e77db..58de53b30757d6216558a52b004aec35d2c59bd0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Standards-Version: 3.2.1
 
 Package: katie
 Architecture: all
-Depends: python, python-pygresql, python-zlib, python-apt, apt-utils, gnupg, postgresql (>= 7.0.3-1)
-Suggests: gnupg (>= 1.0.4-1)
+Depends: python, python-pygresql, python-zlib, python-apt, apt-utils, gnupg (>= 1.0.4-1), postgresql (>= 7.0.3-1)
+Suggests: lintian, binutils-multiarch
 Description: Debian's archive maintenance scripts
  This is a collection of archive maintenance scripts used by the
  Debian project.

diff --git a/katie b/katie
index 1c611a7eb634583bd77afa2b448659811081379c..271e1a0668622fef379fd1734e5cad0306793889 100755 (executable)
--- a/katie
+++ b/katie
@@ -2,7 +2,7 @@
 
 # Installs Debian packaes
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: katie,v 1.23 2001-01-27 00:09:36 troup Exp $
+# $Id: katie,v 1.24 2001-01-27 03:51:14 troup Exp $
 
 # 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
@@ -982,7 +982,7 @@ def reject (changes_filename, manual_reject_mail_filename):
             try:
                 utils.move (file, "%s/REJECT/%s" % (Cnf["Dir::IncomingDir"], file));
             except:
-                sys.stderr.write("W: couldn't reject file '%s' [Got %s].\n" % (file, sys.exc_type);
+                sys.stderr.write("W: couldn't reject file '%s' [Got %s].\n" % (file, sys.exc_type));
                 pass;
 
     # If this is not a manual rejection generate the .reason file and rejection mail message
@@ -1184,7 +1184,7 @@ non-maintainer upload.  The .changes file follows.
 # into the .changes structure and reprocess the .changes file.
 
 def process_it (changes_file):
-    global reprocess, orig_tar_id, changes, dsc, dsc_files, files;
+    global reprocess, orig_tar_id, changes, dsc, dsc_files, files, reject_message;
 
     # Reset some globals
     reprocess = 1;
@@ -1222,7 +1222,7 @@ def process_it (changes_file):
 ###############################################################################
 
 def main():
-    global Cnf, projectB, reject_message, install_bytes, new_ack_old
+    global Cnf, projectB, install_bytes, new_ack_old
 
     apt_pkg.init();
     

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 45d561fe0ce2e2e73f75d52286e1952a435e422b..897e49cf781925c461d63436713df59c843c41e0 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -94,7 +94,7 @@ Natalie
     Debug "";
     Help "";
     Version "";
-    Component "main";
+    Component "non-US/main";
     List "";
     Suite "unstable";
     Set "";