Use the debian scriptsdir for the one command we call from there and remove the bpo...

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/backports/vars b/config/backports/vars
index 7db419b4f733d3c96c815032d813ec5139b0b1fe..7f051f826c0eb547469ee804b435fdff88971ed9 100644 (file)
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -13,7 +13,7 @@ masterdir=$base/dak/
 overridedir=$base/scripts/override
 extoverridedir=$scriptdir/external-overrides
 configdir=$base/dak/config/backports/
-scriptsdir=$base/dak/scripts/backports/
+scriptsdir=$base/dak/scripts/debian/
 dbdir=$base/database/
 
 queuedir=$base/queue

diff --git a/scripts/backports/copyoverrides b/scripts/backports/copyoverrides
deleted file mode 100755 (executable)
index a90db62..0000000
--- a/scripts/backports/copyoverrides
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh
-
-set -e
-. $SCRIPTVARS
-echo 'Copying override files into public view ...'
-
-for f in $copyoverrides ; do
-       cd $overridedir
-       chmod g+w override.$f
-
-       cd $indices
-       rm -f .newover-$f.gz
-       pc="`gzip 2>&1 -9nv <$overridedir/override.$f >.newover-$f.gz`"
-       set +e
-       nf=override.$f.gz
-       cmp -s .newover-$f.gz $nf
-       rc=$?
-       set -e
-        if [ $rc = 0 ]; then
-               rm -f .newover-$f.gz
-       elif [ $rc = 1 -o ! -f $nf ]; then
-               echo "   installing new $nf $pc"
-               mv -f .newover-$f.gz $nf
-               chmod g+w $nf
-       else
-               echo $? $pc
-               exit 1
-       fi
-done

diff --git a/scripts/backports/expire_dumps b/scripts/backports/expire_dumps
deleted file mode 120000 (symlink)
index 649cd12..0000000
--- a/scripts/backports/expire_dumps
+++ /dev/null
@@ -1 +0,0 @@
-../debian/expire_dumps
\ No newline at end of file

diff --git a/scripts/backports/mkchecksums b/scripts/backports/mkchecksums
deleted file mode 100755 (executable)
index 575d55c..0000000
--- a/scripts/backports/mkchecksums
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-# Update the md5sums file
-
-set -e
-. $SCRIPTVARS
-
-dsynclist=$dbdir/dsync.list
-md5list=$indices/md5sums
-
-echo -n "Creating md5 / dsync index file ... "
-
-cd "$ftpdir"
-dsync-flist -q generate $dsynclist --exclude $dsynclist --md5
-dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz
-dsync-flist -q link-dups $dsynclist || true

diff --git a/scripts/backports/mklslar b/scripts/backports/mklslar
deleted file mode 100755 (executable)
index 19363f1..0000000
--- a/scripts/backports/mklslar
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-# Update the ls-lR.
-
-set -e
-. $SCRIPTVARS
-
-cd $ftpdir
-
-filename=ls-lR
-
-echo "Removing any core files ..."
-find -type f -name core -print0 | xargs -0r rm -v
-
-echo "Checking permissions on files in the FTP tree ..."
-find -type f \( \! -perm -444 -o -perm +002 \) -ls
-find -type d \( \! -perm -555 -o -perm +002 \) -ls
-
-echo "Checking symlinks ..."
-symlinks -rd .
-
-echo "Creating recursive directory listing ... "
-rm -f .$filename.new
-TZ=UTC ls -lR | grep -v Archive_Maintenance_In_Progress > .$filename.new
-
-if [ -r ${filename}.gz ] ; then
-  mv -f ${filename}.gz $filename.old.gz
-  mv -f .$filename.new $filename
-  rm -f $filename.patch.gz
-  zcat $filename.old.gz | diff -u - $filename | gzip -9cfn - >$filename.patch.gz
-  rm -f $filename.old.gz
-else
-  mv -f .$filename.new $filename
-fi
-
-gzip -9cfN $filename >$filename.gz
-rm -f $filename

diff --git a/scripts/backports/mkmaintainers b/scripts/backports/mkmaintainers
deleted file mode 100755 (executable)
index edb0f20..0000000
--- a/scripts/backports/mkmaintainers
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh
-
-echo
-echo -n 'Creating Maintainers index ... '
-
-set -e
-. $SCRIPTVARS
-cd $base/misc/
-
-nonusmaint="$base/misc/Maintainers_Versions-non-US"
-
-
-cd $indices
-dak make-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
-rc=$?
-set -e
-if [ $rc = 1 ] || [ ! -f Maintainers ] ; then
-       echo -n "installing Maintainers ... "
-       mv -f .new-maintainers Maintainers
-       gzip -9v <Maintainers >.new-maintainers.gz
-       mv -f .new-maintainers.gz Maintainers.gz
-elif [ $rc = 0 ] ; then
-       echo '(same as before)'
-       rm -f .new-maintainers
-else
-       echo cmp returned $rc
-       false
-fi