Merge branch 'master' into dbtests

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 0f9c35a541dc9fba4b181ef729c8e18c20783100..0a3e70c694a198600534c27ab1197b08a0b2ad23 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -357,6 +357,12 @@ AutomaticByHandPackages {
     Extension "tar.gz";
     Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
   };
+
+  "win32-loader" {
+    Source "win32-loader";
+    Section "byhand";
+    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-win32-loader";
+  };
 };
 
 Dir

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index ab01536d7adf4f165c2c1fabd7d30b297ec1e9db..9e1b0512d0934201e1dca39dcfb9857b85cdb07f 100755 (executable)
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -1,4 +1,7 @@
-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 if [ $# -lt 4 ]; then
        echo "Usage: $0 filename version arch changes_file"

diff --git a/scripts/debian/byhand-tag b/scripts/debian/byhand-tag
index 81a8946676a8a3af626813d7e4ac4c8798b98c90..87bb68878aa83f1e79fe89c07a9456dbbe3b15ca 100755 (executable)
--- a/scripts/debian/byhand-tag
+++ b/scripts/debian/byhand-tag
@@ -1,4 +1,7 @@
-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
 . $SCRIPTVARS

diff --git a/scripts/debian/byhand-task b/scripts/debian/byhand-task
index 82f0964482889732c6f506cfff5a0bd3841d259d..015256dc64acc7d1950b3870a6ad59eb9178aef7 100755 (executable)
--- a/scripts/debian/byhand-task
+++ b/scripts/debian/byhand-task
@@ -1,4 +1,7 @@
-#!/bin/sh -ue
+#!/bin/sh
+
+set -u
+set -e
 
 if [ $# -lt 4 ]; then
         echo "Usage: $0 filename version arch changes_file"

diff --git a/scripts/debian/byhand-win32-loader b/scripts/debian/byhand-win32-loader
new file mode 100755 (executable)
index 0000000..2a4abf1
--- /dev/null
+++ b/scripts/debian/byhand-win32-loader
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+set -u
+set -e
+
+if [ $# -lt 4 ]; then
+       echo "Usage: $0 filename version arch changes_file"
+       exit 1
+fi
+
+export SCRIPTVARS=/srv/ftp-master.debian.org/dak/config/debian/vars
+. $SCRIPTVARS
+
+WIN32_LOADER_FILE="$1" # *-win32-loader{.exe,txt}
+VERSION="$2"
+ARCH="$3"
+CHANGES="$4"   # Changes file for the upload
+
+# Get the target suite from the Changes file
+# NOTE: it may be better to pass this to the script as a parameter!
+SUITE="$(grep "^Distribution:" "$CHANGES" | awk '{print $2}')"
+case $SUITE in
+    "")
+           echo "Error: unable to determine suite from Changes file"
+        exit 1
+           ;;
+    unstable|sid)
+           : # nothing to do
+           ;;
+    *)
+           SUITE="${SUITE}-proposed-updates"
+           ;;
+esac
+
+# This must end with /
+TARGET="${ftpdir}/tools/win32-loader/${SUITE}/"
+
+# Check validity of the target directory
+if [ ! -d "$TARGET" ]; then
+       mkdir -p "$TARGET"
+fi
+
+# Put said file into the tools directory
+cp "$WIN32_LOADER_FILE" "$TARGET"
+
+exit 0