From 016c82f5c0b8185a9d2a7824f6b0af2dddde0741 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sat, 27 Jan 2001 02:51:00 +0000 Subject: [PATCH] sync --- apt.conf | 4 ++-- apt.conf-non-US | 2 +- madison | 4 ++-- pseudo-packages.maintainers | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apt.conf b/apt.conf index 3d9a1bff..f9fdcf94 100644 --- 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 8bc0d7bc..4dff271d 100644 --- 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 7d0222d9..1bc0da15 100755 --- a/madison +++ b/madison @@ -2,7 +2,7 @@ # 'Fix' stable to make debian-cd and dpkg -BORGiE users happy # Copyright (C) 2000 James Troup -# $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 7f09115c..a5d75f78 100644 --- a/pseudo-packages.maintainers +++ b/pseudo-packages.maintainers @@ -9,6 +9,7 @@ ftp.debian.org James Troup and others qa.debian.org debian-qa@lists.debian.org nonus.debian.org James Troup and others www.debian.org James Treacy and others +mirrors Josip Rodin and others listarchives Cesar Mendoza and others project debian-devel@lists.debian.org general debian-devel@lists.debian.org -- 2.39.5