X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=mkmaintainers;h=bd0e5ba8866696d03a590252974ad42aba889b3e;hb=9540d873fa78598454af57f5f8a4875969ed0439;hp=29019ef63c7c50f26e3d4b1c99f7bbb8abadfe09;hpb=0c9d7f6f12805e923e7a448536060f31782df710;p=dak.git

diff --git a/mkmaintainers b/mkmaintainers
index 29019ef6..bd0e5ba8 100755
--- a/mkmaintainers
+++ b/mkmaintainers
@@ -1,5 +1,5 @@
 #! /bin/sh
-# $Id: mkmaintainers,v 1.1 2000-12-15 00:15:30 troup Exp $
+# $Id: mkmaintainers,v 1.3 2004-02-27 20:09:51 troup Exp $
 
 echo
 echo -n 'Creating Maintainers index ... '
@@ -8,15 +8,17 @@ set -e
 . $SCRIPTVARS
 cd $masterdir
 
-nonusmaint="$masterdir/Maintainers"
-if lftp -e 'set net:timeout 600; set net:max-retries 1; get /debian-non-US/indices-non-US/Maintainers.gz; exit' nonus.debian.org >/dev/null ; then
+nonusmaint="$masterdir/Maintainers_Versions-non-US"
+
+
+if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indices-non-US/Maintainers_Versions.gz; then
 	rm -f $nonusmaint
 	gunzip -c ${nonusmaint}.gz > $nonusmaint
 	rm -f ${nonusmaint}.gz
 fi
 
 cd $indices
-$masterdir/charisma $nonusmaint $masterdir/pseudo-packages.maintainers >.new-maintainers
+$masterdir/charisma $nonusmaint $masterdir/pseudo-packages.maintainers | sed -e "s/~[^  ]*\([   ]\)/\1/"  | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 
 set +e
 cmp .new-maintainers Maintainers >/dev/null