sync

diff --git a/docs/README.stable-point-release b/docs/README.stable-point-release
index eb1116a977b588e09db53cdb702a99495781a083..d56689af1cc1d2361b71173fbb759d1a38dc4819 100644 (file)
--- a/docs/README.stable-point-release
+++ b/docs/README.stable-point-release
@@ -1,30 +1,34 @@
 Rough Guide to doing Stable Point Releases in Debian
 ----------------------------------------------------
 
-o Install, reject and remove packages as directed by the SRM
+o Install, reject and remove packages as directed by the SRM 
+
+  NB1: !! you must run katie from within dists/proposed-updates; katie
+  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 Update README and dists/README
+o Close any applicable potato bugs
+  (hint: http://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=ftp.debian.org&include=potato)
+o Update version number in README and dists/README (ftp-master only)
 o Update the 'Debian<n>.<n>r<n>' symlink in dists/
-o Comment out "Untouchable" in katie.conf[-non-US]
-o Run 'jenna -s'
-o Run apt-ftparchive generate apt.conf.stable[-non-US]
-o Uncomment "Untouchable" in katie.conf[-non-US]
+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 Comment out "Untouchable" in katie.conf[-non-US]
+o Run 'jenna -s stable'
+o Run apt-ftparchive generate apt.conf.stable[-non-US]
 o Copy tree/directory for stable to apt.conf[-non-US], run ziyi, remove it from apt.conf[-non-US]
+o Uncomment "Untouchable" in katie.conf[-non-US]
 
 Yes, this sucks and more of it should be automated.
 
-update suite set version = '2.2r5' where id = 2;
-update suite set version = '2.2r6' where id = 3;
-update suite set version = '3.0-testing' where id = 4;
-update suite set version = '3.0' where id = 5;
-update suite set version = '3.0-testing-updates' where id = 6;
-update suite set description = 'Debian 2.2r5 Released 10th January 2002' where id = 2;
-update suite set description = 'Proposed Updates for Debian 2.2r5 - Not Released' where id = 3;
-update suite set description = 'Debian 3.0 Testing distribution - Not Released' where id = 4;
-update suite set description = 'Debian 3.0 Unstable - Not Released' where id = 5;
-update suite set description = 'Debian 3.0 Testing distribution updates - Not Released' where id = 6;
-
+#######################################################
 
+update suite set version = '2.2r6' where suite_name = 'stable';
+update suite set version = '2.2r7' where suite_name = 'proposed-updates';
+update suite set description = 'Debian 2.2r6 Released 3rd April 2002' where suite_name = 'stable';
+update suite set description = 'Proposed Updates for Debian 2.2r6 - Not Released' where suite_name = 'proposed-updates';

diff --git a/katie.conf b/katie.conf
index f2fe0f07e8a06fe41d8f5877ef2211fcd3d15b4c..e7e643ae3e01babe8a61b8489da374ea4dfd381b 100644 (file)
--- a/katie.conf
+++ b/katie.conf
@@ -138,9 +138,9 @@ Suite
          sparc "";
        };
        Announce "debian-changes@lists.debian.org";
-       Version "2.2r5";
+       Version "2.2r6";
        Origin "Debian";
-       Description "Debian 2.2r5 Released 10th January 2002";
+       Description "Debian 2.2r6 Released 3rd April 2002";
        CodeName "potato";
        OverrideCodeName "potato";
        Priority "1";
@@ -164,9 +164,9 @@ Suite
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/ftp.debian.org/queue/proposed-updates/";
-       Version "2.2r5";
+       Version "2.2r6";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r5 - Not Released";
+       Description "Proposed Updates for Debian 2.2r6 - Not Released";
        CodeName "proposed-updates";
        OverrideCodeName "potato";
        OverrideSuite "stable";

diff --git a/katie.conf-non-US b/katie.conf-non-US
index 5eeb98af5d271a5d6dadde66ebfb8e0bec7385ce..e9e7cb2a9023d20803e2c4662705eac71b17639d 100644 (file)
--- a/katie.conf-non-US
+++ b/katie.conf-non-US
@@ -133,9 +133,9 @@ Suite
          sparc "";
        };
        Announce "debian-changes@lists.debian.org";
-       Version "2.2r5";
+       Version "2.2r6";
        Origin "Debian";
-       Description "Debian 2.2r5 Released 10th January 2002";
+       Description "Debian 2.2r6 Released 3rd April 2002";
        CodeName "potato";
        OverrideCodeName "potato";
        Priority "1";
@@ -159,9 +159,9 @@ Suite
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
        CopyKatie "/org/non-us.debian.org/queue/proposed-updates/";
-       Version "2.2r5";
+       Version "2.2r6";
        Origin "Debian";
-       Description "Proposed Updates for Debian 2.2r5 - Not Released";
+       Description "Proposed Updates for Debian 2.2r6 - Not Released";
        CodeName "proposed-updates";
        OverrideCodeName "potato";
        OverrideSuite "stable";

diff --git a/templates/katie.installed b/templates/katie.installed
new file mode 100644 (file)
index 0000000..eed5219
--- /dev/null
+++ b/templates/katie.installed
@@ -0,0 +1,10 @@
+From: __KATIE_ADDRESS__
+To: __MAINTAINER_TO__
+__BCC__
+Subject: __CHANGES_FILENAME__ INSTALLED__SUITE__
+
+__REJECT_MESSAGE__
+Installing:
+__SUMMARY__
+
+Thank you for your contribution to __DISTRO__.