sync

diff --git a/apt.conf b/apt.conf
index 3d9a1bff8761e5d579e29f45e0d5fcac97c3cd20..f9fdcf944031a08825931900426f5ed5abab63b1 100644 (file)
--- a/apt.conf
+++ b/apt.conf
@@ -35,7 +35,7 @@ tree "dists/unstable"
    FileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc source";
+   Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
    BinOverride "override.sid.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
 };
@@ -44,7 +44,7 @@ tree "dists/unstable/main"
 {
    FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
-   Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc";
+   Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc";
    BinOverride "override.sid.main.$(SECTION)";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";

diff --git a/apt.conf-non-US b/apt.conf-non-US
index 8bc0d7bcc3f1bfe3b36de577b80d0dbb2040e165..4dff271dee265796f760fc7b99b30636d270a38a 100644 (file)
--- a/apt.conf-non-US
+++ b/apt.conf-non-US
@@ -35,7 +35,7 @@ tree "dists/unstable/non-US"
    FileList "/org/non-us.debian.org/database/dists/unstable_non-us/$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/org/non-us.debian.org/database/dists/unstable_non-us/$(SECTION)_source.list";
    Sections "main contrib non-free";
-   Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc source";
+   Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source";
    BinOverride "override.sid.$(SECTION)";
    SrcOverride "override.sid.$(SECTION).src";
 };

diff --git a/madison b/madison
index 7d0222d9fb89e53e17e2b30e3e35ddfb7f8e3e09..1bc0da15d104ca76dbec768ee5d33ed2dcbb6011 100755 (executable)
--- a/madison
+++ b/madison
@@ -2,7 +2,7 @@
 
 # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy
 # Copyright (C) 2000  James Troup <james@nocrew.org>
-# $Id: madison,v 1.1 2000-12-20 08:15:35 troup Exp $
+# $Id: madison,v 1.2 2001-01-27 02:51:00 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
@@ -50,7 +50,7 @@ def main ():
 
     packages = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv);
 
-    projectB = pg.connect('projectb', 'localhost');
+    projectB = pg.connect('projectb', Cnf["DB::Host"], int(Cnf["DB::Port"]), None, None, Cnf["DB::ROUser"]);
 
     db_access.init(Cnf, projectB);
 

diff --git a/pseudo-packages.maintainers b/pseudo-packages.maintainers
index 7f09115c8625546fae55f3e2805bf6016b5ddd93..a5d75f789e3479e6f5d339032426ead5fe50960b 100644 (file)
--- a/pseudo-packages.maintainers
+++ b/pseudo-packages.maintainers
@@ -9,6 +9,7 @@ ftp.debian.org          James Troup and others <ftpmaster@debian.org>
 qa.debian.org          debian-qa@lists.debian.org
 nonus.debian.org       James Troup and others <ftpmaster@debian.org>
 www.debian.org         James Treacy and others <debian-www@lists.debian.org>
+mirrors                        Josip Rodin and others <mirrors@debian.org>
 listarchives           Cesar Mendoza and others <debian-www@lists.debian.org>
 project                        debian-devel@lists.debian.org
 general                        debian-devel@lists.debian.org