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

diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers
index c914b4c7..41e8727c 100755
--- a/scripts/debian/mkmaintainers
+++ b/scripts/debian/mkmaintainers
@@ -7,17 +7,8 @@ set -e
 . $SCRIPTVARS
 cd $base/misc/
 
-nonusmaint="$base/misc/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
-dak make-maintainers $nonusmaint $configdir/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
@@ -26,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)'