X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=katie.conf;h=d8729026f1b393029a54e4e64171c288f9e6e085;hb=fb4f73664b315abf14ecb2e140e772607a0761b8;hp=fca9ece57161b1e3f5b25d553fc17d965b1b29bc;hpb=8e9a5d533c8458eaca33266208f6c347d66dfeef;p=dak.git diff --git a/katie.conf b/katie.conf index fca9ece5..d8729026 100644 --- a/katie.conf +++ b/katie.conf @@ -13,7 +13,6 @@ Dinstall BugServer "bugs.debian.org"; PackagesServer "packages.debian.org"; TrackingServer "packages.qa.debian.org"; - NewAckList "/org/ftp.debian.org/katie/log"; LockFile "/org/ftp.debian.org/katie/lock"; Bcc "archive@ftp-master.debian.org"; GroupOverrideFilename "override.group-maint"; @@ -24,6 +23,7 @@ Dinstall BXANotify "true"; CloseBugs "true"; OverrideDisparityCheck "true"; + StableDislocationSupport "false"; AcceptedAutoBuildSuites { unstable; @@ -86,7 +86,7 @@ Rhona Suite { - Stable + OldStable { Components { @@ -106,43 +106,132 @@ Suite sparc; }; Announce "debian-changes@lists.debian.org"; - Version "2.2r6"; + Version "2.2r7"; Origin "Debian"; - Description "Debian 2.2r6 Released 3rd April 2002"; + Description "Debian 2.2r7 Released 12th July 2002"; CodeName "potato"; OverrideCodeName "potato"; Priority "1"; Untouchable "1"; + ChangeLogBase "dists/oldstable/"; + }; + + Old-Proposed-Updates + { + Architectures + { + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; + }; + Announce "debian-changes@lists.debian.org"; + CopyChanges "dists/old-proposed-updates/"; + CopyKatie "/org/ftp.debian.org/queue/old-proposed-updates/"; + Version "2.2r7"; + Origin "Debian"; + Description "Proposed Updates for Debian 2.2r7 - Not Released"; + CodeName "old-proposed-updates"; + OverrideCodeName "potato"; + OverrideSuite "oldstable"; + Priority "2"; + VersionChecks + { + MustBeNewerThan + { + OldStable; + }; + MustBeOlderThan + { + Stable; + Proposed-Updates; + Testing; + Testing-Proposed-Updates; + Unstable; + Experimental; + }; + }; + }; + + Stable + { + Components + { + main; + contrib; + non-free; + }; + Architectures + { + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; + }; + Announce "debian-changes@lists.debian.org"; + Version "3.0"; + Origin "Debian"; + Description "Debian 3.0 Released 20th July 2002"; + CodeName "woody"; + OverrideCodeName "woody"; + Priority "3"; + Untouchable "1"; ChangeLogBase "dists/stable/"; }; Proposed-Updates { + Components + { + main; + contrib; + non-free; + }; Architectures { source; all; alpha; arm; + hppa; i386; + ia64; m68k; + mips; + mipsel; powerpc; + s390; sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; CopyKatie "/org/ftp.debian.org/queue/proposed-updates/"; - Version "2.2r6"; + Version "3.0-updates"; Origin "Debian"; - Description "Proposed Updates for Debian 2.2r6 - Not Released"; + Description "Debian 3.0 Proposed Updates - Not Released"; CodeName "proposed-updates"; - OverrideCodeName "potato"; + OverrideCodeName "woody"; OverrideSuite "stable"; - Priority "2"; + Priority "4"; VersionChecks { MustBeNewerThan { + OldStable; + Old-Proposed-Updates; Stable; }; MustBeOlderThan @@ -179,12 +268,12 @@ Suite }; Origin "Debian"; Description "Debian Testing distribution - Not Released"; - CodeName "woody"; - OverrideCodeName "woody"; - Priority "3"; + CodeName "sarge"; + OverrideCodeName "sarge"; + Priority "5"; }; - Woody-Proposed-Updates + Testing-Proposed-Updates { Components { @@ -210,10 +299,10 @@ Suite }; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; - CodeName "woody-proposed-updates"; - OverrideCodeName "woody"; + CodeName "testing-proposed-updates"; + OverrideCodeName "sarge"; OverrideSuite "unstable"; - Priority "4"; + Priority "6"; VersionChecks { MustBeNewerThan @@ -261,7 +350,7 @@ Suite Description "Debian Unstable - Not Released"; CodeName "sid"; OverrideCodeName "sid"; - Priority "5"; + Priority "7"; VersionChecks { MustBeNewerThan @@ -269,10 +358,13 @@ Suite Stable; Proposed-Updates; Testing; - Woody-Proposed-Updates; + Testing-Proposed-Updates; }; }; - + UdebComponents + { + main; + }; }; Experimental @@ -314,10 +406,12 @@ Suite { MustBeNewerThan { + OldStable; + Old-Proposed-Updates; Stable; Proposed-Updates; Testing; - Woody-Proposed-Updates; + Testing-Proposed-Updates; Unstable; }; }; @@ -328,12 +422,21 @@ Suite SuiteMappings { + "map oldstable old-proposed-updates"; + "map oldstable-security old-proposed-updates"; + "map-unreleased oldstable stable"; + "map-unreleased old-proposed-updates stable"; + + "map testing-security proposed-updates"; + "map stable proposed-updates"; + "map stable-security proposed-updates"; "map-unreleased stable unstable"; "map-unreleased proposed-updates unstable"; - "map testing woody-proposed-updates"; + "map testing testing-proposed-updates"; + //"map testing-security testing-proposed-updates"; "map-unreleased testing unstable"; - "map-unreleased woody-proposed-updates unstable"; + "map-unreleased testing-proposed-updates unstable"; }; Dir @@ -383,12 +486,12 @@ Architectures alpha "DEC Alpha"; hurd-i386 "Intel ia32 running the HURD"; hppa "HP PA RISC"; - arm "Arm"; + arm "ARM"; i386 "Intel ia32"; ia64 "Intel ia64"; m68k "Motorola Mc680x0"; - mips "SGI MIPS"; - mipsel "SGI MIPS (Little Endian)"; + mips "MIPS (Big Endian)"; + mipsel "MIPS (Little Endian)"; powerpc "PowerPC"; s390 "IBM S/390"; sh "Hitatchi SuperH"; @@ -484,34 +587,7 @@ OverrideType Location { - // Old style locations on ftp-master.debian.org - - /org/ftp.debian.org/ftp/project/experimental/ - { - Archive "ftp-master"; - Suite "experimental"; - Type "legacy-mixed"; - }; - - /org/ftp.debian.org/ftp/dists/proposed-updates/ - { - Archive "ftp-master"; - Suite "proposed-updates"; - Type "legacy-mixed"; - }; - - /org/ftp.debian.org/ftp/dists/ - { - Archive "ftp-master"; - Suites - { - Stable; - Unstable; - }; - Type "legacy"; - }; - - // New pool locations on ftp-master.debian.org + // Pool locations on ftp-master.debian.org /org/ftp.debian.org/ftp/pool/ { Archive "ftp-master";