X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~cjwatson/git?p=bin.git;a=blobdiff_plain;f=my-debmirror;h=2dbc7fd4411fb2c77a28ed8b2bb3c2dc3d5e4a7d;hp=ad71ead6ac540c31f4fb429d545d549b36fcdf1a;hb=7621786066db119b2a738c815a630259c11be3b0;hpb=ab6db52fa8666a8bff52ef6567e7fe76aeb0035f

diff --git a/my-debmirror b/my-debmirror
index ad71ead..2dbc7fd 100755
--- a/my-debmirror
+++ b/my-debmirror
@@ -1,28 +1,21 @@
 #! /bin/sh
 DEB_MIRROR=${DEB_MIRROR:-ftp.de.debian.org}
 debmirror /mirror/debian -h "$DEB_MIRROR" --passive \
-	  --dist=sarge,sid \
+	  --dist=etch,sid \
 	  --section=main,contrib,non-free,main/debian-installer \
-	  --arch=i386,powerpc --getcontents \
-	  --ignore=^README --ignore=^non-US/ --ignore=^doc/ \
+	  --arch=amd64,i386,powerpc --getcontents \
+	  --ignore=^README --ignore=^doc/ \
 	  --ignore=^indices/ --ignore=^tools/ --ignore=main/installer- "$@"
-# --ignore-missing-release until Release files get
-# non-US/main/debian-installer added to them
-debmirror /mirror/debian/non-US -h "$DEB_MIRROR" -r /debian-non-US --passive \
-	  --ignore-missing-release \
-	  --dist=sarge/non-US,sid/non-US \
-	  --arch=i386,powerpc --getcontents "$@"
-ln -nsf sarge /mirror/debian/dists/testing
+ln -nsf etch /mirror/debian/dists/testing
 ln -nsf sid /mirror/debian/dists/unstable
-ln -nsf sarge /mirror/debian/non-US/dists/testing
-ln -nsf sid /mirror/debian/non-US/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 sarge sid; do
-	for arch in i386 powerpc; do
-		rsync -aqz "$DEB_MIRROR::debian/dists/$dist/main/installer-$arch/" \
+for dist in etch 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