diff -ru britney-cdimage/britney testing/britney
--- britney-cdimage/britney	2006-12-06 03:26:53.000000000 +0000
+++ testing/britney	2006-11-15 00:28:50.000000000 +0000
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PYTHONPATH=/org/ftp.debian.org/katie
+#export PYTHONPATH=/srv/ftp.no-name-yet.com/katie
 
 set -e
 
@@ -14,31 +14,35 @@
 }
 
 # Dirs:
-OUT=/org/ftp.debian.org/testing/data/testing
-TPU=/org/ftp.debian.org/testing/data/testing-proposed-updates
-STABLE=/org/ftp.debian.org/testing/data/stable
-UNSTABLE=/org/ftp.debian.org/testing/data/unstable
-HTML=/org/ftp.debian.org/web/testing
+WARTY=/home/cjwatson/testing/data/warty
+HOARY=/home/cjwatson/testing/data/hoary
+BREEZY=/home/cjwatson/testing/data/breezy
+DAPPER=/home/cjwatson/testing/data/dapper
+DAPPER_PROPOSED=/home/cjwatson/testing/data/dapper-proposed
+DAPPER_UPDATES=/home/cjwatson/testing/data/dapper-updates
+EDGY=/home/cjwatson/testing/data/edgy
+FEISTY=/home/cjwatson/testing/data/feisty
+HTML=/home/cjwatson/testing/www/
 
-SCRIPTS=/org/ftp.debian.org/testing/update_out
+SCRIPTS=/home/cjwatson/testing/update_out
 
 # First, update the .list files
 if option regen; then
   echo JENNA UNSTABLE:
-  cd /org/ftp.debian.org/katie
+  cd /srv/ftp.no-name-yet.com/katie
   ./jenna --suite=unstable
 fi
 
 # First, update the .list files
 if option commitjen; then
   echo JENNA TESTING:
-  cd /org/ftp.debian.org/katie
+  cd /srv/ftp.no-name-yet.com/katie
   ./jenna --suite=testing
 fi
 
 if option urgencies; then
   echo URGENCIES:
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   for u in urgencies/install-urgencies-*; do
     [ -e "$u" ] || continue
     cat "$u" >> data/testing/Urgency
@@ -47,7 +51,7 @@
 fi
 
 if option aptftp; then 
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   echo APT:
   apt-ftparchive -o APT::FTPArchive::Contents=off --readonly \
         generate get_testing.conf 
@@ -55,7 +59,7 @@
 
 if option nonus; then
   echo NON-US:
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   ./get-non-US.sh
   cat data/non-US-urgencies >>data/testing/Urgency
   rm -f data/non-US-urgencies
@@ -63,7 +67,7 @@
 
 if option nonussections; then
   echo NON-US-SEC:
