Merge remote-tracking branch 'drkranz/lintian' into merge

[dak.git] / scripts / debian / byhand-tag

diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag
index 3bb3280879bd4cabe3d8106da2121fe4d7893a30..8dfa17a6a7eff6fed905eb328118524e24530336 100755 (executable)
--- a/scripts/debian/byhand-tag
+++ b/scripts/debian/byhand-tag
@@ -1,13 +1,19 @@
-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
+
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
 
 # Tarball to read, compressed with gzip
 INPUT="${1:?"Usage: $0 filename"}"
 
 # Regular expression used to validate tag lines
-CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Tag[[:space:]]+[a-z0-9:. ,+-]+$'
+CHECKRE='^[a-z0-9A-Z.+-]+[[:space:]]+Tag[[:space:]]+[a-z0-9:. ,{}+-]+$'
 
 # This must end with /
-TARGET=/srv/ftp.debian.org/scripts/external-overrides/
+TARGET=/srv/ftp-master.debian.org/scripts/external-overrides/
 
 # Read the main directory from the tarball
 DIR="`tar ztf \"$INPUT\" | tac | tail -n 1`"
@@ -38,6 +44,13 @@ 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 \
+  && dak external-overrides import unstable non-free Tag <tag.non-free)
+dak external-overrides copy unstable testing
+
 trap - EXIT
 
 exit 0