X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fmkmaintainers;h=41e8727c6b3e267214cea7f63bd8effccb2d6765;hb=8154d2b22cb56511e95f9b7e2a61a94bfb3e905f;hp=e15cf8734cf78390653600fffc8a71da3a85e25d;hpb=65153ef97e5567c0fc85142b16294fe6bb68e0ae;p=dak.git

diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers
index e15cf873..41e8727c 100755
--- a/scripts/debian/mkmaintainers
+++ b/scripts/debian/mkmaintainers
@@ -1,24 +1,14 @@
 #! /bin/sh
-# $Id: mkmaintainers,v 1.3 2004-02-27 20:09:51 troup Exp $
 
 echo
 echo -n 'Creating Maintainers index ... '
 
 set -e
 . $SCRIPTVARS
-cd $masterdir
-
-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 $base/misc/
 
 cd $indices
-dak make-maintainers $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
+dak make-maintainers ${scriptdir}/masterfiles/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
@@ -27,7 +17,7 @@ set -e
 if [ $rc = 1 ] || [ ! -f Maintainers ] ; then
 	echo -n "installing Maintainers ... "
 	mv -f .new-maintainers Maintainers
-	gzip -9v <Maintainers >.new-maintainers.gz
+	gzip --rsyncable -9v <Maintainers >.new-maintainers.gz
 	mv -f .new-maintainers.gz Maintainers.gz
 elif [ $rc = 0 ] ; then
 	echo '(same as before)'