-  cd /org/ftp.debian.org/testing/data
+  cd /home/cjwatson/testing/data
   for a in *_non-US_*; do
     (cd $a;
      for b in Packages_* Sources; do
@@ -75,17 +79,25 @@
 
 if option merge; then
   echo MERGE:
-  cd /org/ftp.debian.org/testing/data
-  for a in stable testing testing-proposed-updates unstable; do
+  cd /home/cjwatson/testing/data
+  for a in dapper dapper-proposed dapper-updates edgy feisty; do
+    mkdir -p ${a}
     for b in $(cd ${a}_main; echo *); do
      cat ${a}_*/$b > ${a}/$b
     done
   done
+  # TODO cjwatson 2006-07-31: mad evil hack for doko
+  for a in dapper-proposed dapper-updates; do
+    for b in $(cd ${a}; echo *); do
+      (cat dapper/$b; cat ${a}/$b) > ${a}/$b.new
+      mv ${a}/$b.new ${a}/$b
+    done
+  done
 fi
 
 if option bugs; then
   echo BUGS:
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   wget --quiet -O $UNSTABLE/Bugs.new http://master.debian.org./~ajt/impbugs.txt
   if [ -s $UNSTABLE/Bugs.new ]; then mv $UNSTABLE/Bugs.new $UNSTABLE/Bugs;
   else rm $UNSTABLE/Bugs.new; exit 1; fi
@@ -98,15 +110,15 @@
 fi
 
 if option save; then
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   echo RESULTS:
   (grep -vi ' non-us[^ ]*$' $OUT/HeidiResult | cut -d\  -f1-3 | sort -u;
   cat $OUT/HeidiDI) | 
-    (cd /org/ftp.debian.org/katie; ./heidi --set testing)
+    (cd /srv/ftp.no-name-yet.com/katie; ./heidi --set testing)
 fi
 
 if option savenonus; then
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   echo RESULTS:
   grep -i ' non-us[^ ]*$' $OUT/HeidiResult | cut -d\  -f1-3 | sort -u | 
     (unset SSH_AUTH_SOCK SSH_CLIENT SSH_TTY || true;
@@ -115,24 +127,34 @@
 
 if option stats; then
   echo STATS:
-  cp $SCRIPTS/update.EXCUSES_py $HTML/update_excuses.html
-  cp $SCRIPTS/update.OUTPUT_py $HTML/update_output.txt
-  gzip -9 < $HTML/update_excuses.html > $HTML/update_excuses.html.gz
-  gzip -9 < $HTML/update_output.txt > $HTML/update_output.txt.gz
-
-  cd /org/ftp.debian.org/testing
-  ./rptprobs.sh $OUT $HTML/testing_probs.html testing
-  ./rptprobs.sh $STABLE $HTML/stable_probs.html stable
-  ./rptprobs.sh $UNSTABLE $HTML/unstable_probs.html unstable
+  #cp $SCRIPTS/update.EXCUSES_py $HTML/update_excuses.html
+  #cp $SCRIPTS/update.OUTPUT_py $HTML/update_output.txt
+  #gzip -9 < $HTML/update_excuses.html > $HTML/update_excuses.html.gz
+  #gzip -9 < $HTML/update_output.txt > $HTML/update_output.txt.gz
+
+  cd /home/cjwatson/testing
+  #./rptprobs.sh $WARTY $HTML/warty_probs.html warty
+  #./rptprobs.sh $HOARY $HTML/hoary_probs.html hoary
+  #./rptprobs.sh $BREEZY $HTML/breezy_probs.html breezy
+  #./rptprobs.sh $DAPPER $HTML/dapper_probs.html dapper
+  #./rptprobs.sh $DAPPER_PROPOSED $HTML/dapper-proposed_probs.html dapper-proposed
+  #./rptprobs.sh $DAPPER_UPDATES $HTML/dapper-updates_probs.html dapper-updates
+  #./rptprobs.sh $EDGY $HTML/edgy_probs.html edgy
+  ./rptprobs.sh $FEISTY $HTML/feisty_probs.html feisty
 
   cd $SCRIPTS
-  ./check_uptodate.py $OUT >$HTML/testing_outdate.txt
-  ./check_uptodate.py $STABLE >$HTML/stable_outdate.txt
-  ./check_uptodate.py $UNSTABLE >$HTML/unstable_outdate.txt
+  #./check_uptodate.py $WARTY >$HTML/warty_outdate.txt
+  #./check_uptodate.py $HOARY >$HTML/hoary_outdate.txt
+  #./check_uptodate.py $BREEZY >$HTML/breezy_outdate.txt
+  #./check_uptodate.py $DAPPER >$HTML/dapper_outdate.txt
+  #./check_uptodate.py $DAPPER_PROPOSED >$HTML/dapper-proposed_outdate.txt
+  #./check_uptodate.py $DAPPER_UPDATES >$HTML/dapper-updates_outdate.txt
+  #./check_uptodate.py $EDGY >$HTML/edgy_outdate.txt
+  ./check_uptodate.py $FEISTY >$HTML/feisty_outdate.txt
 fi
 
 if option summary; then
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   echo "Out of dates holding up testing:"
   TERM=vt100 lynx -nolist -dump $HTML/update_excuses.html | sed -n 's/^ *[^ ] *[^ ]*out of date on \([^ ]*\): .*$/\1/p' | sort | uniq -c | sort -n
   echo "Uninstallables holding up testing:"
@@ -147,7 +169,7 @@
 
 if option archivedata; then
   echo ARCHIVE:
-  cd /org/ftp.debian.org/testing
+  cd /home/cjwatson/testing
   tar czf data_bkup/data-$(date +"%Y.%m.%d").tgz data/{stable,testing,unstable,testing-proposed-updates}
 fi
 
Only in testing: dapper-proposed_probs.html
Only in testing: data
diff -ru britney-cdimage/get_testing.conf testing/get_testing.conf
--- britney-cdimage/get_testing.conf	2006-12-06 03:26:53.000000000 +0000
+++ testing/get_testing.conf	2006-11-15 00:34:31.000000000 +0000
@@ -1,8 +1,8 @@
 Dir 
 {
-   ArchiveDir "/org/ftp.debian.org/ftp/";
-   OverrideDir "/org/ftp.debian.org/scripts/override/";
-   CacheDir "/org/ftp.debian.org/database/";
+   ArchiveDir "/srv/launchpad.net/ubuntu-archive/ubuntu/";
+   OverrideDir "/srv/launchpad.net/ubuntu-archive/ubuntu/indices/";
+   CacheDir "/srv/launchpad.net/ubuntu-archive/ubuntu-cache/";
 };
 
 Default
@@ -18,44 +18,91 @@
 {
    Directory "dists/$(DIST)/$(SECTION)/binary-$(ARCH)/";
    SrcDirectory "dists/$(DIST)/$(SECTION)/source/";
-   Packages "/org/ftp.debian.org/testing/data/$(DIST)_$(SECTION)/Packages_$(ARCH)";
-   Sources "/org/ftp.debian.org/testing/data/$(DIST)_$(SECTION)/Sources";
+   Packages "/home/cjwatson/testing/data/$(DIST)_$(SECTION)/Packages_$(ARCH)";
+   Sources "/home/cjwatson/testing/data/$(DIST)_$(SECTION)/Sources";
    // Contents "./tmp/$(DIST)_Contents-$(ARCH)";
-   // Contents::Header "/org/ftp.debian.org/scripts/masterfiles/Contents.top";
+   // Contents::Header "/srv/ftp.no-name-yet.com/scripts/masterfiles/Contents.top";
    BinCacheDB "packages-$(ARCH).db";
-   FileList "/org/ftp.debian.org/database/dists/$(DIST)_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/org/ftp.debian.org/database/dists/$(DIST)_$(SECTION)_source.list";
+   FileList "/srv/launchpad.net/ubuntu-archive/ubuntu-overrides/$(DIST)_$(SECTION)_binary-$(ARCH)";
+   SourceFileList "/srv/launchpad.net/ubuntu-archive/ubuntu-overrides/$(DIST)_$(SECTION)_source";
 };
 
-tree "stable"
-{
-   Sections "main contrib non-free";
-   Architectures "alpha arm hppa ia64 i386 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.woody.$(SECTION)";
-   SrcOverride "override.woody.$(SECTION).src";
-};
-
-tree "testing-proposed-updates"
-{
-   Sections "main contrib non-free";
-   Architectures "alpha arm hppa ia64 i386 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.sarge.$(SECTION)";
-   SrcOverride "override.sarge.$(SECTION).src";
+//tree "warty"
+//{
+//   Sections "main";
+//   Architectures "amd64 i386 powerpc source";
+//   BinOverride "override.warty.$(SECTION)";
+//   SrcOverride "override.warty.$(SECTION).src";
+//};
+
+//tree "warty-security"
+//{
+//   Sections "main";
+//   Architectures "i386";
+//   BinOverride "override.warty.$(SECTION)";
+//   SrcOverride "override.warty.$(SECTION).src";
+//};
+
+//tree "warty-updates"
+//{
+//   Sections "main";
+//   Architectures "i386";
+//   BinOverride "override.warty.$(SECTION)";
+//   SrcOverride "override.warty.$(SECTION).src";
+//};
+
+//tree "hoary"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 ia64 powerpc source";
+//   BinOverride "override.hoary.$(SECTION)";
+//   SrcOverride "override.hoary.$(SECTION).src";
+//};
+
+//tree "breezy"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 powerpc source";
+//   BinOverride "override.breezy.$(SECTION)";
+//   SrcOverride "override.breezy.$(SECTION).src";
+//};
+
+//tree "dapper"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 powerpc sparc source";
+//   BinOverride "override.dapper.$(SECTION)";
+//   SrcOverride "override.dapper.$(SECTION).src";
+//};
+
+//tree "dapper-proposed"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 powerpc sparc source";
+//   BinOverride "override.dapper-proposed.$(SECTION)";
+//   SrcOverride "override.dapper-proposed.$(SECTION).src";
+//};
+
+//tree "dapper-updates"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 powerpc sparc source";
+//   BinOverride "override.dapper-updates.$(SECTION)";
+//   SrcOverride "override.dapper-updates.$(SECTION).src";
+//};
+
+//tree "edgy"
+//{
+//   Sections "main restricted";
+//   Architectures "amd64 i386 powerpc sparc source";
+//   BinOverride "override.edgy.$(SECTION)";
+//   SrcOverride "override.edgy.$(SECTION).src";
+//};
+
+tree "feisty"
+{
+   Sections "main restricted";
+   Architectures "amd64 i386 powerpc sparc source";
+   BinOverride "override.feisty.$(SECTION)";
+   SrcOverride "override.feisty.$(SECTION).src";
 };
-
-tree "testing"
-{
-   Sections "main contrib non-free";
-   Architectures "alpha arm hppa ia64 i386 m68k mips mipsel powerpc s390 sparc source";
-   BinOverride "override.sarge.$(SECTION)";
-   SrcOverride "override.sarge.$(SECTION).src";
-};
-
-tree "unstable"
-{
-   Sections "main contrib non-free";
-   Architectures "alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 sh sparc source";
-   BinOverride "override.sid.$(SECTION)";
-   SrcOverride "override.sid.$(SECTION).src";
-};
-
diff -ru britney-cdimage/rptprobs.sh testing/rptprobs.sh
--- britney-cdimage/rptprobs.sh	2006-12-06 03:26:53.000000000 +0000
+++ testing/rptprobs.sh	2006-08-25 15:51:02.000000000 +0100
@@ -4,10 +4,10 @@
 OUT=$2
 WHICH=$3
 
-SCRIPTDIR="${CDIMAGE_ROOT:-/srv/cdimage.ubuntu.com}/britney/update_out"
+SCRIPTDIR=/home/cjwatson/testing/update_out
 
-if [ "$DIR" = "" ]; then DIR=~/testing/out; fi
-if [ "$OUT" = "" ]; then OUT=~/public_html/testing_probs.html; fi
+if [ "$DIR" = "" ]; then DIR=/home/cjwatson/testing/out; fi
+if [ "$OUT" = "" ]; then OUT=/srv/ftp.no-name-yet.com/www/testing_probs.html; fi
 if [ "$WHICH" = "" ]; then WHICH=testing; fi
 
 (
@@ -77,4 +77,4 @@
   echo "</body></html>"
 ) > "$OUT"
 
-chmod 664  "$OUT"
+chmod 644  "$OUT"
diff -ru britney-cdimage/update_out/Makefile testing/update_out/Makefile
--- britney-cdimage/update_out/Makefile	2006-12-06 03:26:53.000000000 +0000
+++ testing/update_out/Makefile	2005-08-29 05:37:04.000000000 +0100
@@ -2,7 +2,7 @@
 CC = gcc
 CXX = g++
 CFLAGS = -Wall -W -O2 -DNDEBUG -DMDEBUG0 -g -p -fPIC
-CXXFLAGS = $(CFLAGS)
+CXXFLAGS = -fPIC
 
 all : checklib aptvercmp freelist britneymodule.so # libajdpkg.a 
 
@@ -24,7 +24,7 @@
 #	ranlib $@
 
 britneymodule.so : britney-py.o dpkg.o dpkg-lib.o memory.o freelist.o assert.o
-	$(CC) -shared -o britneymodule.so $^ -lapt-pkg
+	$(CC) -shared -fPIC -o britneymodule.so $^ -lapt-pkg
 
 Makefile.dep :
 	@gcc -MM *.c *.cpp > Makefile.dep
diff -ru britney-cdimage/update_out/check_out.py testing/update_out/check_out.py
--- britney-cdimage/update_out/check_out.py	2006-12-06 03:26:53.000000000 +0000
+++ testing/update_out/check_out.py	2006-05-30 12:00:38.000000000 +0100
@@ -3,7 +3,7 @@
 import sys
 import britney;
 
-arches = [ 'amd64', 'i386', 'ia64', 'powerpc' ]
+arches = [ 'amd64', 'i386', 'powerpc', 'sparc' ]
 arches.sort()
 
 print arches
diff -ru britney-cdimage/update_out/check_uptodate.py testing/update_out/check_uptodate.py
--- britney-cdimage/update_out/check_uptodate.py	2006-12-06 03:26:53.000000000 +0000
+++ testing/update_out/check_uptodate.py	2006-05-30 12:00:26.000000000 +0100
@@ -4,7 +4,7 @@
 import sys
 import re
 
-arches = [ 'i386', 'alpha', 'm68k', 'sparc', 'powerpc', 'arm', 'hurd-i386', 'mips', 'mipsel', 'ia64', 'hppa', 's390' ]
+arches = [ 'amd64', 'i386', 'powerpc', 'sparc' ]
 arches.sort()
 
 if len(sys.argv) == 2:
@@ -42,6 +42,7 @@
 
 		return 0
 
+source_outdate = {}
 noutdate = {}
 for arch in testing.arches:
 	cnt = bizcnt = 0
@@ -57,16 +58,26 @@
 			if realarch and re.match(r'^all', realarch):
 				myarch = myarch + '/all'
 
+			if src not in source_outdate:
+				source_outdate[src] = []
 			if britney.versioncmp(srcv, pkgsv) < 0:
 				bizcnt = bizcnt + 1
-				print "%s %s %s(%s) %s from %s ***" % \
-					(src, srcv, pkg, myarch, pkgv, pkgsv)
+				source_outdate[src].append(
+					"%s %s %s(%s) %s from %s ***" % \
+					(src, srcv, pkg, myarch, pkgv, pkgsv))
 			else:
-				print "%s %s %s(%s) %s from %s" % \
-					(src, srcv, pkg, myarch, pkgv, pkgsv)
+				source_outdate[src].append(
+					"%s %s %s(%s) %s from %s" % \
+					(src, srcv, pkg, myarch, pkgv, pkgsv))
 			cnt = cnt + 1
 	noutdate[arch] = (cnt, bizcnt)
 
+source_outdate_keys = source_outdate.keys()
+source_outdate_keys.sort()
+for src in source_outdate_keys:
+	for line in source_outdate[src]:
+		print line
+
 print "Columns: number-out-of-date, number-newer-than-source, arch"
 for arch in testing.arches:
 	print "%8d %4d %s" % (noutdate[arch] + (arch,))
diff -ru britney-cdimage/update_out/update_out.py testing/update_out/update_out.py
--- britney-cdimage/update_out/update_out.py	2006-12-06 03:26:53.000000000 +0000
+++ testing/update_out/update_out.py	2006-05-30 12:00:46.000000000 +0100
@@ -25,8 +25,8 @@
 
 # Configuration information
 
-expected_arches = 11
-arches = [ 'i386', 'sparc', 'alpha', 'powerpc', 'arm', 'm68k', 'hppa', 'ia64', 'mips', 'mipsel', 's390' ]
+expected_arches = 4
+arches = [ 'amd64', 'i386', 'powerpc', 'sparc' ]
 arches.sort()
 
 mindays = { "low" : 10, "medium" : 5, "high" : 2, "critical" : 0, 
@@ -34,7 +34,7 @@
 defaulturgency = "low"
 
 # if you're not in this list, arch: all packages are allowed to break on you
-nobreakarchallarches = ['i386']
+nobreakarchallarches = arches
 # if you're in this list, your packages may not stay in sync with the source
 fuckedarches = []
 # if you're in this list, your uninstallability count may increase
Only in testing: www