X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=my-debmirror;h=171547f81e3fb3c30dd86858046a9b0a9f5a46fd;hp=75ad1214522d8cadc346f9bf8944e6d86e63a5c4;hb=5bbf62ce7ce9e9561d11132d4725d32c9b7e4381;hpb=7c79354606f7d3df35fc82223070758567e42e4e

diff --git a/my-debmirror b/my-debmirror
index 75ad121..171547f 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,24 +1,21 @@
 #! /bin/sh
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
 debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=testing,unstable \
+	  --dist=lenny,sid \
 	  --section=main,contrib,non-free,main/debian-installer \
-	  --arch=i386,powerpc --getcontents \
-	  --ignore=non-US/,doc/,indices/,tools/,main/installer- "$@"
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --dist=testing/non-US,unstable/non-US \
-	  --arch=i386,powerpc --getcontents "$@"
-ln -sf testing /mirror/debian/dists/sarge
-ln -sf unstable /mirror/debian/dists/sid
-ln -sf testing /mirror/debian/non-US/dists/sarge
-ln -sf unstable /mirror/debian/non-US/dists/sid
+	  --arch=amd64,i386,powerpc --getcontents \
+	  --ignore=^README --ignore=^doc/ \
+	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
+ln -nsf lenny /mirror/debian/dists/testing
+ln -nsf sid /mirror/debian/dists/unstable
 rsync -aqz "$DEB_MIRROR::debian/README*" /mirror/debian/
 for dir in doc indices tools; do
-	rsync -aqz "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
+	rsync -aqz --delete "$DEB_MIRROR::debian/$dir/" "/mirror/debian/$dir/"
 done
-for dist in testing unstable; do
-	for arch in i386 powerpc; do
-		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+for dist in lenny sid; do
+	for arch in amd64 i386 powerpc; do
+		rsync -aqz --delete \
+			"$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
 			"/mirror/debian/dists/$dist/main/installer-$arch/"
 	done
 done