From f02f2fe4b139d08867a090e962b8431ec986ebdf Mon Sep 17 00:00:00 2001 From: James Troup Date: Thu, 2 Jan 2003 18:07:53 +0000 Subject: [PATCH] sync --- README | 26 ++++------------ TODO | 53 ++++++++++++++++++++++++++++++-- debian/rules | 2 +- docs/Makefile | 2 +- docs/README.stable-point-release | 14 ++++----- 5 files changed, 64 insertions(+), 33 deletions(-) diff --git a/README b/README index d2d33512..faef3ff4 100644 --- a/README +++ b/README @@ -7,23 +7,12 @@ This is unreleased alpha software; use it ENTIRELY at your own risk. dak is the collection of programs used to maintain the Debian project's archives. It's not yet in a state where it can be easily used by others; if you want something to maintain a small archive and -apt-ftparchive (from apt-utils) is insufficent, I strongly recommend -you investigate mini-dinstall or debarchiver. +apt-ftparchive (from the apt-utils package) is insufficient, I strongly +recommend you investigate mini-dinstall, debarchiver or similar. +However, if you insist on trying to try using dak, please read the +documentation in 'doc/README.first'. -If you do insist on trying to try using it, please be careful: katie -sends out lots of emails and if not configured properly will happily -send them to lots of people who probably didn't want those emails. - -Don't use katie.conf, apt.conf, cron.* etc. as starting points for -your own configuration files, they're the configuration files for -auric (aka ftp-master.debian.org) and are highly Debian specific. -Start from scratch and refer to the security.debian.org config files -(-security) as they're a better example for a private archive. - -NB: don't be put off by the names, see doc/README.names for a mapping -of name -> what the script does. - -There are some manpages and READMEs in the doc sub-directory. The +There are some manual pages and READMEs in the doc sub-directory. The TODO file is an incomplete list of things needing to be done. dak is developed and used on Linux but will probably work under any @@ -37,8 +26,5 @@ version. -- James Troup , Horsforth, Leeds -Fri, 29 Nov 2002 15:47:49 +0000 - - - +Thu, 26 Dec 2002 16:56:02 +0000 diff --git a/TODO b/TODO index 6a0c6c0c..a7213f45 100644 --- a/TODO +++ b/TODO @@ -27,6 +27,12 @@ queue/approved Others ------ + o use postgres 7.2's built-in stat features to figure out how indices are used etc. + + o neve shouldn't be using location, she should run down suites instead + + o halle needs to know about udebs + o by default hamstring katie's mail sending so that she won't send anything until someone edits a script; she's been used far too much to send spam atm :( @@ -140,6 +146,11 @@ Others o morgue needs auto-cleaning (?) + o saffron: two modes, all included, seperate + o saffron: add non-US + o saffron: add ability to control components, architectures, archives, suites + o saffron: add key to expand header + ================================================================================ Less Urgent @@ -159,9 +170,7 @@ Less Urgent o Logging [mostly done] (todo: rhona (hard), .. ?) - o jennifer is leaking file descriptors.. - - o the tar extractor class doesn't need to be redone for each package + o jennifer: the tar extractor class doesn't need to be redone for each package o reverse of source-must-exist; i.e. binary-for-source-must-not-exist o REJECT reminders in shania. @@ -209,6 +218,11 @@ Less Urgent @ backup of report (?) @ backup of changes.tgz (?) + o --help doesn't work without /etc/katie/katie.conf (or similar) at + least existing. + + o rename andrea (clashes with existing andrea)... + * Harder: o interrupting of stracing jennifer causes exceptions errors from apt_inst calls @@ -290,3 +304,36 @@ Packaging o Fix stuff to look in sensible places for libs and config file in debian package (?) ================================================================================ + + --help manpage +----------------------------------------------------------------------------- +alyson X +amber X +andrea X +ashley X +catherine X X +charisma X X +cindy X X +claire X +denise X +fernanda X +halle X +heidi X X +helena X +jenna X +jennifer X +jeri X +julia X X +kelly X X +lisa X X +madison X X +melanie X X +natalie X X +neve X +rene X +rose X +rhona X X +saffron X +shania X +tea X +ziyi X diff --git a/debian/rules b/debian/rules index c7e4e71f..256c40a0 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # debian/rules file - for Katie (0.0) # Based on sample debian/rules file - for GNU Hello (1.3). # Copyright 1994,1995 by Ian Jackson. -# Copyright 1998,1999,2000,2001 James Troup +# Copyright 1998,1999,2000,2001,2002 James Troup # I hereby give you perpetual unlimited permission to copy, # modify and relicense this file, provided that you do not remove # my name from the file itself. (I assert my moral right of diff --git a/docs/Makefile b/docs/Makefile index 2d7623f7..c5c7f0e3 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -2,7 +2,7 @@ # TODO: alyson andrea claire fernanda jenna neve rene shania tea ziyi -SGMLMANPAGES = catherine.1.sgml charisma.1.sgml heidi.1.sgml julia.1.sgml kelly.1.sgml madison.1.sgml melanie.1.sgml natalie.1.sgml rhona.1.sgml +SGMLMANPAGES = catherine.1.sgml charisma.1.sgml cindy.1.sgml heidi.1.sgml julia.1.sgml kelly.1.sgml lisa.1.sgml madison.1.sgml melanie.1.sgml natalie.1.sgml rhona.1.sgml MANPAGES = $(patsubst %.sgml, %, $(SGMLMANPAGES)) diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release index 10e60702..72df3a6e 100644 --- a/docs/README.stable-point-release +++ b/docs/README.stable-point-release @@ -3,20 +3,20 @@ Rough Guide to doing Stable Point Releases in Debian o Install, reject and remove packages as directed by the SRM - NB1: !! you must run katie from within dists/proposed-updates; katie + NB1: !! you must run kelly from within dists/proposed-updates; kelly takes it's "I'm doing a point release" cue from the CWD. !! NB2: removing packages are not logged to the changelog; you need to do that byhand. o Do anything in proposed-updates/TODO -o Close any applicable potato bugs - (hint: http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&include=potato) +o Close any applicable woody bugs + (hint: http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&include=woody) o Update version number in README and dists/README (ftp-master only) o Update the 'Debian.r' symlink in dists/ o Clean up dists/ChangeLog (add header, basically) o Update version fields in katie.conf[-non-US] -o Update fields in suite table in postgresql +o Update fields in suite table in postgresql (see below) o Comment out "Untouchable" in katie.conf[-non-US] o Run 'jenna -s stable' @@ -28,7 +28,5 @@ Yes, this sucks and more of it should be automated. ####################################################### -update suite set version = '2.2r7' where suite_name = 'stable'; -update suite set version = '2.2r7' where suite_name = 'proposed-updates'; -update suite set description = 'Debian 2.2r7 Released 12th July 2002' where suite_name = 'stable'; -update suite set description = 'Proposed Updates for Debian 2.2r7 - Not Released' where suite_name = 'proposed-updates'; +update suite set version = '3.0r1' where suite_name = 'stable'; +update suite set description = 'Debian 3.0r1 Released 15th December 2002' where suite_name = 'stable'; -- 2.39.2