drop mk-extra-overrides.sh script

This is no longer needed with generate-packages-sources2; external
overrides are now handled by dak external-override.

Note that this means override.*.extra.* files in .../scripts/override
will no longer be updated.

diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag
index 3e21f02501fa0bc5a0e28a3d81a4d46322b4f386..b169757c2a87330e6de2e576d0df9c2624232997 100755 (executable)
--- a/scripts/debian/byhand-tag
+++ b/scripts/debian/byhand-tag
@@ -44,7 +44,6 @@ mv "$OUTNONFREE"        "$TARGET"tag.non-free
 
 chmod 644 "$TARGET"tag "$TARGET"tag.contrib "$TARGET"tag.non-free
 
-(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
 (cd "$TARGET" \
   && dak external-overrides import unstable main Tag <tag \
   && dak external-overrides import unstable contrib Tag <tag.contrib \

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index ee0c55144631db7a059ad337d105a482c26ab278..cd40167181dbe27fda86529a463172a4a8587985 100755 (executable)
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -64,7 +64,6 @@ mv "$OUTMAIN"           "$TARGET"task
 
 chmod 644 "$TARGET"task
 
-(cd $TARGET && $scriptsdir/mk-extra-overrides.sh)
 dak external-overrides import unstable main Task <"$TARGET"task
 dak external-overrides copy unstable testing
 

diff --git a/scripts/debian/mk-extra-overrides.sh b/scripts/debian/mk-extra-overrides.sh
deleted file mode 100755 (executable)
index e331e88..0000000
--- a/scripts/debian/mk-extra-overrides.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# regexp to test if a file is okay:
-#  grep -Ev '^[a-z0-9A-Z.+-]+\   Task    [a-z0-9:. ,+-]+$' task*
-
-x="build-essential tag task"
-opath="/srv/ftp-master.debian.org/scripts/override"
-apath="/srv/ftp-master.debian.org/ftp/dists"
-
-if [ ! -d "$apath" ]; then
-  echo "$0: invalid path to archive" >&2
-  exit 1
-elif [ ! -L "$apath/testing" ]; then
-  echo "$0: symlink for testing suite does not exist >&2"
-  exit 1
-fi
-
-codename_testing="$(basename "$(readlink "$apath/testing")")"
-if [ -z "$codename_testing" ] || [ ! -d "$apath/$codename_testing" ]; then
-  echo "$0: invalid codename for testing suite ('$codename_testing')" >&2
-  exit 1
-fi
-
-for s in "$codename_testing" sid; do
-  for c in main contrib non-free; do
-    echo "Making $opath/override.$s.extra.$c"
-    if [ "$c" = "main" ]; then
-      c2="";
-    else
-      c2=".$c"
-    fi
-    for t in $x; do
-      if [ -e "$t$c2" ]; then cat $t$c2; fi
-      if [ -e "$t.$s$c2" ]; then cat $t.$s$c2; fi
-    done | sort > $opath/override.$s.extra.$c
-  done
-done
-