dput -> dput-ng due to better dcut

7 files changed, 47 insertions, 27 deletions

diff --git a/.dput.cf b/.dput.cf
deleted file mode 100644
index a77a905b..00000000
--- a/.dput.cf
+++ /dev/null
@@ -1,27 +0,0 @@
-[DEFAULT]
-# disabled to avoid any problems with dgit
-run_lintian = 0
-
-[dom]
-fqdn           = debomatic-i386.debian.net
-incoming       = /srv/debomatic-i386
-login          = debomatic
-method         = scp
-allow_unsigned_uploads  = 0
-allow_dcut     = 1
-scp_compress   = 1
-# WIP package might not be Lintian-clean
-run_lintian = 0
-# Disallow uploads for UNRELEASED packages: dom doesn't support them
-allowed_distributions = (?!UNRELEASED)
-distributions = unstable,experimental,jessie-backports,xenial
-
-[mentors]
-fqdn = mentors.debian.net
-incoming = /upload
-method = http
-allow_unsigned_uploads = 0
-progress_indicator = 2
-
-allowed_distributions = (?!UNRELEASED)
-distributions = unstable,experimental,jessie-backports
diff --git a/.dput.d/DEFAULT.json b/.dput.d/DEFAULT.json
new file mode 100644
index 00000000..05e2be02
--- /dev/null
+++ b/.dput.d/DEFAULT.json
@@ -0,0 +1,19 @@
+{
+    "-hooks": [
+        // permit source-only uploads
+        "check-debs",
+    ],
+
+    "+hooks": [
+        "checksums",
+        "impatient",
+    ],
+
+    // require explicit selection of ftp-master
+    "default_host_main": "debomatic-amd64",
+
+    "full_upload_log": true,
+
+    // avoid any problems with dgit (see #827879)
+    "run_lintian": false,
+}
diff --git a/.dput.d/debomatic-amd64.json b/.dput.d/debomatic-amd64.json
new file mode 100644
index 00000000..2eee9ad7
--- /dev/null
+++ b/.dput.d/debomatic-amd64.json
@@ -0,0 +1,7 @@
+{
+    "fqdn": "debomatic-amd64.debian.net",
+    "incoming": "/srv/debomatic-amd64",
+    "login": "debomatic",
+    "meta": "debian",
+    "method": "scp"
+}
diff --git a/.dput.d/ftp-eu.json b/.dput.d/ftp-eu.json
new file mode 100644
index 00000000..d21784d2
--- /dev/null
+++ b/.dput.d/ftp-eu.json
@@ -0,0 +1,3 @@
+{
+    "allow_dcut": "true",
+}
diff --git a/.dput.d/ftp-master.json b/.dput.d/ftp-master.json
new file mode 100644
index 00000000..d21784d2
--- /dev/null
+++ b/.dput.d/ftp-master.json
@@ -0,0 +1,3 @@
+{
+    "allow_dcut": "true",
+}
diff --git a/.dput.d/mentors.json b/.dput.d/mentors.json
new file mode 100644
index 00000000..3533ac07
--- /dev/null
+++ b/.dput.d/mentors.json
@@ -0,0 +1,11 @@
+{
+    "-hooks": [
+        "check-debs",
+        "allowed-distribution"
+    ],
+    "allowed_distributions": ".*",
+    "fqdn": "mentors.debian.net",
+    "incoming": "/upload",
+    "meta": "debian",
+    "method": "http"
+}
diff --git a/.dput.d/ssh-upload.json b/.dput.d/ssh-upload.json
new file mode 100644
index 00000000..52fc337a
--- /dev/null
+++ b/.dput.d/ssh-upload.json
@@ -0,0 +1,4 @@
+{
+    "login": "spwhitton",
+    "allow_dcut": "true",
+}