From: James Troup Date: Tue, 14 May 2002 15:29:07 +0000 (+0000) Subject: sync X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=dd4031a5fd0c3542dc2edb67a03dbfef8ecdb74e;p=dak.git sync --- diff --git a/TODO b/TODO index c3d67a5b..852aae86 100644 --- a/TODO +++ b/TODO @@ -6,13 +6,16 @@ Actually Urgent --------------- - o UrgencyLog stuff should minimize it's bombing out + o UrgencyLog stuff should minimize it's bombing out(?) + o Log stuff should open the log file g+w lamer More Urgent ----------- o db_access.get_location_id should handle the lack of archive_id properly + o the whole versioncmp thing should be documented + o security.debian.org: BYHAND auto-uploading doesn't work o security.debian.org: BYHAND auto-uploading assumes ftp-master @@ -214,12 +217,6 @@ Less Urgent o db_access' get_files needs to use exceptions not this None, > 0, < 0 return val BS (?) o The untouchable flag doesn't stop new packages being added to ``untouchable'' suites - * Stable: - - well, there's one other thing that doesn't work so well - you probably should have stable_install ignore Closes: - or it might be unique to the case of stable unstable uploads - ================================================================================ Packaging diff --git a/katie.conf b/katie.conf index 6cc499cf..eb3491ad 100644 --- a/katie.conf +++ b/katie.conf @@ -83,64 +83,24 @@ Rhona Suite { - // Priority determines which suite is used for the Maintainers file - // as generated by charisma (highest wins). - - Experimental - { - Components - { - main ""; - contrib ""; - non-free ""; - }; - Architectures - { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - hurd-i386 ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sh ""; - sparc ""; - }; - Announce "debian-devel-changes@lists.debian.org"; - Origin "Debian"; - Description "Experimental packages - not released; use at your own risk."; - CodeName "experimental"; - NotAutomatic "yes"; - OverrideCodeName "sid"; - OverrideSuite "unstable"; - Priority "0"; - Tree "project/experimental"; - }; - Stable { - Components + Components { - main ""; - contrib ""; - non-free ""; + main; + contrib; + non-free; }; - Architectures + Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; Version "2.2r6"; @@ -155,16 +115,16 @@ Suite Proposed-Updates { - Architectures + Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; @@ -176,31 +136,43 @@ Suite OverrideCodeName "potato"; OverrideSuite "stable"; Priority "2"; + VersionChecks + { + MustBeNewerThan + { + Stable; + }; + MustBeOlderThan + { + Unstable; + Experimental; + }; + }; }; Testing { - Components + Components { - main ""; - contrib ""; - non-free ""; + main; + contrib; + non-free; }; - Architectures + Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution - Not Released"; @@ -211,27 +183,27 @@ Suite Woody-Proposed-Updates { - Components + Components { - main ""; - contrib ""; - non-free ""; + main; + contrib; + non-free; }; - Architectures + Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; @@ -239,33 +211,47 @@ Suite OverrideCodeName "woody"; OverrideSuite "unstable"; Priority "4"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + }; + MustBeOlderThan + { + Unstable; + Experimental; + }; + }; }; Unstable { - Components + Components { - main ""; - contrib ""; - non-free ""; + main; + contrib; + non-free; }; - Architectures + Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - hurd-i386 ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sh ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + hurd-i386; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sh; + sparc; }; Announce "debian-devel-changes@lists.debian.org"; Origin "Debian"; @@ -273,6 +259,66 @@ Suite CodeName "sid"; OverrideCodeName "sid"; Priority "5"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + Woody-Proposed-Updates; + }; + }; + + }; + + Experimental + { + Components + { + main; + contrib; + non-free; + }; + Architectures + { + source; + all; + alpha; + arm; + hppa; + hurd-i386; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sh; + sparc; + }; + Announce "debian-devel-changes@lists.debian.org"; + Origin "Debian"; + Description "Experimental packages - not released; use at your own risk."; + CodeName "experimental"; + NotAutomatic "yes"; + OverrideCodeName "sid"; + OverrideSuite "unstable"; + Priority "0"; + Tree "project/experimental"; + VersionChecks + { + MustBeNewerThan + { + Stable; + Proposed-Updates; + Testing; + Woody-Proposed-Updates; + Unstable; + }; + }; + }; }; @@ -300,7 +346,7 @@ Dir AcceptedAutoBuild "/org/incoming.debian.org/buildd/"; UrgencyLog "/org/ftp.debian.org/testing/urgencies/"; Queue - { + { Root "/org/ftp.debian.org/queue/"; Accepted "/org/ftp.debian.org/queue/accepted/"; Byhand "/org/ftp.debian.org/queue/byhand/"; @@ -315,7 +361,7 @@ Dir DB { Name "projectb"; - Host ""; + Host ""; Port -1; NonUSName "projectb"; @@ -323,12 +369,10 @@ DB NonUSPort -1; NonUSUser "auric"; NonUSPassword "moo"; - }; Architectures { - source "Source"; all "Architecture Independent"; alpha "DEC Alpha"; @@ -344,24 +388,20 @@ Architectures s390 "IBM S/390"; sh "Hitatchi SuperH"; sparc "Sun SPARC/UltraSPARC"; - }; Archive { - ftp-master { OriginServer "ftp-master.debian.org"; PrimaryMirror "ftp.debian.org"; Description "Master Archive for the Debian project"; }; - }; Component { - main { Description "Main"; @@ -385,67 +425,60 @@ Component Description "Legacy Mixed"; MeetsDFSG "false"; }; - }; Section { - - admin ""; - base ""; - comm ""; - debian-installer ""; - devel ""; - doc ""; - editors ""; - electronics ""; - games ""; - graphics ""; - hamradio ""; - interpreters ""; - libs ""; - mail ""; - math ""; - misc ""; - net ""; - news ""; - oldlibs ""; - otherosfs ""; - science ""; - shells ""; - sound ""; - tex ""; - text ""; - utils ""; - web ""; - x11 ""; - + admin; + base; + comm; + debian-installer; + devel; + doc; + editors; + electronics; + games; + graphics; + hamradio; + interpreters; + libs; + mail; + math; + misc; + net; + news; + oldlibs; + otherosfs; + science; + shells; + sound; + tex; + text; + utils; + web; + x11; }; Priority { - required 1; important 2; standard 3; optional 4; extra 5; source 0; // i.e. unused - }; OverrideType { - - deb ""; - udeb ""; - dsc ""; - + deb; + udeb; + dsc; }; Location { - + // Old style locations on ftp-master.debian.org /org/ftp.debian.org/ftp/project/experimental/ @@ -465,10 +498,10 @@ Location /org/ftp.debian.org/ftp/dists/ { Archive "ftp-master"; - Suites + Suites { - Stable ""; - Unstable ""; + Stable; + Unstable; }; Type "legacy"; }; @@ -487,10 +520,10 @@ Urgency Default "low"; Valid { - low ""; - medium ""; - high ""; - emergency ""; - critical ""; + low; + medium; + high; + emergency; + critical; }; }; diff --git a/katie.conf-non-US b/katie.conf-non-US index be37b834..8f627592 100644 --- a/katie.conf-non-US +++ b/katie.conf-non-US @@ -88,52 +88,24 @@ Rhona Suite { - - // Priority determines which suite is used for the Maintainers filed as generated by charisma/da_mkmaintainers (highest wins) - - // non-US doesn't have experimental (yet) -// Experimental -// { -// Architectures -// { -// source ""; -// all ""; -// alpha ""; -// arm ""; -// i386 ""; -// m68k ""; -// powerpc ""; -// sparc ""; -// }; -// Announce "debian-devel-changes@lists.debian.org"; -// Origin "Debian"; -// Description "Experimental packages - not released; use at your own risk."; -// CodeName "experimental"; -// OverrideCodeName "experimental"; -// SingleOverrideFile "true"; -// NotAutomatic "yes"; -// Priority "0"; -// Tree "project/experimental"; -// }; - Stable { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; Version "2.2r6"; @@ -150,14 +122,14 @@ Suite { Architectures { - source ""; - all ""; - alpha ""; - arm ""; - i386 ""; - m68k ""; - powerpc ""; - sparc ""; + source; + all; + alpha; + arm; + i386; + m68k; + powerpc; + sparc; }; Announce "debian-changes@lists.debian.org"; CopyChanges "dists/proposed-updates/"; @@ -175,25 +147,25 @@ Suite { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution - Not Released"; @@ -206,25 +178,25 @@ Suite { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sparc; }; Origin "Debian"; Description "Debian Testing distribution updates - Not Released"; @@ -237,27 +209,27 @@ Suite { Components { - non-US/main ""; - non-US/contrib ""; - non-US/non-free ""; + non-US/main; + non-US/contrib; + non-US/non-free; }; Architectures { - source ""; - all ""; - alpha ""; - arm ""; - hppa ""; - hurd-i386 ""; - i386 ""; - ia64 ""; - m68k ""; - mips ""; - mipsel ""; - powerpc ""; - s390 ""; - sh ""; - sparc ""; + source; + all; + alpha; + arm; + hppa; + hurd-i386; + i386; + ia64; + m68k; + mips; + mipsel; + powerpc; + s390; + sh; + sparc; }; Announce "debian-devel-changes@lists.debian.org"; Origin "Debian"; @@ -368,7 +340,7 @@ Component Section { - non-US ""; + non-US; }; @@ -387,9 +359,9 @@ Priority OverrideType { - deb ""; - udeb ""; - dsc ""; + deb; + udeb; + dsc; }; @@ -410,8 +382,8 @@ Location Archive "non-US"; Suites { - Stable ""; - Unstable ""; + Stable; + Unstable; }; Type "legacy"; }; @@ -430,11 +402,11 @@ Urgency Default "low"; Valid { - low ""; - medium ""; - high ""; - emergency ""; - critical ""; + low; + medium; + high; + emergency; + critical; }; };